@surrealdb/lezer 1.0.4 → 1.0.8

package/src/surrealql.grammar

@@ -32,6 +32,7 @@
 	filter
 	for
 	clause
+	flexibleAfter
 }
 
 expressions {
@@ -63,6 +64,7 @@ anyKeyword {
 	asc |
 	assert |
 	at |
+	async |
 	authenticate |
 	auto |
 	begin |
@@ -336,6 +338,7 @@ defineEventOptions {
 			value
 		} |
 		ThenClause {
+			async?
 			then
 			commaSep<(SubQuery | Block)>
 		} |
@@ -778,7 +781,7 @@ ShowStatement {
 	show changes for table
 	Ident
 	( since String )?
-	( limit number )?
+	( limit Number )?
 }
 
 // Sleep statement
@@ -816,30 +819,34 @@ RebuildStatement[since=1_5_0] {
 
 // Values
 
-baseValue {
+computedValue[@isGroup=Value] {
 	String |
 	prefixedString |
-	FormatString |
-	number |
+	Number |
 	true |
 	false |
 	null |
 	none |
-	Regex |
-	VariableName |
-	Ident[@dynamicPrecedence=-1] { rawident } |
 	Array |
 	Set |
 	RecordId |
+	Object |
+	Duration |
+	Point { "(" Number "," Number ")" }
+}
+
+baseValue[@isGroup=Value] {
+	computedValue |
+	FormatString |
+	Regex |
+	VariableName |
+	Ident[@dynamicPrecedence=-1] { rawident } |
 	FunctionJs |
 	FunctionCall |
 	SubQuery |
 	Block |
 	Closure |
-	Object |
-	TypeCast |
-	Duration |
-	Point { "(" number "," number ")" }
+	TypeCast
 }
 
 value[@isGroup=Value] {
@@ -868,7 +875,12 @@ Range[since=2_0_0] {
 }
 
 Idiom {
-	Ident ( "." Ident )*
+	Ident idiomPart*
+}
+
+idiomPart {
+	"." ( Ident | AnyStar ) |
+	"[" AnyStar "]"
 }
 
 Path {
@@ -940,11 +952,11 @@ Recurse[since=2_1_0] {
 }
 
 RecurseRange {
-	number |
+	Number |
 	rangeOpOpenBoth |
-	number rangeOpOpenRight |
-	rangeOpOpenLeft number |
-	number rangeOp number
+	Number rangeOpOpenRight |
+	rangeOpOpenLeft Number |
+	Number rangeOp Number
 }
 
 RecurseOptions[since=2_2_0] {
@@ -1005,7 +1017,7 @@ RecordTbIdent {
 	bracketIdent
 }
 
-// Ideally we match "number" here, but I cannot for the life of me get it to
+// Ideally we match "Number" here, but I cannot for the life of me get it to
 // fall back to numberident after. This will suffice for now.
 RecordIdIdent {
 	numberident |
@@ -1092,7 +1104,7 @@ FieldAssignment {
 // Clauses
 
 MergeClause {
-	merge Object
+	merge value
 }
 
 PatchClause {
@@ -1199,15 +1211,15 @@ SearchAnalyzerClause {
 	)*
 }
 
-Bm25Clause { bm25 ( "(" number "," number ")")? }
-DocIdsCacheClause { doc_ids_cache number }
-DocIdsOrderClause { doc_ids_order number }
-DocLenghtsCacheClause { doc_lengths_cache number }
-DocLenghtsOrderClause { doc_lengths_order number }
-PostingsCacheClause { postings_cache number }
-PostingsOrderClause { postings_order number }
-TermsCacheClause { terms_cache number }
-TermsOrderClause { terms_order number }
+Bm25Clause { bm25 ( "(" Number "," Number ")")? }
+DocIdsCacheClause { doc_ids_cache Number }
+DocIdsOrderClause { doc_ids_order Number }
+DocLenghtsCacheClause { doc_lengths_cache Number }
+DocLenghtsOrderClause { doc_lengths_order Number }
+PostingsCacheClause { postings_cache Number }
+PostingsOrderClause { postings_order Number }
+TermsCacheClause { terms_cache Number }
+TermsOrderClause { terms_order Number }
 
 MtreeClause[since=1_3_0] {
 	mtree
@@ -1222,7 +1234,7 @@ MtreeClause[since=1_3_0] {
 	)*
 }
 
-MtreeCacheClause { mtree_cache number }
+MtreeCacheClause { mtree_cache Number }
 MtreeDistClause { dist ( Distance ) }
 
 HnswClause[since=1_5_0] {
@@ -1241,14 +1253,14 @@ IndexDimensionClause
 	)*
 }
 
-HnswDistClause { dist ( Distance | ( minkowski number )) }
+HnswDistClause { dist ( Distance | ( minkowski Number )) }
 
-IndexDimensionClause { dimension number }
-IndexCapacityClause { capacity number }
-IndexLmClause { lm number }
-IndexM0Clause { m0 number }
-IndexMClause { m number }
-IndexEfcClause { efc number }
+IndexDimensionClause { dimension Number }
+IndexCapacityClause { capacity Number }
+IndexLmClause { lm Number }
+IndexM0Clause { m0 Number }
+IndexMClause { m Number }
+IndexEfcClause { efc Number }
 IndexExtendCandidatesClause { extend_candidates }
 IndexKeepPrunedConnectionsClause { keep_pruned_connections }
 
@@ -1304,19 +1316,19 @@ TempfilesClause[since=2_0_0] {
 
 FetchClause {
 	fetch
-	commaSep<Path>
+	commaSep<Idiom>
 }
 
 StartClause {
 	start
 	at?
-	(number | VariableName)
+	(Number | VariableName)
 }
 
 LimitClause {
 	limit
 	by?
-	(number | VariableName)
+	(Number | VariableName)
 }
 
 LimitStartComboClause {
@@ -1380,9 +1392,9 @@ FunctionClause {
 }
 
 TypeClause {
-	flexible?
-	typeKeyword
-	type
+	( flexible typeKeyword type ) |
+	( typeKeyword type !flexibleAfter flexible ) |
+	( typeKeyword type )
 }
 
 ReadonlyClause[since=1_2_0] {
@@ -1465,7 +1477,7 @@ BackendClause {
 // Support
 
 AnalyzerFilters {
-	Filter ("(" (number "," number | Ident) ")")?
+	Filter ("(" (Number "," Number | Ident) ")")?
 }
 
 Order {
@@ -1488,11 +1500,11 @@ inclusivePredicate {
 
 LiteralType[since=2_0_0] {
 	String |
-	number |
+	Number |
 	Duration |
 	ArrayType { "[" commaSep<type> "]" } |
 	ObjectType { objectOpen ObjectTypeContent? "}" }
-	// TODO support number and duration types
+	// TODO support Number and duration types
 }
 
 singleType {
@@ -1527,7 +1539,7 @@ Ident {
 	tickIdent
 }
 
-number { ("-" | "+")? (Int | Float | Decimal) }
+Number { ("-" | "+")? (Int | Float | Decimal) }
 
 Operator {
 	binaryOperator |
@@ -1536,11 +1548,11 @@ Operator {
 	is | ( is opNot ) |
 	in | ( opNot opIn ) |
 
-	( "@" number "@" ) |
+	( "@" Number "@" ) |
 	(
 		"<|"
-		number
-		( "," ( number | Distance | ( minkowski number ) ) )
+		Number
+		( "," ( Number | Distance | ( minkowski Number ) ) )
 		"|>"
 	)
 }
@@ -1589,12 +1601,13 @@ Operator {
 	CommentResult[@name=Comment,closedBy=CommentResultClose] { "-------- Query" ![\n]* }
 
 	// Numbers
-	Int { @digit+ }
-	frac { '.' @digit+ }
-	exp { $[eE] $[+\-]? @digit+ }
-	Float { (@digit+ (frac exp? | exp) "f"?) | "Infinity" | "NaN" }
-	Decimal { @digit+ frac? exp? "dec" }
-	VersionNumber { @digit+ ("." @digit+ ("." @digit+)?)? }
+	digitSeq { @digit+ ("_" @digit+)* }
+	Int { digitSeq }
+	frac { '.' digitSeq }
+	exp { $[eE] $[+\-]? digitSeq }
+	Float { (digitSeq "f") | (digitSeq (frac exp? | exp) "f"?) | "Infinity" | "NaN" }
+	Decimal { digitSeq frac? exp? "dec" }
+	VersionNumber { digitSeq ("." digitSeq ("." digitSeq)?)? }
 
 	String { "'" (!['\\] | "\\" _)* "'" | '"' (!["\\] | "\\" _)* '"' }
 	prefixedString[@name=String] { $[rudbf] String }
@@ -1627,7 +1640,7 @@ Operator {
 	Regex { "/" (![/\\\n[] | "\\" ![\n] | "[" (![\n\\\]] | "\\" ![\n])* "]")+ ("/" $[dgimsuvy]*)? }
 
 	durationUnit { "ns" | "us" | "µs" | "ms" | "s" | "m" | "h" | "d" | "w" | "y"}
-	DurationPart { @digit+ " "* durationUnit }
+	DurationPart { digitSeq " "* durationUnit }
 
 	@precedence { CommentResult Comment Int "-" }
 	@precedence { Comment binaryOperator }
@@ -1689,6 +1702,7 @@ piped<content> {
 	asc						[@name=Keyword],
 	assert					[@name=Keyword],
 	at						[@name=Keyword],
+	async					[@name=Keyword],
 	authenticate			[@name=Keyword],
 	auto					[@name=Keyword],
 	backend					[@name=Keyword],

package/src/tokens.js

@@ -25,6 +25,7 @@ import {
 	asc,
 	assert,
 	at,
+	async,
 	authenticate,
 	auto,
 	backend,
@@ -222,6 +223,7 @@ const tokenMap = {
 	asc,
 	assert,
 	at,
+	async,
 	authenticate,
 	auto,
 	backend,

package/test/misc/comments.txt

@@ -5,7 +5,7 @@
 
 ==>
 
-SurrealQL(Comment,Int)
+SurrealQL(Comment,Number(Int))
 
 # Dash comment
 
@@ -14,7 +14,7 @@ SurrealQL(Comment,Int)
 
 ==>
 
-SurrealQL(Comment,Int)
+SurrealQL(Comment,Number(Int))
 
 # Slash comment
 
@@ -23,7 +23,7 @@ SurrealQL(Comment,Int)
 
 ==>
 
-SurrealQL(Comment,Int)
+SurrealQL(Comment,Number(Int))
 
 # Block comment
 
@@ -33,7 +33,7 @@ SurrealQL(Comment,Int)
 
 ==>
 
-SurrealQL(BinaryExpression(Int,BlockComment,Operator,Int))
+SurrealQL(BinaryExpression(Number(Int),BlockComment,Operator,Number(Int)))
 
 # Block comment standalone
 
@@ -41,4 +41,4 @@ SurrealQL(BinaryExpression(Int,BlockComment,Operator,Int))
 
 ==>
 
-SurrealQL(BlockComment,Int)
+SurrealQL(BlockComment,Number(Int))

package/test/misc/functions.txt

@@ -12,7 +12,7 @@ fn::one::two(1, a)
 
 ==>
 
-SurrealQL(FunctionCall(FunctionName,ArgumentList(Int,Ident)))
+SurrealQL(FunctionCall(FunctionName,ArgumentList(Number(Int),Ident)))
 
 # Rand function
 
@@ -20,7 +20,7 @@ rand(3)
 
 ==>
 
-SurrealQL(FunctionCall(FunctionName,ArgumentList(Int)))
+SurrealQL(FunctionCall(FunctionName,ArgumentList(Number(Int))))
 
 # Count function
 
@@ -60,4 +60,4 @@ $func(1)
 
 ==>
 
-SurrealQL(FunctionCall(VariableName,ArgumentList(Int)))
+SurrealQL(FunctionCall(VariableName,ArgumentList(Number(Int))))

package/test/misc/identifiers.txt

@@ -16,7 +16,7 @@ create bla set true = 1, false = 2, null = 3, none = 4
 SurrealQL(CreateStatement(
   Keyword,Ident,
   SetClause( Keyword,
-    FieldAssignment(Ident,Operator,Int),
-    FieldAssignment(Ident,Operator,Int),
-    FieldAssignment(Ident,Operator,Int),
-    FieldAssignment(Ident,Operator,Int))))
+    FieldAssignment(Ident,Operator,Number(Int)),
+    FieldAssignment(Ident,Operator,Number(Int)),
+    FieldAssignment(Ident,Operator,Number(Int)),
+    FieldAssignment(Ident,Operator,Number(Int)))))

package/test/misc/javascript.txt

@@ -12,7 +12,7 @@ function(123, 1d2h) {
 SurrealQL(
   FunctionJs(
     FunctionName,
-    ArgumentList(Int,Duration(DurationPart,DurationPart)),
+    ArgumentList(Number(Int),Duration(DurationPart,DurationPart)),
     JavaScriptBlock(BraceOpen,JavaScriptContent,BraceClose)
   )
 )

package/test/misc/operators.txt

@@ -4,7 +4,7 @@
 
 ==>
 
-SurrealQL(BinaryExpression(Int,Operator,Int))
+SurrealQL(BinaryExpression(Number(Int),Operator,Number(Int)))
 
 # Subtraction
 
@@ -12,7 +12,7 @@ SurrealQL(BinaryExpression(Int,Operator,Int))
 
 ==>
 
-SurrealQL(BinaryExpression(Int,Operator,Int))
+SurrealQL(BinaryExpression(Number(Int),Operator,Number(Int)))
 
 # Multiplication
 
@@ -20,7 +20,7 @@ SurrealQL(BinaryExpression(Int,Operator,Int))
 
 ==>
 
-SurrealQL(BinaryExpression(Int,Operator,Int))
+SurrealQL(BinaryExpression(Number(Int),Operator,Number(Int)))
 
 # Division
 
@@ -28,7 +28,7 @@ SurrealQL(BinaryExpression(Int,Operator,Int))
 
 ==>
 
-SurrealQL(BinaryExpression(Int,Operator,Int))
+SurrealQL(BinaryExpression(Number(Int),Operator,Number(Int)))
 
 # Power
 
@@ -36,7 +36,7 @@ SurrealQL(BinaryExpression(Int,Operator,Int))
 
 ==>
 
-SurrealQL(BinaryExpression(Int,Operator,Int))
+SurrealQL(BinaryExpression(Number(Int),Operator,Number(Int)))
 
 # Equality
 
@@ -178,7 +178,7 @@ SurrealQL(BinaryExpression(Ident,Operator,Ident))
 
 ==>
 
-SurrealQL(BinaryExpression(Int,Operator,Int))
+SurrealQL(BinaryExpression(Number(Int),Operator,Number(Int)))
 
 # Unicode division
 
@@ -186,7 +186,7 @@ SurrealQL(BinaryExpression(Int,Operator,Int))
 
 ==>
 
-SurrealQL(BinaryExpression(Int,Operator,Int))
+SurrealQL(BinaryExpression(Number(Int),Operator,Number(Int)))
 
 # Matches operator with distance
 
@@ -194,7 +194,7 @@ x @1@ y
 
 ==>
 
-SurrealQL(BinaryExpression(Ident,Operator(Int),Ident))
+SurrealQL(BinaryExpression(Ident,Operator(Number(Int)),Ident))
 
 # Addition assignment in expression
 
@@ -202,7 +202,7 @@ a += 1
 
 ==>
 
-SurrealQL(BinaryExpression(Ident,Operator,Int))
+SurrealQL(BinaryExpression(Ident,Operator,Number(Int)))
 
 # Subtraction assignment in expression
 
@@ -210,4 +210,4 @@ a -= 1
 
 ==>
 
-SurrealQL(BinaryExpression(Ident,Operator,Int))
+SurrealQL(BinaryExpression(Ident,Operator,Number(Int)))

package/test/misc/subqueries.txt

@@ -12,7 +12,7 @@ SurrealQL(SubQuery(SelectStatement(Keyword,Fields(Any),Keyword,Ident)))
 
 ==>
 
-SurrealQL(SubQuery(BinaryExpression(Int,Operator,Int)))
+SurrealQL(SubQuery(BinaryExpression(Number(Int),Operator,Number(Int))))
 
 # Subquery with create
 

package/test/statements/create.txt

@@ -20,7 +20,7 @@ CREATE person SET name = "Tobie", age = 30
 
 ==>
 
-SurrealQL(CreateStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,String),FieldAssignment(Ident,Operator,Int))))
+SurrealQL(CreateStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,String),FieldAssignment(Ident,Operator,Number(Int)))))
 
 # Create with CONTENT
 
@@ -28,7 +28,7 @@ CREATE person CONTENT {name: "Tobie", age: 30}
 
 ==>
 
-SurrealQL(CreateStatement(Keyword,Ident,ContentClause(Keyword,Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,String),ObjectProperty(ObjectKey(KeyName),Colon,Int)),BraceClose))))
+SurrealQL(CreateStatement(Keyword,Ident,ContentClause(Keyword,Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,String),ObjectProperty(ObjectKey(KeyName),Colon,Number(Int))),BraceClose))))
 
 # Create with RETURN fields
 

package/test/statements/define.txt

@@ -46,6 +46,14 @@ DEFINE EVENT myevent ON TABLE person WHEN $event = "CREATE" THEN (CREATE log)
 
 SurrealQL(DefineStatement(Keyword,Keyword,Ident,OnTableClause(Keyword,Keyword,Ident),WhenClause(Keyword,BinaryExpression(VariableName,Operator,String)),ThenClause(Keyword,SubQuery(CreateStatement(Keyword,Ident)))))
 
+# Define event with async
+
+DEFINE EVENT e ON TABLE file WHEN $event = 'DELETE' ASYNC THEN { };
+
+==>
+
+SurrealQL(DefineStatement(Keyword,Keyword,Ident,OnTableClause(Keyword,Keyword,Ident),WhenClause(Keyword,BinaryExpression(VariableName,Operator,String)),ThenClause(Keyword,Keyword,Block(BraceOpen,BraceClose))))
+
 # Define field
 
 DEFINE FIELD name ON TABLE person TYPE string
@@ -60,7 +68,7 @@ DEFINE FIELD age ON TABLE person TYPE number DEFAULT 0
 
 ==>
 
-SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident),OnTableClause(Keyword,Keyword,Ident),TypeClause(Keyword,TypeName),DefaultClause(Keyword,DefaultAlways,Int)))
+SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident),OnTableClause(Keyword,Keyword,Ident),TypeClause(Keyword,TypeName),DefaultClause(Keyword,DefaultAlways,Number(Int))))
 
 # Define field with assert
 
@@ -86,6 +94,22 @@ DEFINE FIELD data ON TABLE person FLEXIBLE TYPE object
 
 SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident),OnTableClause(Keyword,Keyword,Ident),TypeClause(Keyword,Keyword,TypeName)))
 
+# Define field with flexible after type clause
+
+DEFINE FIELD metadata ON TABLE user TYPE object FLEXIBLE
+
+==>
+
+SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident),OnTableClause(Keyword,Keyword,Ident),TypeClause(Keyword,TypeName,Keyword)))
+
+# Define field flexible after parameterized object type
+
+DEFINE FIELD alternatives ON file TYPE option<object> FLEXIBLE
+
+==>
+
+SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident),OnTableClause(Keyword,Ident),TypeClause(Keyword,ParameterizedType(TypeName,"<",TypeName,">"),Keyword)))
+
 # Define field with permissions
 
 DEFINE FIELD secret ON TABLE person TYPE string PERMISSIONS FOR select, create WHERE $auth.admin = true
@@ -110,6 +134,30 @@ DEFINE FIELD fullname ON TABLE person COMPUTED $value.first + " " + $value.last
 
 SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident),OnTableClause(Keyword,Keyword,Ident),ComputedClause(Keyword,BinaryExpression(BinaryExpression(Path(VariableName,Subscript(Ident)),Operator,String),Operator,Path(VariableName,Subscript(Ident))))))
 
+# Define field on array items
+
+DEFINE FIELD children.* ON parent TYPE record<child> PERMISSIONS FULL
+
+==>
+
+SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident,Any),OnTableClause(Keyword,Ident),TypeClause(Keyword,ParameterizedType(TypeName,"<",TypeName,">")),PermissionsForClause(Keyword,Literal)))
+
+# Define field on array items with bracket wildcard
+
+DEFINE FIELD tags[*] ON TABLE person TYPE string
+
+==>
+
+SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident,"[",Any,"]"),OnTableClause(Keyword,Keyword,Ident),TypeClause(Keyword,TypeName)))
+
+# Define field nested below array items
+
+DEFINE FIELD comments.*.title ON TABLE post TYPE string
+
+==>
+
+SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident,Any,Ident),OnTableClause(Keyword,Keyword,Ident),TypeClause(Keyword,TypeName)))
+
 # Define index unique
 
 DEFINE INDEX idx_email ON TABLE person FIELDS email UNIQUE
@@ -118,6 +166,14 @@ DEFINE INDEX idx_email ON TABLE person FIELDS email UNIQUE
 
 SurrealQL(DefineStatement(Keyword,Keyword,Ident,OnTableClause(Keyword,Keyword,Ident),FieldsColumnsClause(Keyword,Idiom(Ident)),IndexClause(UniqueClause(Keyword))))
 
+# Define index on array items
+
+DEFINE INDEX idx_tags ON TABLE person FIELDS tags.* UNIQUE
+
+==>
+
+SurrealQL(DefineStatement(Keyword,Keyword,Ident,OnTableClause(Keyword,Keyword,Ident),FieldsColumnsClause(Keyword,Idiom(Ident,Any)),IndexClause(UniqueClause(Keyword))))
+
 # Define index search analyzer
 
 DEFINE INDEX idx_search ON TABLE person FIELDS name SEARCH ANALYZER my_analyzer BM25
@@ -132,7 +188,7 @@ DEFINE INDEX idx_vec ON TABLE person FIELDS embedding MTREE DIMENSION 3
 
 ==>
 
-SurrealQL(DefineStatement(Keyword,Keyword,Ident,OnTableClause(Keyword,Keyword,Ident),FieldsColumnsClause(Keyword,Idiom(Ident)),IndexClause(MtreeClause(Keyword,IndexDimensionClause(Keyword,Int)))))
+SurrealQL(DefineStatement(Keyword,Keyword,Ident,OnTableClause(Keyword,Keyword,Ident),FieldsColumnsClause(Keyword,Idiom(Ident)),IndexClause(MtreeClause(Keyword,IndexDimensionClause(Keyword,Number(Int))))))
 
 # Define index hnsw
 
@@ -140,7 +196,7 @@ DEFINE INDEX idx_vec ON TABLE person FIELDS embedding HNSW DIMENSION 3
 
 ==>
 
-SurrealQL(DefineStatement(Keyword,Keyword,Ident,OnTableClause(Keyword,Keyword,Ident),FieldsColumnsClause(Keyword,Idiom(Ident)),IndexClause(HnswClause(Keyword,IndexDimensionClause(Keyword,Int)))))
+SurrealQL(DefineStatement(Keyword,Keyword,Ident,OnTableClause(Keyword,Keyword,Ident),FieldsColumnsClause(Keyword,Idiom(Ident)),IndexClause(HnswClause(Keyword,IndexDimensionClause(Keyword,Number(Int))))))
 
 # Define function
 
@@ -222,7 +278,7 @@ DEFINE TABLE adult AS SELECT * FROM person WHERE age > 18
 
 ==>
 
-SurrealQL(DefineStatement(Keyword,Keyword,Ident,TableViewClause(Keyword,Keyword,Any,Keyword,Ident,WhereClause(Keyword,BinaryExpression(Ident,Operator,Int)))))
+SurrealQL(DefineStatement(Keyword,Keyword,Ident,TableViewClause(Keyword,Keyword,Any,Keyword,Ident,WhereClause(Keyword,BinaryExpression(Ident,Operator,Number(Int))))))
 
 # Define table with changefeed
 

package/test/statements/delete.txt

@@ -20,7 +20,7 @@ DELETE person WHERE age < 18
 
 ==>
 
-SurrealQL(DeleteStatement(Keyword,Ident,WhereClause(Keyword,BinaryExpression(Ident,Operator,Int))))
+SurrealQL(DeleteStatement(Keyword,Ident,WhereClause(Keyword,BinaryExpression(Ident,Operator,Number(Int)))))
 
 # Delete with RETURN BEFORE
 

package/test/statements/for.txt

@@ -6,7 +6,7 @@ FOR $item IN [1, 2, 3] {
 
 ==>
 
-SurrealQL(ForStatement(Keyword,VariableName,Keyword,Array("[",Int,Int,Int,"]"),Block(BraceOpen,CreateStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,VariableName))),BraceClose)))
+SurrealQL(ForStatement(Keyword,VariableName,Keyword,Array("[",Number(Int),Number(Int),Number(Int),"]"),Block(BraceOpen,CreateStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,VariableName))),BraceClose)))
 
 # For loop with variable