Updating: very very minorly

githwxi · Jan 24, 2025 · 01cc4b8 · 01cc4b8
1 parent 6371627
commit 01cc4b8
Show file tree

Hide file tree

Showing 25 changed files with 98 additions and 52 deletions.
diff --git a/contrib/githwxi/BOOTJS1/Makefile_xjsemit b/contrib/githwxi/BOOTJS1/Makefile_xjsemit
@@ -291,6 +291,12 @@ $(SRCGEN2)/DATS/lexing0_utils2.dats; \
 $(NODE) --stack-size=4096 $(XATS2JS_JSEMIT00) $< > BUILD/$@_out.js
 ########################################################################
 boot_dats:: \
+xfixity_dats
+xfixity_dats: \
+$(SRCGEN2)/DATS/xfixity.dats; \
+$(NODE) --stack-size=4096 $(XATS2JS_JSEMIT00) $< > BUILD/$@_out.js
+########################################################################
+boot_dats:: \
 staexp0_dats
 staexp0_dats: \
 $(SRCGEN2)/DATS/staexp0.dats; \
@@ -411,6 +417,7 @@ cleanall:: ; rm -f BUILD/lexing0_kword0_dats_out.js
 cleanall:: ; rm -f BUILD/lexing0_mymap0_dats_out.js
 cleanall:: ; rm -f BUILD/lexing0_utils1_dats_out.js
 cleanall:: ; rm -f BUILD/lexing0_utils2_dats_out.js
+cleanall:: ; rm -f BUILD/xfixity_dats_out.js
 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

diff --git a/srcgen2/DATS/xfixity.dats b/srcgen2/DATS/xfixity.dats
@@ -257,18 +257,22 @@ prerrsln("fixty_assoc: fxt = ", fxt)
 //
 (* ****** ****** *)
 //
-#implfun
+#impltmp
+< a:t0 >
 fxopr_prcdv(itm) =
 let
 val-
-FXITMopr(_, fxt) = itm in fixty_prcdv(fxt)
+FXITMopr
+(_, fxty) = itm in fixty_prcdv(fxty)
 end (*let*) // end of [ fxopr_prcdv(itm) ]
 //
-#implfun
+#impltmp
+< a:t0 >
 fxopr_assoc(itm) =
 let
 val-
-FXITMopr(_, fxt) = itm in fixty_assoc(fxt)
+FXITMopr
+(_, fxty) = itm in fixty_assoc(fxty)
 end (*let*) // end of [ fxopr_assoc(itm) ]
 //
 (* ****** ****** *)

diff --git a/srcgen2/Makefile_xatsopt b/srcgen2/Makefile_xatsopt
@@ -91,6 +91,10 @@ lexing0_sats
 lexing0_sats: ; $(XATSOPT) --static SATS/lexing0.sats
 ######
 all_sats:: \
+xfixity_sats
+xfixity_sats: ; $(XATSOPT) --static SATS/xfixity.sats
+######
+all_sats:: \
 staexp0_sats
 staexp0_sats: ; $(XATSOPT) --static SATS/staexp0.sats
 ######
@@ -127,10 +131,6 @@ xsymenv_sats
 xsymenv_sats: ; $(XATSOPT) --static SATS/xsymenv.sats
 ######
 all_sats:: \
-xfixity_sats
-xfixity_sats: ; $(XATSOPT) --static SATS/xfixity.sats
-######
-all_sats:: \
 trans01_sats
 trans01_sats: ; $(XATSOPT) --static SATS/trans01.sats
 ######
@@ -401,6 +401,12 @@ lexing0_utils2_dats
 lexing0_utils2_dats: ; $(XATSOPT) --dynamic DATS/lexing0_utils2.dats
 ######
 
+######
+all_dats:: \
+xfixity_dats
+xfixity_dats: ; $(XATSOPT) --dynamic DATS/xfixity.dats
+######
+
 ######
 all_dats:: \
 staexp0_dats
@@ -473,12 +479,6 @@ preadx0_errmsg_dats
 preadx0_errmsg_dats: ; $(XATSOPT) --dynamic DATS/preadx0_errmsg.dats
 ######
 
-######
-all_dats:: \
-xfixity_dats
-xfixity_dats: ; $(XATSOPT) --dynamic DATS/xfixity.dats
-######
-
 ######
 all_dats:: \
 staexp1_dats

diff --git a/srcgen2/SATS/dynexp0.sats b/srcgen2/SATS/dynexp0.sats
@@ -25,6 +25,7 @@
 ** 02110-1301, USA.
 *)
 
+(* ****** ****** *)
 (* ****** ****** *)
 //
 (*

diff --git a/srcgen2/SATS/dynexp1.sats b/srcgen2/SATS/dynexp1.sats
@@ -25,6 +25,7 @@
 ** 02110-1301, USA.
 *)
 
+(* ****** ****** *)
 (* ****** ****** *)
 //
 (*

diff --git a/srcgen2/SATS/filpath.sats b/srcgen2/SATS/filpath.sats
@@ -36,22 +36,20 @@ Authoremail: gmhwxiATgmailDOTcom
 //
 (* ****** ****** *)
 (* ****** ****** *)
-#define
-ATS_PACKNAME
-"ATS3.XANADU.xatsopt-20220500"
-(* ****** ****** *)
-(* ****** ****** *)
 //
 #staload
 SYM = "./xsymbol.sats"
 #typedef sym_t = $SYM.sym_t
 //
 (* ****** ****** *)
 (* ****** ****** *)
-//
 #include
 "./../HATS/xatsopt_sats.hats"
-//
+(* ****** ****** *)
+(* ****** ****** *)
+#define
+ATS_PACKNAME
+"ATS3.XANADU.xatsopt-20220500"
 (* ****** ****** *)
 (* ****** ****** *)
 //

diff --git a/srcgen2/SATS/fperr20.sats b/srcgen2/SATS/fperr20.sats
@@ -50,6 +50,7 @@ D2E = "./dynexp2.sats"
 #include
 "./../HATS/xatsopt_sats.hats"
 (* ****** ****** *)
+(* ****** ****** *)
 #define
 ATS_PACKNAME // namespace
 "ATS3.XANADU.xatsopt-20220500"

diff --git a/srcgen2/SATS/fperr30.sats b/srcgen2/SATS/fperr30.sats
@@ -52,6 +52,7 @@ D3E = "./dynexp3.sats"
 #include
 "./../HATS/xatsopt_sats.hats"
 (* ****** ****** *)
+(* ****** ****** *)
 #define
 ATS_PACKNAME // namespace
 "ATS3.XANADU.xatsopt-20220500"

diff --git a/srcgen2/SATS/fperr40.sats b/srcgen2/SATS/fperr40.sats
@@ -52,6 +52,7 @@ D4E = "./dynexp4.sats"
 #include
 "./../HATS/xatsopt_sats.hats"
 (* ****** ****** *)
+(* ****** ****** *)
 #define
 ATS_PACKNAME // namespace
 "ATS3.XANADU.xatsopt-20220500"

diff --git a/srcgen2/SATS/gmacro1.sats b/srcgen2/SATS/gmacro1.sats
@@ -62,6 +62,7 @@ D1E = "./dynexp1.sats"
 #include
 "./../HATS/xatsopt_sats.hats"
 (* ****** ****** *)
+(* ****** ****** *)
 #define
 ATS_PACKNAME
 "ATS3.XANADU.xatsopt-20220500"

diff --git a/srcgen2/SATS/lexbuf0.sats b/srcgen2/SATS/lexbuf0.sats
@@ -43,6 +43,7 @@ LOC = "./locinfo.sats"
 #include
 "./../HATS/xatsopt_sats.hats"
 (* ****** ****** *)
+(* ****** ****** *)
 #define
 ATS_PACKNAME
 "ATS3.XANADU.xatsopt-20220500"

diff --git a/srcgen2/SATS/lexing0.sats b/srcgen2/SATS/lexing0.sats
@@ -47,6 +47,7 @@ BUF = "./lexbuf0.sats"
 #include
 "./../HATS/xatsopt_sats.hats"
 (* ****** ****** *)
+(* ****** ****** *)
 #define
 ATS_PACKNAME
 "ATS3.XANADU.xatsopt-20220500"

diff --git a/srcgen2/SATS/preadx0.sats b/srcgen2/SATS/preadx0.sats
@@ -47,6 +47,7 @@ D0E = "./dynexp0.sats"
 #include
 "./../HATS/xatsopt_sats.hats"
 (* ****** ****** *)
+(* ****** ****** *)
 #define
 ATS_PACKNAME // namespace
 "ATS3.XANADU.xatsopt-20220500"

diff --git a/srcgen2/SATS/staexp0.sats b/srcgen2/SATS/staexp0.sats
@@ -52,6 +52,7 @@ LEX = "./lexing0.sats"
 #include
 "./../HATS/xatsopt_sats.hats"
 (* ****** ****** *)
+(* ****** ****** *)
 #define
 ATS_PACKNAME
 "ATS3.XANADU.xatsopt-20220500"

diff --git a/srcgen2/SATS/xatsmtp.sats b/srcgen2/SATS/xatsmtp.sats
@@ -25,6 +25,7 @@
 ** 02110-1301, USA.
 *)
 
+(* ****** ****** *)
 (* ****** ****** *)
 //
 (*
@@ -48,15 +49,15 @@ of meta-programming in ATS3
 #staload "./dynexp2.sats"
 (* ****** ****** *)
 (* ****** ****** *)
+#include
+"./../HATS/xatsopt_sats.hats"
+(* ****** ****** *)
+(* ****** ****** *)
 #define
 ATS_PACKNAME
 "ATS3.XANADU.xatsopt-20220500"
 (* ****** ****** *)
 (* ****** ****** *)
-#include
-"./../HATS/xatsopt_sats.hats"
-(* ****** ****** *)
-(* ****** ****** *)
 //
 fun//<>
 d2con_name$fun$emit

diff --git a/srcgen2/SATS/xatsopt.sats b/srcgen2/SATS/xatsopt.sats
@@ -25,6 +25,7 @@
 ** 02110-1301, USA.
 *)
 
+(* ****** ****** *)
 (* ****** ****** *)
 //
 (*

diff --git a/srcgen2/SATS/xbasics.sats b/srcgen2/SATS/xbasics.sats
@@ -25,6 +25,7 @@
 ** 02110-1301, USA.
 *)
 
+(* ****** ****** *)
 (* ****** ****** *)
 //
 (*
@@ -35,15 +36,6 @@ Authoremail: gmhwxiATgmailDOTcom
 //
 (* ****** ****** *)
 (* ****** ****** *)
-#include
-"./../HATS/xatsopt_sats.hats"
-(* ****** ****** *)
-(* ****** ****** *)
-#define
-ATS_PACKNAME
-"ATS3.XANADU.xatsopt-20220500"
-(* ****** ****** *)
-(* ****** ****** *)
 //
 (*
 #typedef int0 = sint
@@ -53,6 +45,16 @@ ATS_PACKNAME
 *)
 //
 (* ****** ****** *)
+(* ****** ****** *)
+#include
+"./../HATS/xatsopt_sats.hats"
+(* ****** ****** *)
+(* ****** ****** *)
+#define
+ATS_PACKNAME
+"ATS3.XANADU.xatsopt-20220500"
+(* ****** ****** *)
+(* ****** ****** *)
 #symload &  with land of 0
 #symload << with lsln of 0
 #symload >> with asrn of 0

diff --git a/srcgen2/SATS/xdepend.sats b/srcgen2/SATS/xdepend.sats
@@ -25,6 +25,7 @@
 ** 02110-1301, USA.
 *)
 
+(* ****** ****** *)
 (* ****** ****** *)
 (*
 HX-2024-07-05:
@@ -35,6 +36,7 @@ a future implementation of certain
 generic tree processing combinators.
 *)
 (* ****** ****** *)
+(* ****** ****** *)
 //
 (*
 Author: Hongwei Xi
@@ -49,6 +51,7 @@ Authoremail: gmhwxiATgmailDOTcom
 #include
 "./../HATS/xatsopt_sats.hats"
 (* ****** ****** *)
+(* ****** ****** *)
 #define
 ATS_PACKNAME
 "ATS3.XANADU.xatsopt-20220500"

diff --git a/srcgen2/SATS/xerrory.sats b/srcgen2/SATS/xerrory.sats
@@ -25,6 +25,7 @@
 ** 02110-1301, USA.
 *)
 
+(* ****** ****** *)
 (* ****** ****** *)
 //
 (*
@@ -34,13 +35,16 @@ Authoremail: gmhwxiATgmailDOTcom
 *)
 //
 (* ****** ****** *)
+(* ****** ****** *)
 #include
 "./../HATS/xatsopt_sats.hats"
 (* ****** ****** *)
+(* ****** ****** *)
 #define
 ATS_PACKNAME
 "ATS3.XANADU.xatsopt-20220500"
 (* ****** ****** *)
+(* ****** ****** *)
 //
 (*
 excptcon

diff --git a/srcgen2/SATS/xfixity.sats b/srcgen2/SATS/xfixity.sats
@@ -25,6 +25,7 @@
 ** 02110-1301, USA.
 *)
 
+(* ****** ****** *)
 (* ****** ****** *)
 //
 (*
@@ -36,12 +37,6 @@ Authoremail: gmhwxiATgmailDOTcom
 *)
 //
 (* ****** ****** *)
-#include
-"./../HATS/xatsopt_sats.hats"
-(* ****** ****** *)
-#define
-ATS_PACKNAME
-"ATS3.XANADU.xatsopt-20220500"
 (* ****** ****** *)
 //
 #staload
@@ -50,6 +45,16 @@ LOC = "./locinfo.sats"
 #typedef loc_t = $LOC.loc_t
 //
 (* ****** ****** *)
+(* ****** ****** *)
+#include
+"./../HATS/xatsopt_sats.hats"
+(* ****** ****** *)
+(* ****** ****** *)
+#define
+ATS_PACKNAME
+"ATS3.XANADU.xatsopt-20220500"
+(* ****** ****** *)
+(* ****** ****** *)
 //
 datatype assoc =
 |ASSOCnon|ASSOClft|ASSOCrgt
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ @@
     ** 02110-1301, USA.
     *)
+    (* ****** ****** *)
     (* ****** ****** *)
     //
     (*
@@ Expand Down @@