graphql-c_parser 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8584a3c42587debe82aa29273fef1dffd1e3624c3d03368b37cbd36dbe8e290
-  data.tar.gz: 6775ad51cb2544d67b9bf8e0460d6decc1b14034db4cb8148653ae6835987a41
+  metadata.gz: 9ce3db30ea33e3358c671556d5a3d4d8338e578da71948bd0dcd924a24b8fa23
+  data.tar.gz: d80041b89bdadc5a83a60e352a68b4ace5b18de7eb34dabec09a6f180d13989d
 SHA512:
-  metadata.gz: 33036841a9ef8f1c44fb297781272d2645428eb6d1252582692af832704ad8a8e861cecbc081829be2a15d4271045876c524331978f14608436594cf34c99377
-  data.tar.gz: f46a068023df63a03c2b970e05c8e14784d9686de2147f1b4dbf2b866271093dbb6b4e9d019fed62c2854deffc27df24071fcfc93a3fde5563967323220584c3
+  metadata.gz: 7f85e41f5361db1ca4d9025ea239069127b3535c20ac2f2afde1c79a89b019bf953a221eafe65739d2ebd9bf8f479aa37ab3ef520d1e3df0c30c0401291a0e92
+  data.tar.gz: c1f171a7ca8f49304a58e4b0fb4acab15ce51e9f51c39ff5817df31e385478488e87a854915cc666bc672b5741d6ecaf9916a8e02c4c059fae186c4a30960bc1

data/ext/graphql_c_parser_ext/graphql_c_parser_ext.c

@@ -1,7 +1,7 @@
 #include "graphql_c_parser_ext.h"
 
-VALUE GraphQL_CParser_Lexer_tokenize_with_c_internal(VALUE self, VALUE query_string, VALUE fstring_identifiers) {
-  return tokenize(query_string, RTEST(fstring_identifiers));
+VALUE GraphQL_CParser_Lexer_tokenize_with_c_internal(VALUE self, VALUE query_string, VALUE fstring_identifiers, VALUE reject_numbers_followed_by_names, VALUE max_tokens) {
+  return tokenize(query_string, RTEST(fstring_identifiers), RTEST(reject_numbers_followed_by_names), FIX2INT(max_tokens));
 }
 
 VALUE GraphQL_CParser_Parser_c_parse(VALUE self) {
@@ -13,7 +13,7 @@ void Init_graphql_c_parser_ext() {
   VALUE GraphQL = rb_define_module("GraphQL");
   VALUE CParser = rb_define_module_under(GraphQL, "CParser");
   VALUE Lexer = rb_define_module_under(CParser, "Lexer");
-  rb_define_singleton_method(Lexer, "tokenize_with_c_internal", GraphQL_CParser_Lexer_tokenize_with_c_internal, 2);
+  rb_define_singleton_method(Lexer, "tokenize_with_c_internal", GraphQL_CParser_Lexer_tokenize_with_c_internal, 4);
   setup_static_token_variables();
 
   VALUE Parser = rb_define_class_under(CParser, "Parser", rb_cObject);

data/ext/graphql_c_parser_ext/lexer.c

@@ -1,6 +1,6 @@
 #line 1 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 
-#line 102 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
+#line 106 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 
 
 
@@ -682,7 +682,7 @@ static const int graphql_c_lexer_error = -1;
 static const int graphql_c_lexer_en_main = 21;
 
 
-#line 104 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
+#line 108 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 
 
 #include <ruby.h>
@@ -778,6 +778,10 @@ typedef struct Meta {
 	VALUE tokens;
 	VALUE previous_token;
 	int dedup_identifiers;
+	int reject_numbers_followed_by_names;
+	int preceeded_by_number;
+	int max_tokens;
+	int tokens_count;
 } Meta;
 
 #define STATIC_VALUE_TOKEN(token_type, content_str) \
@@ -793,11 +797,25 @@ token_content = rb_utf8_str_new(ts, te - ts); \
 break;
 
 void emit(TokenType tt, char *ts, char *te, Meta *meta) {
+	meta->tokens_count++;
+	// -1 indicates that there is no limit:
+	if (meta->max_tokens > 0 && meta->tokens_count > meta->max_tokens) {
+		VALUE mGraphQL = rb_const_get_at(rb_cObject, rb_intern("GraphQL"));
+		VALUE cParseError = rb_const_get_at(mGraphQL, rb_intern("ParseError"));
+		VALUE exception = rb_funcall(
+		cParseError, rb_intern("new"), 4,
+		rb_str_new_cstr("This query is too large to execute."),
+		LONG2NUM(meta->line),
+		LONG2NUM(meta->col),
+		rb_str_new_cstr(meta->query_cstr)
+		);
+		rb_exc_raise(exception);
+	}
 	int quotes_length = 0; // set by string tokens below
 	int line_incr = 0;
 	VALUE token_sym = Qnil;
 	VALUE token_content = Qnil;
-	
+	int this_token_is_number = 0;
 	switch(tt) {
 		STATIC_VALUE_TOKEN(ON, "on")
 		STATIC_VALUE_TOKEN(FRAGMENT, "fragment")
@@ -846,6 +864,19 @@ void emit(TokenType tt, char *ts, char *te, Meta *meta) {
 		token_content = GraphQL_null_str;
 		break;
 		case IDENTIFIER:
+		if (meta->reject_numbers_followed_by_names && meta->preceeded_by_number) {
+			VALUE mGraphQL = rb_const_get_at(rb_cObject, rb_intern("GraphQL"));
+			VALUE mCParser = rb_const_get_at(mGraphQL, rb_intern("CParser"));
+			VALUE exception = rb_funcall(
+			mCParser, rb_intern("prepare_number_name_parse_error"), 5,
+			LONG2NUM(meta->line),
+			LONG2NUM(meta->col),
+			rb_str_new_cstr(meta->query_cstr),
+			rb_ary_entry(meta->previous_token, 3),
+			rb_utf8_str_new(ts, te - ts)
+			);
+			rb_exc_raise(exception);
+		}
 		token_sym = ID2SYM(rb_intern("IDENTIFIER"));
 		if (meta->dedup_identifiers) {
 			token_content = rb_enc_interned_str(ts, te - ts, rb_utf8_encoding());
@@ -853,8 +884,19 @@ void emit(TokenType tt, char *ts, char *te, Meta *meta) {
 			token_content = rb_utf8_str_new(ts, te - ts);
 		}
 		break;
-		DYNAMIC_VALUE_TOKEN(INT)
-		DYNAMIC_VALUE_TOKEN(FLOAT)
+		// Can't use these while we're in backwards-compat mode:
+		// DYNAMIC_VALUE_TOKEN(INT)
+		// DYNAMIC_VALUE_TOKEN(FLOAT)
+		case INT:
+		token_sym = ID2SYM(rb_intern("INT"));
+		token_content = rb_utf8_str_new(ts, te - ts);
+		this_token_is_number = 1;
+		break;
+		case FLOAT:
+		token_sym = ID2SYM(rb_intern("FLOAT"));
+		token_content = rb_utf8_str_new(ts, te - ts);
+		this_token_is_number = 1;
+		break;
 		DYNAMIC_VALUE_TOKEN(COMMENT)
 		case UNKNOWN_CHAR:
 		if (ts[0] == '\0') {
@@ -922,6 +964,7 @@ void emit(TokenType tt, char *ts, char *te, Meta *meta) {
 		if (tt != COMMENT) {
 			rb_ary_push(meta->tokens, token);
 		}
+		meta->preceeded_by_number = this_token_is_number;
 		meta->previous_token = token;
 	}
 	// Bump the column counter for the next token
@@ -929,7 +972,7 @@ void emit(TokenType tt, char *ts, char *te, Meta *meta) {
 	meta->line += line_incr;
 }
 
-VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
+VALUE tokenize(VALUE query_rbstr, int fstring_identifiers, int reject_numbers_followed_by_names, int max_tokens) {
 	int cs = 0;
 	int act = 0;
 	char *p = StringValueCStr(query_rbstr);
@@ -938,11 +981,11 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 	char *ts = 0;
 	char *te = 0;
 	VALUE tokens = rb_ary_new();
-	struct Meta meta_s = {1, 1, p, pe, tokens, Qnil, fstring_identifiers};
+	struct Meta meta_s = {1, 1, p, pe, tokens, Qnil, fstring_identifiers, reject_numbers_followed_by_names, 0, max_tokens, 0};
 	Meta *meta = &meta_s;
 	
 	
-#line 946 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 989 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 	{
 		cs = (int)graphql_c_lexer_start;
 		ts = 0;
@@ -950,10 +993,10 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 		act = 0;
 	}
 	
-#line 362 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
+#line 409 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 	
 	
-#line 957 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1000 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 	{
 		unsigned int _trans = 0;
 		const char * _keys;
@@ -968,7 +1011,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 					{ts = p;}}
 				
-#line 972 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1015 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 				
 				
 				break; 
@@ -1006,7 +1049,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1010 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1053 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1019,7 +1062,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(RCURLY, ts, te, meta); }
 						}}
 					
-#line 1023 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1066 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1032,7 +1075,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(LCURLY, ts, te, meta); }
 						}}
 					
-#line 1036 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1079 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1045,7 +1088,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(RPAREN, ts, te, meta); }
 						}}
 					
-#line 1049 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1092 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1058,7 +1101,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(LPAREN, ts, te, meta); }
 						}}
 					
-#line 1062 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1105 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1071,7 +1114,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(RBRACKET, ts, te, meta); }
 						}}
 					
-#line 1075 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1118 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1084,7 +1127,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(LBRACKET, ts, te, meta); }
 						}}
 					
-#line 1088 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1131 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1097,7 +1140,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(COLON, ts, te, meta); }
 						}}
 					
-#line 1101 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1144 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1110,7 +1153,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(BLOCK_STRING, ts, te, meta); }
 						}}
 					
-#line 1114 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1157 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1123,7 +1166,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(QUOTED_STRING, ts, te, meta); }
 						}}
 					
-#line 1127 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1170 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1136,7 +1179,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(VAR_SIGN, ts, te, meta); }
 						}}
 					
-#line 1140 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1183 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1149,7 +1192,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(DIR_SIGN, ts, te, meta); }
 						}}
 					
-#line 1153 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1196 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1162,7 +1205,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(ELLIPSIS, ts, te, meta); }
 						}}
 					
-#line 1166 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1209 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1175,7 +1218,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(EQUALS, ts, te, meta); }
 						}}
 					
-#line 1179 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1222 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1188,7 +1231,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(BANG, ts, te, meta); }
 						}}
 					
-#line 1192 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1235 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1201,7 +1244,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(PIPE, ts, te, meta); }
 						}}
 					
-#line 1205 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1248 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1214,7 +1257,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(AMP, ts, te, meta); }
 						}}
 					
-#line 1218 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1261 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1227,23 +1270,24 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								
 								meta->line += 1;
 								meta->col = 1;
+								meta->preceeded_by_number = 0;
 							}
 						}}
 					
-#line 1234 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1278 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
 				}
 				case 11:  {
 					{
-#line 100 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
+#line 104 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{te = p+1;{
-#line 100 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
+#line 104 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 								emit(UNKNOWN_CHAR, ts, te, meta); }
 						}}
 					
-#line 1247 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1291 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1256,7 +1300,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(INT, ts, te, meta); }
 						}}
 					
-#line 1260 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1304 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1269,7 +1313,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(FLOAT, ts, te, meta); }
 						}}
 					
-#line 1273 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1317 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1282,7 +1326,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(BLOCK_STRING, ts, te, meta); }
 						}}
 					
-#line 1286 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1330 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1295,7 +1339,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(QUOTED_STRING, ts, te, meta); }
 						}}
 					
-#line 1299 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1343 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1308,7 +1352,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(IDENTIFIER, ts, te, meta); }
 						}}
 					
-#line 1312 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1356 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1321,33 +1365,36 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(COMMENT, ts, te, meta); }
 						}}
 					
-#line 1325 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1369 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
 				}
 				case 27:  {
 					{
-#line 98 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
+#line 99 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{te = p;p = p - 1;{
-#line 98 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
-								meta->col += te - ts; }
+#line 99 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
+								
+								meta->col += te - ts;
+								meta->preceeded_by_number = 0;
+							}
 						}}
 					
-#line 1338 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1385 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
 				}
 				case 28:  {
 					{
-#line 100 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
+#line 104 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{te = p;p = p - 1;{
-#line 100 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
+#line 104 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 								emit(UNKNOWN_CHAR, ts, te, meta); }
 						}}
 					
-#line 1351 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1398 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1361,7 +1408,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(INT, ts, te, meta); }
 						}}
 					
-#line 1365 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1412 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1375,21 +1422,21 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 								emit(FLOAT, ts, te, meta); }
 						}}
 					
-#line 1379 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1426 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
 				}
 				case 1:  {
 					{
-#line 100 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
+#line 104 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{p = ((te))-1;
 							{
-#line 100 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
+#line 104 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 								emit(UNKNOWN_CHAR, ts, te, meta); }
 						}}
 					
-#line 1393 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1440 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1555,7 +1602,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 							}}
 					}
 					
-#line 1559 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1606 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1565,13 +1612,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1569 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1616 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 56 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 3;}}
 					
-#line 1575 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1622 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1581,13 +1628,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1585 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1632 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 57 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 4;}}
 					
-#line 1591 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1638 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1597,13 +1644,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1601 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1648 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 58 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 5;}}
 					
-#line 1607 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1654 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1613,13 +1660,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1617 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1664 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 59 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 6;}}
 					
-#line 1623 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1670 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1629,13 +1676,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1633 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1680 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 60 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 7;}}
 					
-#line 1639 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1686 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1645,13 +1692,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1649 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1696 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 61 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 8;}}
 					
-#line 1655 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1702 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1661,13 +1708,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1665 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1712 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 62 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 9;}}
 					
-#line 1671 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1718 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1677,13 +1724,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1681 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1728 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 63 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 10;}}
 					
-#line 1687 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1734 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1693,13 +1740,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1697 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1744 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 64 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 11;}}
 					
-#line 1703 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1750 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1709,13 +1756,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1713 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1760 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 65 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 12;}}
 					
-#line 1719 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1766 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1725,13 +1772,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1729 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1776 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 66 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 13;}}
 					
-#line 1735 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1782 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1741,13 +1788,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1745 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1792 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 67 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 14;}}
 					
-#line 1751 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1798 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1757,13 +1804,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1761 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1808 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 68 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 15;}}
 					
-#line 1767 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1814 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1773,13 +1820,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1777 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1824 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 69 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 16;}}
 					
-#line 1783 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1830 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1789,13 +1836,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1793 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1840 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 70 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 17;}}
 					
-#line 1799 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1846 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1805,13 +1852,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1809 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1856 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 71 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 18;}}
 					
-#line 1815 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1862 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1821,13 +1868,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1825 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1872 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 72 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 19;}}
 					
-#line 1831 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1878 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1837,13 +1884,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1841 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1888 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 73 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 20;}}
 					
-#line 1847 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1894 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1853,13 +1900,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1857 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1904 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 74 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 21;}}
 					
-#line 1863 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1910 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1869,13 +1916,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1873 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1920 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 82 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 29;}}
 					
-#line 1879 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1926 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1885,13 +1932,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1889 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1936 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 83 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 30;}}
 					
-#line 1895 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1942 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1901,13 +1948,13 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{te = p+1;}}
 					
-#line 1905 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1952 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					{
 #line 91 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 						{act = 38;}}
 					
-#line 1911 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1958 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1927,7 +1974,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 #line 1 "NONE"
 						{ts = 0;}}
 					
-#line 1931 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
+#line 1978 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.c"
 					
 					
 					break; 
@@ -1940,7 +1987,7 @@ VALUE tokenize(VALUE query_rbstr, int fstring_identifiers) {
 		_out: {}
 	}
 	
-#line 363 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
+#line 410 "graphql-c_parser/ext/graphql_c_parser_ext/lexer.rl"
 	
 	
 	return tokens;

data/ext/graphql_c_parser_ext/lexer.h

@@ -1,6 +1,6 @@
 #ifndef Graphql_lexer_h
 #define Graphql_lexer_h
 #include <ruby.h>
-VALUE tokenize(VALUE query_rbstr, int fstring_identifiers);
+VALUE tokenize(VALUE query_rbstr, int fstring_identifiers, int reject_numbers_followed_by_names, int max_tokens);
 void setup_static_token_variables();
 #endif

data/lib/graphql/c_parser/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module CParser
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/lib/graphql/c_parser.rb

@@ -6,8 +6,8 @@ require "graphql/graphql_c_parser_ext"
 
 module GraphQL
   module CParser
-    def self.parse(query_str, filename: nil, trace: GraphQL::Tracing::NullTrace)
-      Parser.parse(query_str, filename: filename, trace: trace)
+    def self.parse(query_str, filename: nil, trace: GraphQL::Tracing::NullTrace, max_tokens: nil)
+      Parser.parse(query_str, filename: filename, trace: trace, max_tokens: max_tokens)
     end
 
     def self.parse_file(filename)
@@ -16,12 +16,15 @@ module GraphQL
     end
 
     def self.tokenize_with_c(str)
-      tokenize_with_c_internal(str, false)
+      reject_numbers_followed_by_names = GraphQL.respond_to?(:reject_numbers_followed_by_names) && GraphQL.reject_numbers_followed_by_names
+      tokenize_with_c_internal(str, false, reject_numbers_followed_by_names)
     end
 
     def self.prepare_parse_error(message, parser)
+      query_str = parser.query_string
+      filename = parser.filename
       if message.start_with?("memory exhausted")
-        return GraphQL::ParseError.new("This query is too large to execute.", nil, nil, parser.query_string, filename: parser.filename)
+        return GraphQL::ParseError.new("This query is too large to execute.", nil, nil, query_str, filename: filename)
       end
       token = parser.tokens[parser.next_token_index - 1]
       if token
@@ -40,7 +43,11 @@ module GraphQL
         end
       end
 
-      GraphQL::ParseError.new(message, line, col, parser.query_string, filename: parser.filename)
+      GraphQL::ParseError.new(message, line, col, query_str, filename: filename)
+    end
+
+    def self.prepare_number_name_parse_error(line, col, query_str, number_part, name_part)
+      raise GraphQL::ParseError.new("Name after number is not allowed (in `#{number_part}#{name_part}`)", line, col, query_str)
     end
 
     def self.prepare_bad_unicode_error(parser)
@@ -57,7 +64,7 @@ module GraphQL
     end
 
     module Lexer
-      def self.tokenize(graphql_string, intern_identifiers: false)
+      def self.tokenize(graphql_string, intern_identifiers: false, max_tokens: nil)
         if !(graphql_string.encoding == Encoding::UTF_8 || graphql_string.ascii_only?)
           graphql_string = graphql_string.dup.force_encoding(Encoding::UTF_8)
         end
@@ -73,13 +80,16 @@ module GraphQL
             ]
           ]
         end
-        tokenize_with_c_internal(graphql_string, intern_identifiers)
+        reject_numbers_followed_by_names = GraphQL.respond_to?(:reject_numbers_followed_by_names) && GraphQL.reject_numbers_followed_by_names
+        # -1 indicates that there is no limit
+        lexer_max_tokens = max_tokens.nil? ? -1 : max_tokens
+        tokenize_with_c_internal(graphql_string, intern_identifiers, reject_numbers_followed_by_names, lexer_max_tokens)
       end
     end
 
     class Parser
-      def self.parse(query_str, filename: nil, trace: GraphQL::Tracing::NullTrace)
-        self.new(query_str, filename, trace).result
+      def self.parse(query_str, filename: nil, trace: GraphQL::Tracing::NullTrace, max_tokens: nil)
+        self.new(query_str, filename, trace, max_tokens).result
       end
 
       def self.parse_file(filename)
@@ -87,7 +97,7 @@ module GraphQL
         parse(contents, filename: filename)
       end
 
-      def initialize(query_string, filename, trace)
+      def initialize(query_string, filename, trace, max_tokens)
         if query_string.nil?
           raise GraphQL::ParseError.new("No query string was present", nil, nil, query_string)
         end
@@ -98,12 +108,13 @@ module GraphQL
         @result = nil
         @trace = trace
         @intern_identifiers = false
+        @max_tokens = max_tokens
       end
 
       def result
         if @result.nil?
           @tokens = @trace.lex(query_string: @query_string) do
-            GraphQL::CParser::Lexer.tokenize(@query_string, intern_identifiers: @intern_identifiers)
+            GraphQL::CParser::Lexer.tokenize(@query_string, intern_identifiers: @intern_identifiers, max_tokens: @max_tokens)
           end
           @trace.parse(query_string: @query_string) do
             c_parse

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-c_parser
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-15 00:00:00.000000000 Z
+date: 2024-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql