fixup! Always pass a valid begin iterator to parse methods.

zeek · Jan 16, 2024 · 1c98d02 · 1c98d02
1 parent f756af0
commit 1c98d02
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/spicy/toolchain/src/compiler/codegen/parser-builder.cc b/spicy/toolchain/src/compiler/codegen/parser-builder.cc
@@ -337,7 +337,7 @@ struct ProductionVisitor
                             builder()->addLocal("filtered_data", type::ValueReference(type::Stream()),
                                                 builder::id("filtered"));
                             args2[0] = builder::id("filtered_data");
-                            args2[1] = builder::default_(type::stream::Iterator()); // FIXME(bbannier): sensible data.
+                            args2[1] = builder::begin(builder::deref(args[0]));
                             args2[2] = builder::deref(args2[0]);
                             builder()->addExpression(builder::memberCall(state().self, id_stage2, args2));
 

diff --git a/tests/Baseline/spicy.optimization.default-parser-functions/noopt.hlt b/tests/Baseline/spicy.optimization.default-parser-functions/noopt.hlt
@@ -146,7 +146,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_P0_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_P0_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -379,7 +379,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_P1_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_P1_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -614,7 +614,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_P2_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_P2_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 

diff --git a/tests/Baseline/spicy.optimization.feature_requirements/noopt.hlt b/tests/Baseline/spicy.optimization.feature_requirements/noopt.hlt
@@ -277,7 +277,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_X0_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_X0_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -514,7 +514,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_X1_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_X1_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -747,7 +747,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_X2_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_X2_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -980,7 +980,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_X3_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_X3_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -1221,7 +1221,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_X4_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_X4_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -1466,7 +1466,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_X5_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_X5_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -1699,7 +1699,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_X6_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_X6_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 

diff --git a/tests/Baseline/spicy.optimization.feature_requirements/opt.hlt b/tests/Baseline/spicy.optimization.feature_requirements/opt.hlt
@@ -251,7 +251,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_X5_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_X5_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 

diff --git a/tests/Baseline/spicy.optimization.unused-functions/noopt.hlt b/tests/Baseline/spicy.optimization.unused-functions/noopt.hlt
@@ -214,7 +214,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_A_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_A_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -447,7 +447,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_B_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_B_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -676,7 +676,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_C_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_C_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -909,7 +909,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_D_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_D_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -1153,7 +1153,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_F_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_F_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 

diff --git a/tests/Baseline/spicy.optimization.unused-types/noopt.hlt b/tests/Baseline/spicy.optimization.unused-types/noopt.hlt
@@ -351,7 +351,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_Priv1_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_Priv1_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -584,7 +584,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_Pub2_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_Pub2_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -813,7 +813,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_Priv2_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_Priv2_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -1046,7 +1046,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_Priv3_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_Priv3_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -1279,7 +1279,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_Priv4_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_Priv4_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -1558,7 +1558,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_Priv5_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_Priv5_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -1791,7 +1791,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_Priv6_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_Priv6_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -2024,7 +2024,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_Pub3_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_Pub3_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim ) 
@@ -2299,7 +2299,7 @@ method method tuple<view<stream>, int<64>, iterator<stream>, optional<hilti::Rec
 
             if ( filtered = spicy_rt::filter_init(self, __data, __cur) ) {
                 local value_ref<stream> filtered_data = filtered;
-                (*self).__parse_foo_Priv10_stage2(filtered_data, default<iterator<stream>>(), (*filtered_data), __trim, __lah, __lahe, __error);
+                (*self).__parse_foo_Priv10_stage2(filtered_data, begin((*__data)), (*filtered_data), __trim, __lah, __lahe, __error);
                 __cur = __cur.advance(|__cur|);
 
                 if ( __trim )