Merge fixes

Author: nystrom

meta/src/meta/templates/parser.jl.template

@@ -345,7 +345,7 @@ end
 
 function parse_fragment(input::String)
     lexer = Lexer(input)
-    parser = ParserState(lexer.tokens)
+    parser = ParserState(lexer.tokens, input)
     result = parse_fragment(parser)
     # Check for unconsumed tokens (except EOF)
     if parser.pos <= length(parser.tokens)
@@ -354,7 +354,7 @@ function parse_fragment(input::String)
             throw(ParseError("Unexpected token at end of input: $remaining_token"))
         end
     end
-    return result
+    return result, parser.provenance
 end
 
 function parse(input::String)

sdks/go/test/parser_test.go

@@ -35,7 +35,7 @@ func TestBasicParsing(t *testing.T) {
 // TestParseTransaction tests the ParseTransaction entry point.
 func TestParseTransaction(t *testing.T) {
 	input := `(transaction (epoch (writes) (reads)))`
-	result, err := lqp.ParseTransaction(input)
+	result, _, err := lqp.ParseTransaction(input)
 	if err != nil {
 		t.Fatalf("Failed to parse transaction: %v", err)
 	}
@@ -50,7 +50,7 @@ func TestParseTransaction(t *testing.T) {
 // TestParseFragment tests the ParseFragment entry point.
 func TestParseFragment(t *testing.T) {
 	input := `(fragment :test_frag (def :my_rel ([x::INT] (relatom :my_rel x))))`
-	result, err := lqp.ParseFragment(input)
+	result, _, err := lqp.ParseFragment(input)
 	if err != nil {
 		t.Fatalf("Failed to parse fragment: %v", err)
 	}
@@ -62,11 +62,11 @@ func TestParseFragment(t *testing.T) {
 // TestParseDelegatesToParseTransaction verifies Parse and ParseTransaction return equal results.
 func TestParseDelegatesToParseTransaction(t *testing.T) {
 	input := `(transaction (epoch (writes) (reads)))`
-	r1, err := lqp.Parse(input)
+	r1, _, err := lqp.Parse(input)
 	if err != nil {
 		t.Fatalf("Parse failed: %v", err)
 	}
-	r2, err := lqp.ParseTransaction(input)
+	r2, _, err := lqp.ParseTransaction(input)
 	if err != nil {
 		t.Fatalf("ParseTransaction failed: %v", err)
 	}
@@ -77,15 +77,15 @@ func TestParseDelegatesToParseTransaction(t *testing.T) {
 
 // TestParseFragmentRejectsTransaction verifies ParseFragment rejects transaction input.
 func TestParseFragmentRejectsTransaction(t *testing.T) {
-	_, err := lqp.ParseFragment(`(transaction (epoch (writes) (reads)))`)
+	_, _, err := lqp.ParseFragment(`(transaction (epoch (writes) (reads)))`)
 	if err == nil {
 		t.Error("ParseFragment should reject transaction input")
 	}
 }
 
 // TestParseTransactionRejectsFragment verifies ParseTransaction rejects fragment input.
 func TestParseTransactionRejectsFragment(t *testing.T) {
-	_, err := lqp.ParseTransaction(`(fragment :f (def :r ([x::INT] (relatom :r x))))`)
+	_, _, err := lqp.ParseTransaction(`(fragment :f (def :r ([x::INT] (relatom :r x)))`)
 	if err == nil {
 		t.Error("ParseTransaction should reject fragment input")
 	}

sdks/python/tests/test_parser.py

@@ -28,13 +28,13 @@ def test_parse_lqp(snapshot: Snapshot, input_file):
 
 
 def test_parse_transaction():
-    result = parse_transaction(_SIMPLE_TXN)
+    result, _provenance = parse_transaction(_SIMPLE_TXN)
     assert isinstance(result, transactions_pb2.Transaction)
     assert len(result.epochs) == 1
 
 
 def test_parse_fragment():
-    result = parse_fragment(_SIMPLE_FRAGMENT)
+    result, _provenance = parse_fragment(_SIMPLE_FRAGMENT)
     assert isinstance(result, fragments_pb2.Fragment)