Merge pull request #2020 from andrew-johnson-4/more-misc-optimizations-fklewfji

More misc optimizations fklewfji

Author: andrew4328

BOOTSTRAP/cli.c

@@ -1,35 +1,39 @@
 
-let escape-string(s: CString): CString = (
-   let e = SNil;
-   while head(s) != 0 {
-      if head(s) == 92 {
-         s = tail(s);
-         match head(s) {
-            58 => e = e + SAtom(c";");   # \: -> ;
-            91 => e = e + SAtom(c"(");   # \[ -> (
-            92 => e = e + SAtom(c"\\");  # \\ -> \
-            93 => e = e + SAtom(c")");   # \] -> )
-            96 => e = e + SAtom(c"'");   # \` -> '
-            110 => e = e + SAtom(c"\n"); # \n -> [newline]
-            111 => e = e + SAtom(c"#");  # \o -> #
-            116 => e = e + SAtom(c"\t"); # \t -> [tab]
-            115 => e = e + SAtom(c" ");  # \s -> [space]
+let escape-string(out: Vector<U8>, s: String): Vector<U8> = (
+   let oi = 0_sz;
+   while oi < s.length {
+      if s[oi] == 92 {
+         oi = oi + 1;
+         match s[oi] {
+            58 => out = out.push(c";");   # \: -> ;
+            91 => out = out.push(c"(");   # \[ -> (
+            92 => out = out.push(c"\\");  # \\ -> \
+            93 => out = out.push(c")");   # \] -> )
+            96 => out = out.push(c"'");   # \` -> '
+            110 => out = out.push(c"\n"); # \n -> [newline]
+            111 => out = out.push(c"#");  # \o -> #
+            116 => out = out.push(c"\t"); # \t -> [tab]
+            115 => out = out.push(c" ");  # \s -> [space]
             c => fail("Illegal Escape Sequence In String: \{c}\n");
          };
-         s = tail(s);
       } else {
-         e = e + SAtom(clone-rope(head(s)));
-         s = tail(s);
-      }
+         out = out.push(s[oi]);
+      };
+      oi = oi + 1;
    };
-   clone-rope(e)
+   out
 );
 
-let escape-string(s: S): S = (
+let escape-string(out: Vector<U8>, s: S): Vector<U8> = (
    match s {
-      SAtom{atom=atom} => SAtom(escape-string(atom.into(type(CString))));
-      SCons{left=left, right=right} => escape-string(left) + escape-string(right);
-      _ => SNil;
+      SAtom{atom=atom} => escape-string(out, atom);
+      SCons{left=left, right=right} => escape-string(escape-string(out,left),right);
+      _ => out;
    }
 );
 
+let escape-string(s: S): S = (
+   let out = mk-vector(type(U8));
+   out = escape-string(out, s);
+   SAtom(out.buffer-into-cstring)
+);

PLUGINS/BACKEND/C/escape-string.lsts

@@ -1,35 +1,35 @@
 
 let mangle-identifier(k: CString): S = (
-   let cs = SAtom(c"LM_");
+   let cs = mk-vector(type(U8)); cs = cs.push(c"LM_");
    while head(k) != 0 { match head(k) {
-      33 => cs = cs + SAtom(c"_EX_"); # !
-      36 => cs = cs + SAtom(c"_DL_"); # $
-      37 => cs = cs + SAtom(c"_MD_"); # %
-      38 => cs = cs + SAtom(c"_AM_"); # &
-      39 => cs = cs + SAtom(c"_SQ_"); # '
-      42 => cs = cs + SAtom(c"_ML_"); # *
-      43 => cs = cs + SAtom(c"_AD_"); # +
-      44 => cs = cs + SAtom(c"_CM_"); # ,
-      45 => cs = cs + SAtom(c"_SB_"); # -
-      46 => cs = cs + SAtom(c"_DT_"); # .
-      47 => cs = cs + SAtom(c"_DV_"); # /
-      58 => cs = cs + SAtom(c"_CL_"); # :
-      59 => cs = cs + SAtom(c"_SC_"); # ;
-      60 => cs = cs + SAtom(c"_LT_"); # <
-      61 => cs = cs + SAtom(c"_EQ_"); # =
-      62 => cs = cs + SAtom(c"_GT_"); # >
-      63 => cs = cs + SAtom(c"_QM_"); # ?
-      64 => cs = cs + SAtom(c"_AT_"); # @
-      91 => cs = cs + SAtom(c"_LB_"); # [
-      93 => cs = cs + SAtom(c"_RB_"); # ]
-      94 => cs = cs + SAtom(c"_HT_"); # ^
-      95 => cs = cs + SAtom(c"_US_"); # _
-      96 => cs = cs + SAtom(c"_TK_"); # `
-      124 => cs = cs + SAtom(c"_BR_"); # |
-      126 => cs = cs + SAtom(c"_TL_"); # ~
-      c => cs = cs + SAtom(clone-rope(c));
+      33 => cs = cs.push(c"_EX_"); # !
+      36 => cs = cs.push(c"_DL_"); # $
+      37 => cs = cs.push(c"_MD_"); # %
+      38 => cs = cs.push(c"_AM_"); # &
+      39 => cs = cs.push(c"_SQ_"); # '
+      42 => cs = cs.push(c"_ML_"); # *
+      43 => cs = cs.push(c"_AD_"); # +
+      44 => cs = cs.push(c"_CM_"); # ,
+      45 => cs = cs.push(c"_SB_"); # -
+      46 => cs = cs.push(c"_DT_"); # .
+      47 => cs = cs.push(c"_DV_"); # /
+      58 => cs = cs.push(c"_CL_"); # :
+      59 => cs = cs.push(c"_SC_"); # ;
+      60 => cs = cs.push(c"_LT_"); # <
+      61 => cs = cs.push(c"_EQ_"); # =
+      62 => cs = cs.push(c"_GT_"); # >
+      63 => cs = cs.push(c"_QM_"); # ?
+      64 => cs = cs.push(c"_AT_"); # @
+      91 => cs = cs.push(c"_LB_"); # [
+      93 => cs = cs.push(c"_RB_"); # ]
+      94 => cs = cs.push(c"_HT_"); # ^
+      95 => cs = cs.push(c"_US_"); # _
+      96 => cs = cs.push(c"_TK_"); # `
+      124 => cs = cs.push(c"_BR_"); # |
+      126 => cs = cs.push(c"_TL_"); # ~
+      c => cs = cs.push(c);
    }; k = tail(k); };
-   cs
+   SAtom(cs.buffer-into-string)
 );
 
 let mangle-identifier(kt: Type): S = (

PLUGINS/BACKEND/C/mangle-identifier.lsts

@@ -1,6 +1,6 @@
 
 let mk-expression(val: CString): Fragment = (
-   mk-fragment().set(c"expression", SAtom(val))
+   mk-fragment().set(c"expression", SAtom(val.into(type(String))))
 );
 
 let mk-expression(val: S): Fragment = (

SRC/backend-mk-expression.lsts

@@ -103,6 +103,23 @@ let .push(v: Vector<t>, i: t): Vector<t>+MustUse = (
    v
 );
 
+let .push(v: Vector<U8>, i: CString): Vector<U8>+MustUse = (
+   while non-zero(i) {
+      v = v.push(head(i));
+      i = tail(i);
+   };
+   v
+);
+
+let .push(v: Vector<U8>, i: String): Vector<U8>+MustUse = (
+   let ii = 0_sz;
+   while ii < i.length {
+      v = v.push(i[ii]);
+      ii = ii + 1;
+   };
+   v
+);
+
 # Note: this *reduces* the size of the vector, so it *never* resizes
 # There is no need to return the original vector because it never gets modified
 let .pop(v: Vector<t>): t = (