Updating: very very minorly

githwxi · Sep 6, 2024 · 13049a1 · 13049a1
1 parent f3396f7
commit 13049a1
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 18 deletions.
diff --git a/prelude/DATS/CATS/JS/gint000.cats b/prelude/DATS/CATS/JS/gint000.cats
@@ -92,7 +92,6 @@ XATS2JS_sint_add_sint
   return (i1 + i2) // HX: add
 }
 //
-//
 function
 XATS2JS_sint_sub_sint
   (i1, i2)
@@ -108,15 +107,13 @@ XATS2JS_sint_mul_sint
   return (i1 * i2) // HX: mul
 }
 //
-//
 function
 XATS2JS_sint_div_sint
   (i1, i2)
 {
-  return (i1 / i2) // HX: div
+  return Math.trunc(i1 / i2)
 }
 //
-//
 function
 XATS2JS_sint_mod_sint
   (i1, i2)

diff --git a/srcgen2/xats2js/srcgen1/xshared/runtime/xats2js_prelude.js b/srcgen2/xats2js/srcgen1/xshared/runtime/xats2js_prelude.js
@@ -1,4 +1,4 @@
-// Thu 05 Sep 2024 01:48:28 PM EDT
+// Thu 05 Sep 2024 09:36:56 PM EDT
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 /*
@@ -190,7 +190,6 @@ XATS2JS_sint_add_sint
   return (i1 + i2) // HX: add
 }
 //
-//
 function
 XATS2JS_sint_sub_sint
   (i1, i2)
@@ -206,15 +205,13 @@ XATS2JS_sint_mul_sint
   return (i1 * i2) // HX: mul
 }
 //
-//
 function
 XATS2JS_sint_div_sint
   (i1, i2)
 {
-  return (i1 / i2) // HX: div
+  return Math.trunc(i1 / i2)
 }
 //
-//
 function
 XATS2JS_sint_mod_sint
   (i1, i2)

diff --git a/srcgen2/xats2js/srcgen1/xshared/runtime/xats2js_xatslib.js b/srcgen2/xats2js/srcgen1/xshared/runtime/xats2js_xatslib.js
@@ -1,4 +1,4 @@
-// Thu 05 Sep 2024 01:48:28 PM EDT
+// Thu 05 Sep 2024 09:36:56 PM EDT
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 /*

diff --git a/xatslib/githwxi/TEST/CATS/JS/Makefile_jsemit b/xatslib/githwxi/TEST/CATS/JS/Makefile_jsemit
@@ -61,6 +61,25 @@ test02_qlist00.dats; \
 $(NODE) --stack-size=4096 $(SRCGEN2_XATS2JS) $< >> $@_out.js
 ########################################################################
 ########################################################################
+test03:: ; \
+echo "//" `date` > $@_out.js
+############
+test03:: ; \
+$(CAT) $(SRCGEN2_XSHARED)/xats2js_js1emit.js >> $@_out.js
+test03:: ; \
+$(CAT) $(SRCGEN2_XSHARED)/xats2js_prelude.js >> $@_out.js
+test03:: ; \
+$(CAT) $(SRCGEN2_XSHARED)/xats2js_xatslib.js >> $@_out.js
+############
+test03:: \
+test03_gint000.dats; \
+$(NODE) --stack-size=4096 $(SRCGEN2_XATS2JS) $< >> $@_out.js
+############
+test03:: ; \
+npx google-closure-compiler -W QUIET \
+  --compilation_level ADVANCED --js=$@_out.js --js_output_file=$@_out2.js
+########################################################################
+########################################################################
 test99:: ; \
 echo "//" `date` > $@_out.js
 ############
@@ -82,5 +101,6 @@ $(NODE) --stack-size=4096 $(SRCGEN2_XATS2JS) $< >> $@_out.js
 clean:: ; rm -f *~
 cleanall:: ; rm -f *~
 cleanall:: ; rm -f test??_out.js
+cleanall:: ; rm -f test??_out?.js
 ########################################################################
 ###################### end of [Makefile_jsemit] ########################
diff --git a/xatslib/githwxi/TEST/CATS/JS/test02_qlist00.dats b/xatslib/githwxi/TEST/CATS/JS/test02_qlist00.dats
@@ -23,6 +23,7 @@ Thu 05 Sep 2024 05:36:54 PM EDT
 //
 (* ****** ****** *)
 (* ****** ****** *)
+//
 #include
 "srcgen2\
 /prelude/HATS/prelude_JS_dats.hats"

diff --git a/xatslib/githwxi/TEST/CATS/JS/test99_mydiary.dats b/xatslib/githwxi/TEST/CATS/JS/test99_mydiary.dats
@@ -73,14 +73,6 @@ end//let
 (* ****** ****** *)
 ////
 (* ****** ****** *)
-//
-val ds =
-nint_dgt$listize(123456789)
-val () = print1s("ds = ", ds,"\n")
-//
-(* ****** ****** *)
-////
-(* ****** ****** *)
 val f0 =
 lam(x:int) => @(x, x=x)
 val () =