Update upstream

.Rbuildignore

@@ -4,6 +4,6 @@
 .*\.so
 .*\.a
 .*\.dll
-
+src/empty.dll$
 ^\.travis\.yml$
 ^appveyor\.yml$

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: graphql
 Type: Package
 Title: A GraphQL Query Parser
-Version: 1.0
+Version: 1.1
 Authors@R: c(
     person("Jeroen", "Ooms", , "[email protected]", role = c("cre", "aut")),
     person("Scott", "Wolchok", role = "ctb"),

NEWS

@@ -0,0 +1,2 @@
+1.1
+  - Update libgraphqlparser from graphql/libgraphqlparser@32680f6

src/libgraphqlparser/Ast.cpp

@@ -139,6 +139,13 @@ void BooleanValue::accept(visitor::AstVisitor *visitor) {
   visitor->endVisitBooleanValue(*this);
 }
 
+void NullValue::accept(visitor::AstVisitor *visitor) {
+  if (visitor->visitNullValue(*this)) {
+
+  }
+  visitor->endVisitNullValue(*this);
+}
+
 void EnumValue::accept(visitor::AstVisitor *visitor) {
   if (visitor->visitEnumValue(*this)) {
 

src/libgraphqlparser/Ast.h

@@ -43,6 +43,7 @@ class IntValue;
 class FloatValue;
 class StringValue;
 class BooleanValue;
+class NullValue;
 class EnumValue;
 class ListValue;
 class ObjectValue;
@@ -511,6 +512,25 @@ class BooleanValue : public Value {
 };
 
 
+class NullValue : public Value {
+ public:
+  explicit NullValue(
+      const yy::location &location
+
+  )
+  : Value(location)
+
+  {}
+
+  ~NullValue() {}
+
+  NullValue(const NullValue&) = delete;
+  NullValue& operator=(const NullValue&) = delete;
+
+  void accept(visitor::AstVisitor *visitor) override;
+};
+
+
 class EnumValue : public Value {
   std::unique_ptr<const char, CDeleter> value_;
  public:

src/libgraphqlparser/AstVisitor.h

@@ -63,6 +63,9 @@ class AstVisitor {
   virtual bool visitBooleanValue(const BooleanValue &booleanValue) { return true; }
   virtual void endVisitBooleanValue(const BooleanValue &booleanValue) { }
 
+  virtual bool visitNullValue(const NullValue &nullValue) { return true; }
+  virtual void endVisitNullValue(const NullValue &nullValue) { }
+
   virtual bool visitEnumValue(const EnumValue &enumValue) { return true; }
   virtual void endVisitEnumValue(const EnumValue &enumValue) { }
 

src/libgraphqlparser/JsonVisitor.cpp

@@ -348,6 +348,12 @@ void JsonVisitor::endVisitEnumValue(const EnumValue &enumValue) {
   endVisitValueRepresentedAsString("EnumValue", enumValue);
 }
 
+void JsonVisitor::endVisitNullValue(const NullValue &nullValue) {
+  startPrintingNode("NullValue", nullValue.getLocation());
+  out_ << '}';
+  printed_.back().emplace_back(out_.str());
+}
+
 void JsonVisitor::endVisitBooleanValue(const BooleanValue &booleanValue) {
   startPrintingNode("BooleanValue", booleanValue.getLocation());
 

src/libgraphqlparser/JsonVisitor.h

@@ -103,6 +103,8 @@ class JsonVisitor : public AstVisitor {
 
   void endVisitBooleanValue(const BooleanValue &booleanValue) override;
 
+  void endVisitNullValue(const NullValue &nullValue) override;
+
   void endVisitEnumValue(const EnumValue &enumValue) override;
 
   bool visitListValue(const ListValue &arrayValue) override;

src/libgraphqlparser/c/GraphQLAst.h

@@ -80,6 +80,8 @@ const char * GraphQLAstStringValue_get_value(const struct GraphQLAstStringValue
 struct GraphQLAstBooleanValue;
 int GraphQLAstBooleanValue_get_value(const struct GraphQLAstBooleanValue *node);
 
+struct GraphQLAstNullValue;
+
 struct GraphQLAstEnumValue;
 const char * GraphQLAstEnumValue_get_value(const struct GraphQLAstEnumValue *node);
 

src/libgraphqlparser/c/GraphQLAstForEachConcreteType.h

@@ -22,6 +22,7 @@ MACRO(IntValue, int_value) \
 MACRO(FloatValue, float_value) \
 MACRO(StringValue, string_value) \
 MACRO(BooleanValue, boolean_value) \
+MACRO(NullValue, null_value) \
 MACRO(EnumValue, enum_value) \
 MACRO(ListValue, list_value) \
 MACRO(ObjectValue, object_value) \

src/libgraphqlparser/lexer.cpp

@@ -978,7 +978,7 @@ YY_RULE_SETUP
 #line 87 "lexer.lpp"
 {
     int ch;
-    sscanf(yytext + 1, "%x", &ch);
+    sscanf(yytext + 2, "%x", &ch);
     yyextra->str.push_back(ch);
   }
 	YY_BREAK

src/libgraphqlparser/lexer.lpp

@@ -86,7 +86,7 @@ notnewline [^\n\r]
 
   \\u[0-9A-Fa-f]{4} {
     int ch;
-    sscanf(yytext + 1, "%x", &ch);
+    sscanf(yytext + 2, "%x", &ch);
     yyextra->str.push_back(ch);
   }