Merge pull request #1065 from andrew-johnson-4/port-libs-to-lsts

Port libs to lsts

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lambda_mountain"
-version = "1.20.2"
+version = "1.20.3"
 authors = ["Andrew <andrew@subarctic.org>"]
 license = "MIT"
 description = "Typed Macro Assembler (backed by Coq proofs-of-correctness)"

PLATFORM/C/LIB/default.lm

@@ -7,6 +7,7 @@ import PLATFORM/C/LIB/field-accessors.lm;
 import PLATFORM/C/LIB/sized.lm;
 import PLATFORM/C/LIB/bool.lm;
 import PLATFORM/C/LIB/u8.lm;
+import PLATFORM/C/LIB/u8.lsts;
 import PLATFORM/C/LIB/i8.lm;
 import PLATFORM/C/LIB/u16.lm;
 import PLATFORM/C/LIB/i16.lm;

PLATFORM/C/LIB/u8.lm

@@ -1,7 +1,7 @@
 
 fragment type U8; size U8 1; atom suffix U8 _u8;
 
-(declare-binop( != U8 U8 U64 ( '\[_l x '!=_l y '\]_l ) ));
+#(declare-binop( != U8 U8 U64 ( '\[_l x '!=_l y '\]_l ) ));
 (declare-binop( == U8 U8 U64 ( '\[_l x '==_l y '\]_l ) ));
 (declare-binop( < U8 U8 U64 ( '\[_l x '<_l y '\]_l ) ));
 (declare-binop( <= U8 U8 U64 ( '\[_l x '<=_l y '\]_l ) ));

PLATFORM/C/LIB/u8.lsts

@@ -0,0 +1,2 @@
+
+declare-binop( $"!=", raw-type(U8), raw-type(U8), raw-type(U64), ( l"("; x; l"!="; y; l")"; ) );

PLUGINS/FRONTEND/LSTS/lsts-parse.lsts

@@ -12,6 +12,12 @@ let lsts-unwrap-identifier(ident: CString): CString = (
    } else ident
 );
 
+let lsts-unwrap-identifier(ident: Token): Token = (
+   match ident {
+      Token { key=key, nonce=nonce, location=location } => Token { lsts-unwrap-identifier(key), iuid(), location };
+   };
+);
+
 let lsts-parse-expect(expect: CString, tokens: List<Token>): Nil = (
    if lsts-parse-head(tokens) != expect {
       fail("Parse Error: Expected \{expect} at \{tokens.formatted-location}\n");
@@ -273,7 +279,7 @@ let lsts-make-maybe-var(tokens: List<Token>): Tuple<AST,List<Token>> = (
    } else {
       if not(non-zero(tokens)) { lsts-parse-expect(c"Identifier", tokens); };
       let t = head(tokens);
-      let base = Var { lsts-unwrap-identifier(t.key), t };
+      let base = Var { lsts-unwrap-identifier(t.key), lsts-unwrap-identifier(t) };
       if lsts-is-lit(t.key) { base = lsts-make-lit(t); };
       tokens = tail(tokens);
       Tuple { base, tokens }
@@ -919,6 +925,13 @@ let lsts-parse-atom(tokens: List<Token>): Tuple<AST,List<Token>> = (
       tokens = term-rest.second;
       lsts-parse-expect(c")", tokens); tokens = tail(tokens);
       term = AType{ t2(c"Type", term-rest.first) };
+   } else if lsts-parse-head(tokens)==c"raw-type" {
+      tokens = tail(tokens);
+      lsts-parse-expect(c"(", tokens); tokens = tail(tokens);
+      let term-rest = lsts-parse-type(tokens);
+      tokens = term-rest.second;
+      lsts-parse-expect(c")", tokens); tokens = tail(tokens);
+      term = AType{ term-rest.first };
    } else if lsts-is-ident-head(lsts-parse-head(tokens)) {
       let term-rest = lsts-make-maybe-var(tokens);
       tokens = term-rest.second;
@@ -1086,5 +1099,3 @@ let lsts-parse-atom-tail(base: AST, tokens: List<Token>): Tuple<AST,List<Token>>
    };
    Tuple { base, tokens }
 );
-
-

PLUGINS/FRONTEND/LSTS/lsts-smart-tokenize.lsts

@@ -71,7 +71,7 @@ let lsts-tokenize-string(file-path: String, text: String): List<Token> = (
       "^".. rest => (tokens = cons(text[:"^".length], tokens); text = rest;);
       ".".. rest => (tokens = cons(text[:".".length], tokens); text = rest;);
 
-      (lit=r/^c?["]([^"\\]|([\\].))*["]/).. rest => (
+      (lit=r/^[cl]?["]([^"\\]|([\\].))*["]/).. rest => (
          tokens = cons(text[:lit.length], tokens); text = rest;
       );
 

SRC/mk-token.lm

@@ -30,6 +30,12 @@ mk-lsts-token := λ(: s SmartString). (: (
       (set us (.replace( us '\\"_s '"_s )))
       (set us (+( us '_s_s )))
    ) ())
+   (if (.has-prefix( s 'l"_ss )) (
+      (set us (.remove-prefix( us 'l"_s )))
+      (set us (.remove-suffix( us '"_s )))
+      (set us (.replace( us '\\"_s '"_s )))
+      (set us (+( us '_l_s )))
+   ) ())
    (Token( us (iuid()) (location-of s) ))
 ) Token);
 

SRC/substitute.lm

@@ -102,6 +102,12 @@ substitute := λ(: tctx Context)(: tt Type). (: (
                   (set tctx CtxEOF)
                ) (set tctx rst))
             ))
+            ( (CtxBind( rst tk (AType( tv )) )) (
+               (if (==( tk v )) (
+                  (set tt tv)
+                  (set tctx CtxEOF)
+               ) (set tctx rst))
+            ))
             ( (CtxBind( rst tk tv )) (
                (set tctx rst)
             ))