Updating: very very minorly

githwxi · Jan 21, 2025 · 2a69c4c · 2a69c4c
1 parent 46610da
commit 2a69c4c
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 7 deletions.
diff --git a/contrib/githwxi/BOOTJS1/Makefile_xjsemit b/contrib/githwxi/BOOTJS1/Makefile_xjsemit
@@ -95,6 +95,12 @@ dynexp0_sats: \
 $(SRCGEN2)/SATS/dynexp0.sats; \
 $(NODE) --stack-size=4096 $(XATSOPT_TCHECK00) $<
 ########################################################################
+boot_sats:: \
+parsing_sats
+parsing_sats: \
+$(SRCGEN2)/SATS/parsing.sats; \
+$(NODE) --stack-size=4096 $(XATSOPT_TCHECK00) $<
+########################################################################
 ########################################################################
 boot_dats:: \
 xbasics_dats
@@ -300,6 +306,17 @@ dynexp0_print0_dats: \
 $(SRCGEN2)/DATS/dynexp0_print0.dats; \
 $(NODE) --stack-size=4096 $(XATS2JS_JSEMIT00) $< > BUILD/$@_out.js
 ########################################################################
+boot_dats:: \
+parsing_dats
+parsing_dats: \
+$(SRCGEN2)/DATS/parsing.dats; \
+$(NODE) --stack-size=4096 $(XATS2JS_JSEMIT00) $< > BUILD/$@_out.js
+boot_dats:: \
+parsing_basics_dats
+parsing_basics_dats: \
+$(SRCGEN2)/DATS/parsing_basics.dats; \
+$(NODE) --stack-size=4096 $(XATS2JS_JSEMIT00) $< > BUILD/$@_out.js
+########################################################################
 ########################################################################
 clean:: ; rm -f *~
 cleanall:: ; rm -f *~
@@ -341,6 +358,8 @@ cleanall:: ; rm -f BUILD/staexp0_dats_out.js
 cleanall:: ; rm -f BUILD/staexp0_print0_dats_out.js
 cleanall:: ; rm -f BUILD/dynexp0_dats_out.js
 cleanall:: ; rm -f BUILD/dynexp0_print0_dats_out.js
+cleanall:: ; rm -f BUILD/parsing_dats_out.js
+cleanall:: ; rm -f BUILD/parsing_basics_dats_out.js
 ########################################################################
 ########################################################################
 SRCGEN2_XSHARED=$(SRCGEN2)/xats2js/srcgenx/xshared/runtime

diff --git a/srcgen2/DATS/parsing_basics.dats b/srcgen2/DATS/parsing_basics.dats
@@ -25,6 +25,7 @@
 ** 02110-1301, USA.
 *)
 
+(* ****** ****** *)
 (* ****** ****** *)
 //
 (*
@@ -34,21 +35,31 @@ Authoremail: gmhwxiATgmailDOTcom
 *)
 //
 (* ****** ****** *)
+(* ****** ****** *)
+#define
+ATS_PACKNAME
+"ATS3.XANADU.xatsopt-20220500"
+(* ****** ****** *)
+(* ****** ****** *)
 #include
 "./../HATS/xatsopt_sats.hats"
 #include
 "./../HATS/xatsopt_dats.hats"
 (* ****** ****** *)
-#define
-ATS_PACKNAME
-"ATS3.XANADU.xatsopt-20220500"
 (* ****** ****** *)
 #staload "./../SATS/lexing0.sats"
 (* ****** ****** *)
 #staload "./../SATS/parsing.sats"
 (* ****** ****** *)
+(* ****** ****** *)
+#symload getk0 with tokbuf_getk0
+#symload getk1 with tokbuf_getk1
+#symload skip1 with tokbuf_skip1
+(* ****** ****** *)
+(* ****** ****** *)
 #symload node with token_get_node
 (* ****** ****** *)
+(* ****** ****** *)
 
 #implfun
 t0_t0int(tnd) =
@@ -276,8 +287,11 @@ case+ tnd of
 #implfun
 p1_EQ0(buf, err) =
 let
+//
 val e00 = err
-val tok = buf.getk0()
+val tok =
+tokbuf_getk0(buf)
+//
 in//let
 case+
 tok.node() of
@@ -286,7 +300,8 @@ T_EQ0() =>
 let val () = buf.skip1() in tok end
 |
 _(* non-EQ0 *) =>
-let val () = (err := e00 + 1) in tok end
+let
+val () = (err := e00 + 1) in tok end
 end (*let*)//end-of-[p1_EQ0(buf,err)]
 
 #implfun
@@ -321,7 +336,8 @@ T_GT0() =>
 let val () = buf.skip1() in tok end
 |
 _(* non-GT0 *) =>
-let val () = (err := e00 + 1) in tok end
+let
+val () = (err := e00 + 1) in tok end
 end (*let*)//end-of-[p1_GT0(buf,err)]
 
 (* ****** ****** *)
@@ -339,7 +355,8 @@ T_BAR() =>
 let val () = buf.skip1() in tok end
 |
 _(* non-BAR *) =>
-let val () = (err := e00 + 1) in tok end
+let
+val () = (err := e00 + 1) in tok end
 end (*let*) // end of [p1_BAR(buf,err)]
 //
 #implfun