Merge pull request #230 from andrew-johnson-4/nominal-strings

nominal strings work

Author: andrew-johnson-4

BOOTSTRAP/cli.s

@@ -1,6 +1,6 @@
 [package]
 name = "lambda_mountain"
-version = "1.11.93"
+version = "1.11.94"
 authors = ["Andrew <andrew@subarctic.org>"]
 license = "MIT"
 description = "Lambda Mountain"

Cargo.toml

@@ -37,7 +37,7 @@ assemble := λprogram . (
             (typecheck-ascript( (GlobalVariable 'argc) (parse-type 'U64+GlobalVariable) ))
          )))
          (set global_ctx (context::bind( global_ctx 'argv
-            (typecheck-ascript( (GlobalVariable 'argv) (parse-type 'U8[?][?]+GlobalVariable) ))
+            (typecheck-ascript( (GlobalVariable 'argv) (parse-type 'String[?]+GlobalVariable) ))
          )))
          (set assemble-argv-referenced True)
          (set preview_program pc)

PRODUCTION/assemble.lm

@@ -89,10 +89,8 @@ compile-expr-strict := λctx e offset used . (tail(
                (match (typecheck-slot( (typecheck-lookup r) Array )) (
                   ()
                   ( (Array( x '? )) (
-                     (if (typecheck-unify-implies( x U8 )) () (
-                        (if (typecheck-unify-implies( x '? )) () (
-                           (set deref True)
-                        ))
+                     (if (typecheck-unify-implies( x '? )) () (
+                        (set deref True)
                      ))
                   ))
                ))
@@ -243,7 +241,7 @@ compile-expr-strict := λctx e offset used . (tail(
             )))
             ( (App( (App( (Literal :) (Literal lval) )) ltype )) (tail(
                (set ltype (typecheck-infer-type-compound ltype))
-               (if (typecheck-unify-args( (Array( U8 '? )) ltype )) (
+               (if (typecheck-unify-args( String ltype )) (
                   (local uid)
                   (set uid (strict-declare-cstring( lval )))
                   (set e1 (expr::set-expr( (expr::new ()) uid )))
@@ -268,7 +266,7 @@ compile-expr-strict := λctx e offset used . (tail(
                e1
             )))
             ( (Literal lval) (tail(
-               (if (typecheck-unify-args( (Array( U8 '? )) (typecheck-lookup e) )) (
+               (if (typecheck-unify-args( String (typecheck-lookup e) )) (
                   (local uid)
                   (set uid (strict-declare-cstring( lval )))
                   (set e1 (expr::set-expr( (expr::new ()) uid )))

PRODUCTION/codegen-strict.lm

@@ -658,7 +658,7 @@ typecheck-infer-type-expr := λe . (match e (
    ))
    ( (Global( 'main (Lambda( _ _ )) )) (tail(
       (set typecheck-global-context ( typecheck-global-context (Global( 'argc (parse-type 'U64+GlobalVariable) )) ))
-      (set typecheck-global-context ( typecheck-global-context (Global( 'argv (parse-type 'U8[?][?]+GlobalVariable) )) ))
+      (set typecheck-global-context ( typecheck-global-context (Global( 'argv (parse-type 'String[?]+GlobalVariable) )) ))
    )))
    ( (Global( gln (Lambda( glp (App( (App( (Literal ':) _ )) rtype )) )) )) (tail(
       (local lt)
@@ -820,10 +820,8 @@ typecheck-infer-expr := λctx e used . (tail(
             (match (typecheck-slot( (typecheck-lookup r) Array )) (
                ()
                ( (Array( x '? )) (
-                  (if (typecheck-unify-implies( x U8 )) () (
-                     (if (typecheck-unify-implies( x '? )) () (
-                        (set rtype x)
-                     ))
+                  (if (typecheck-unify-implies( x '? )) () (
+                     (set rtype x)
                   ))
                ))
             ))

PRODUCTION/typecheck.lm

@@ -189,7 +189,7 @@ fragment mov := λ(: src Reg16)(: dst LocalVariable). (: (.program( \t 'mov \s '
 fragment mov := λ(: src Reg32)(: dst LocalVariable). (: (.program( \t 'mov \s '% (.expression src) , \s (.expression dst) \[ '%rbp \] \n )) Nil);
 fragment mov := λ(: src Reg64)(: dst LocalVariable). (: (.program( \t 'mov \s '% (.expression src) , \s (.expression dst) \[ '%rbp \] \n )) Nil);
 
-fragment mov := λ(: src Constant+U8[])(: dst LocalVariable). (: (.program(
+fragment mov := λ(: src Constant+String)(: dst LocalVariable). (: (.program(
    \t 'movq \s '$ (.expression src) , \s (.expression dst) \[ '%rbp \] \n
 )) Nil);
 

STDLIB/default-instruction-set.lm

@@ -7,7 +7,7 @@ fragment type I8;  size I8 1;  atom suffix I8  i8;
 fragment type I16; size I16 2; atom suffix I16 i16;
 fragment type I32; size I32 4; atom suffix I32 i32;
 fragment type I64; size I64 8; atom suffix I64 i64;
-                               atom suffix U8[] _s;
+                size String 8; atom suffix String _s;
 
 fragment [] := λ(: l GlobalVariable+Array<x,?>)(: r GlobalVariable+U64). (: (
    (.program (

STDLIB/default-primitives.lm

@@ -1,6 +1,6 @@
 
 type S (SNil)
-     | (SAtom( U8[] ))
+     | (SAtom( String ))
      | (SCons( S[] , S[] ))
      | (SPointer( ?[] ));
 
@@ -31,7 +31,7 @@ print := λ(: x S). (: (tail(
    ()
 )) Nil);
 
-fail := λ(: msg Array<U8,?>). (: (tail(
+fail := λ(: msg String). (: (tail(
    (print msg)
    (exit 1u64)
 )) Nil);
@@ -42,7 +42,7 @@ exit := λ(: code U64). (: (tail(
    (syscall())
 )) Nil);
 
-print := λ(: x Array<U8,?>). (: (tail(
+print := λ(: x String). (: (tail(
    (mov( x R15 ))
    (mov( 0u64 RDX )) # data length
    (gensym-label begin-count)
@@ -176,7 +176,7 @@ print := λ(: x I8). (: (tail(
    (print( (: R15 Reg64+I64) ))
 )) Nil);
 
-== := λ(: l U8[])(: r U8[]). (: (tail(
+== := λ(: l String)(: r String). (: (tail(
    (let c1 0u8)
    (let c2 0u8)
    (gensym-label start)

STDLIB/default-stdlib.lm

@@ -22,7 +22,7 @@ config-target                := 'tmp.s_s;
 type CompileMode ModeTokenize | ModeParse | ModePreprocess | ModeTypecheck | ModeCompile;
 config-mode                  := (: ModeCompile CompileMode);
 
-main := λ(: argc U64)(: argv U8[][]).(tail(
+main := λ(: argc U64)(: argv String[]).(tail(
    (let argi 1u64)
    (let input SNil)
    (while (<( argi argc )) (

STRICT/cli.lm

@@ -1,7 +1,7 @@
 
 type Tokens EOF;
 
-tokenize := λ(: fp U8[]). (: (tail(
+tokenize := λ(: fp String). (: (tail(
    ()
    ()
 )) Nil);