Merge pull request #1077 from andrew-johnson-4/umbra-2

Umbra 2
andrew-johnson-4 · Jan 12, 2025 · cf6d8cf · cf6d8cf
2 parents 6a86b79 + 72ebd23
commit cf6d8cf
Show file tree

Hide file tree

Showing 6 changed files with 23,275 additions and 23,172 deletions.
diff --git a/BOOTSTRAP/cli.c b/BOOTSTRAP/cli.c
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "lambda_mountain"
-version = "1.20.6"
+version = "1.20.7"
 authors = ["Andrew <andrew@subarctic.org>"]
 license = "MIT"
 description = "Typed Macro Assembler (backed by Coq proofs-of-correctness)"

diff --git a/PLATFORM/C/LIB/common-macros.lm b/PLATFORM/C/LIB/common-macros.lm
@@ -195,7 +195,7 @@ macro ('match-pats-arm( term ((:Tag: l lt) ( x4 x3 x2 x1 )) )) (
                   (if (match-pats-arm( (open(.3( (as (uuid v) lt) ))) x3 ))
                      (if (match-pats-arm( (open(.4( (as (uuid v) lt) ))) x4 ))
                         (set (uuid m) 1_u8)
-                        ()
+                        () 
                      )
                      ()
                   )
@@ -285,6 +285,21 @@ macro ('match-pats-arm( term ((:Tag: l lt) ('macro::bind-field-by-key( x1-key x1
    )
 );
 
+macro ('match-pats-arm( term ((:Tag: l lt) ('macro::bind-field-by-key( x1-key ('macro::bind-raw x1) )) ) )) (
+   (
+      (let (uuid v) term)
+      (let (uuid m) 0_u8)
+      (if (==( (.0( (uuid v) )) l ))
+          (if (match-pats-arm( (x1-key( (as (uuid v) lt) )) x1 ))
+              (set (uuid m) 1_u8)
+              ()
+          )
+          ()
+      )
+      (==( (uuid m) 1_u8 ))
+   )
+);
+
 macro ('match-pats-arm( term ((:Tag: l lt) ( ('macro::bind-field-by-key( x2-key x2 )) ('macro::bind-field-by-key( x1-key x1 )) )) )) (
    (
       (let (uuid v) term)
@@ -303,6 +318,60 @@ macro ('match-pats-arm( term ((:Tag: l lt) ( ('macro::bind-field-by-key( x2-key
    )
 );
 
+macro ('match-pats-arm( term ((:Tag: l lt) ( ('macro::bind-field-by-key( x2-key x2 )) ('macro::bind-field-by-key( x1-key ('macro::bind-raw x1) )) )) )) (
+   (
+      (let (uuid v) term)
+      (let (uuid m) 0_u8)
+      (if (==( (.0( (uuid v) )) l ))
+          (if (match-pats-arm( (x1-key( (as (uuid v) lt) )) x1 ))
+              (if (match-pats-arm( (open(x2-key( (as (uuid v) lt) ))) x2 ))
+                  (set (uuid m) 1_u8)
+                  ()
+              )
+              ()
+          )
+          ()
+      )
+      (==( (uuid m) 1_u8 ))
+   )
+);
+
+macro ('match-pats-arm( term ((:Tag: l lt) ( ('macro::bind-field-by-key( x2-key ('macro::bind-raw x2) )) ('macro::bind-field-by-key( x1-key x1 )) )) )) (
+   (
+      (let (uuid v) term)
+      (let (uuid m) 0_u8)
+      (if (==( (.0( (uuid v) )) l ))
+          (if (match-pats-arm( (open(x1-key( (as (uuid v) lt) ))) x1 ))
+              (if (match-pats-arm( (x2-key( (as (uuid v) lt) )) x2 ))
+                  (set (uuid m) 1_u8)
+                  ()
+              )
+              ()
+          )
+          ()
+      )
+      (==( (uuid m) 1_u8 ))
+   )
+);
+
+macro ('match-pats-arm( term ((:Tag: l lt) ( ('macro::bind-field-by-key( x2-key ('macro::bind-raw x2) )) ('macro::bind-field-by-key( x1-key ('macro::bind-raw x1) )) )) )) (
+   (
+      (let (uuid v) term)
+      (let (uuid m) 0_u8)
+      (if (==( (.0( (uuid v) )) l ))
+          (if (match-pats-arm( (x1-key( (as (uuid v) lt) )) x1 ))
+              (if (match-pats-arm( (x2-key( (as (uuid v) lt) )) x2 ))
+                  (set (uuid m) 1_u8)
+                  ()
+              )
+              ()
+          )
+          ()
+      )
+      (==( (uuid m) 1_u8 ))
+   )
+);
+
 macro ('match-pats-arm( term ((:Tag: l lt) ( ('macro::bind-field-by-key( x3-key x3 )) ('macro::bind-field-by-key( x2-key x2 )) ('macro::bind-field-by-key( x1-key x1 )) )) )) (
    (
       (let (uuid v) term)

diff --git a/PLATFORM/C/LIB/umbra.lsts b/PLATFORM/C/LIB/umbra.lsts
@@ -47,13 +47,12 @@ let $"[]"(s: Umbra, i: U64): U8 = (
     let u = s.backing;
     match u {
         UmbraShort { arr=arr } => arr[i];
-        UmbraLong { prefix=prefix, ptr=ptr } => (
-            1_u8
-#            #if i < 4 {
-#            #    prefix[i]
-#            #} else {
-#            #    ptr[i]
-#            #}
+        UmbraLong { prefix=prefix, raw ptr=ptr } => (
+            if i < 4 {
+                prefix[i]
+            } else {
+                ptr[i]
+            }
         );
     }
 );

diff --git a/PLUGINS/FRONTEND/LSTS/lsts-parse.lsts b/PLUGINS/FRONTEND/LSTS/lsts-parse.lsts
@@ -842,11 +842,18 @@ let lsts-parse-lhs-one(tokens: List<Token>): Tuple<AST,List<Token>> = (
          let attr-loc = head(tokens).location;
          let binding = c"";
          let attr-key = c"";
+         let raw = false;
+         if lsts-parse-head(tokens) == c"raw" {
+            raw = true; tokens = tail(tokens);
+         };
          if lsts-is-ident-head(lsts-parse-head(tokens)) {
             attr-key = lsts-parse-head(tokens); tokens = tail(tokens);
          };
          if lsts-parse-head(tokens)==c"=" {
             binding = attr-key; tokens = tail(tokens);
+            if lsts-parse-head(tokens) == c"raw" {
+               raw = true; tokens = tail(tokens);
+            };
             if lsts-is-ident-head(lsts-parse-head(tokens)) {
                attr-key = lsts-parse-head(tokens); tokens = tail(tokens);
             } else { lsts-parse-expect(c"[Identifier]", tokens); };
@@ -871,6 +878,12 @@ let lsts-parse-lhs-one(tokens: List<Token>): Tuple<AST,List<Token>> = (
                   close(val)
                })
             };
+            if raw {
+               val = App{
+                  close(Var{ c"macro::bind-raw", with-location(mk-token("macro::bind-raw"),attr-loc) }),
+                  close(val)
+               };
+            };
          };
          if non-zero(attr-key) {
             attr-key = c"." + attr-key;

diff --git a/PLUGINS/FRONTEND/LSTS/lsts-tokenize.lm b/PLUGINS/FRONTEND/LSTS/lsts-tokenize.lm
@@ -13,6 +13,8 @@ lsts-is-reserved-word := λ(: text String). (: (
    (if (==( text 'while_s )) (set r 1_u64) ()) # $
    (if (==( text 'for_s )) (set r 1_u64) ()) # $
    (if (==( text 'type_s )) (set r 1_u64) ()) # $
+   (if (==( text 'raw_s )) (set r 1_u64) ()) # $
+   (if (==( text 'match_s )) (set r 1_u64) ()) # $
    r
 ) U64);