Merge pull request #228 from andrew-johnson-4/strict-compiler-dev-6-3

Strict compiler dev 6 3

Author: andrew-johnson-4

BOOTSTRAP/cli.s

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

Cargo.toml

@@ -1,6 +1,6 @@
 
 nostd: prod
-	./production --nostd -o tmp.s tests/strict/match2.lm
+	./production --nostd -o tmp.s STRICT/cli.lm
 	as -o tmp.o tmp.s
 	ld -o tmp tmp.o
 	./tmp && echo $?

Makefile

@@ -232,5 +232,12 @@ stack-define-destructure := λ ctx lhs offset . (match lhs (
       (set return (expr::set-offset( return (expr::get-offset more-e) )))
       return
    )))
+   ( Nil (tail(
+      (local return)
+      (set return (expr::new()))
+      (set return (expr::set-context( return ctx )))
+      (set return (expr::set-offset( return offset )))
+      return
+   )))
    ( u (fail (UnknownStackArg lhs)))
 ));

PRODUCTION/stack.lm

@@ -55,10 +55,16 @@ allocate-atom-grow := λ size . (tail(
          \t 'syscall                                 \n
          \t 'mov \s '%rax, '%r8                      \n
          \t 'add \s '$ page-size , \s '%r8           \n
+         \t 'add \s '$ page-size , \s '%r8           \n
+         \t 'add \s '$ page-size , \s '%r8           \n
+         \t 'add \s '$ page-size , \s '%r8           \n
          \t 'mov \s '$12, \s '%rax                   \n  # system call brk
          \t 'mov \s '%r8, \s '%rdi                   \n  # new requested brk
          \t 'syscall                                 \n
          \t 'sub \s '$ page-size , \s '%r8           \n
+         \t 'sub \s '$ page-size , \s '%r8           \n
+         \t 'sub \s '$ page-size , \s '%r8           \n
+         \t 'sub \s '$ page-size , \s '%r8           \n
          \t 'mov \s '%r8, \s '%r9                    \n
          \t 'mov \s '%r9 , \s '%r10                  \n
          initialized ':                              \n

STDLIB/default-atom-allocator.lm

@@ -29,10 +29,16 @@ allocate-cons := λ . (tail(
          \t 'syscall                                 \n
          \t 'mov \s '%rax, '%r8                      \n
          \t 'add \s '$ page-size , \s '%r8           \n
+         \t 'add \s '$ page-size , \s '%r8           \n
+         \t 'add \s '$ page-size , \s '%r8           \n
+         \t 'add \s '$ page-size , \s '%r8           \n
          \t 'mov \s '$12, \s '%rax                   \n  # system call brk
          \t 'mov \s '%r8, \s '%rdi                   \n  # new requested brk
          \t 'syscall                                 \n
          \t 'sub \s '$ page-size , \s '%r8           \n
+         \t 'sub \s '$ page-size , \s '%r8           \n
+         \t 'sub \s '$ page-size , \s '%r8           \n
+         \t 'sub \s '$ page-size , \s '%r8           \n
          initialized ':                              \n
          \t 'add \s '$16, \s '%r8                    \n
          \t 'mov \s '$ assemble_cons_tail , \s '%r9  \n

STDLIB/default-cons-allocator.lm

@@ -0,0 +1,6 @@
+
+
+type AST ASTNil;
+
+ast-tokenized-program := (: EOF Tokens);
+ast-parsed-program := (: ASTNil AST);

STRICT/ast.lm

@@ -4,6 +4,7 @@ import STDLIB/default-primitives.lm;
 import STDLIB/default-rules.lm;
 import STDLIB/default-stdlib.lm;
 
+import STRICT/ast.lm;
 import STRICT/utility.lm;
 import STRICT/tokenize.lm;
 import STRICT/parse.lm;
@@ -18,7 +19,7 @@ config-strict                := Trueu8;
 config-preprocess            := Trueu8;
 config-target                := 'tmp.s_s;
 
-type CompileMode ModeTokenize | ModeParse | ModeTypecheck | ModeCompile;
+type CompileMode ModeTokenize | ModeParse | ModePreprocess | ModeTypecheck | ModeCompile;
 config-mode                  := (: ModeCompile CompileMode);
 
 main := λ(: argc U64)(: argv U8[][]).(tail(
@@ -29,6 +30,7 @@ main := λ(: argc U64)(: argv U8[][]).(tail(
          ()
          ('--tokenize_s (set config-mode ModeTokenize))
          ('--parse_s (set config-mode ModeParse))
+         ('--preprocess_s (set config-mode ModePreprocess))
          ('--typecheck_s (set config-mode ModeTypecheck))
          ('--compile_s (set config-mode ModeCompile))
          ('--strict_s (set config-strict Trueu8))
@@ -54,41 +56,35 @@ main := λ(: argc U64)(: argv U8[][]).(tail(
    (print Preprocess:\s_s)(print config-preprocess)(print \n_s)
    (print Strict:\s_s)(print config-strict)(print \n_s)
 
-#   (let continue Trueu8)
-#   (while (==( continue Trueu8 )) (match input (
-#      ()
-#      ( SNil (set continue Falseu8) )
-#      ( (SCons( SNil rst )) (set input rst) )
-#      ( (SCons( l rst )) (tail( (print l) (set input rst) )) )
-#      ( (SCons( (SAtom( fp )) rst )) (tail( (cli-intake fp) (set input rst) )))
-#      ( (SAtom( fp )) (tail( (cli-intake fp) (set continue False) )))
-#   )))
+   (let continue Trueu8)
+   (while (==( continue Trueu8 )) (match input (
+      ()
+      ( SNil (set continue Falseu8) )
+      ( (SCons( rst SNil )) (set input rst) )
+      ( (SCons( rst (SAtom( fp )) )) (tail( (tokenize fp) (set input rst) )))
+      ( (SAtom( fp )) (tail( (tokenize fp) (set continue Falseu8) )))
+   )))
 
+   (match config-mode (
+      ()
+      ( ModeTokenize () )
+      ( ModeParse (parse ast-tokenized-program) )
+      ( ModePreprocess (tail(
+         (parse ast-tokenized-program)
+         (preprocess ast-parsed-program)
+      )))
+      ( ModeTypecheck (tail(
+         (parse ast-tokenized-program)
+         (preprocess ast-parsed-program)
+         (typecheck())
+      )))
+      ( ModeCompile (tail(
+         (parse ast-tokenized-program)
+         (preprocess ast-parsed-program)
+         (typecheck())
+         (compile())
+      )))
+   ))
 
-#      (Compile (
-#         (parse-program (tokenize-file (head inputs)))
-#         (set inputs (tail inputs))
-#      ))
-#      (Parse (
-#         (parse-program (tokenize-file (head inputs)))
-#         (set inputs (tail inputs))
-#      ))
-#      (Typecheck (
-#         (parse-program (tokenize-file (head inputs)))
-#         (set inputs (tail inputs))
-#      ))
-#      (ParseExpression (
-#         (print-s (parse-expression (tokenize-file (head inputs))))
-#         (set inputs (tail inputs))
-#      ))
-#      (Tokenize (
-#         (print-s (tokenize-file (head inputs)))
-#         (set inputs (tail inputs))
-#      ))
 ));
 
-cli-intake := λ(: fp U8[]) . (: (tail(
-   (print 'Intake:\s_s)
-   (print fp)
-   (print '\n_s)
-)) Nil);

STRICT/cli.lm

@@ -0,0 +1,5 @@
+
+compile := λ. (: (tail(
+   ()
+   ()
+)) Nil);

STRICT/codegen.lm

@@ -0,0 +1,5 @@
+
+parse := λ(: fp Tokens). (: (tail(
+   ()
+   ()
+)) Nil);

STRICT/parse.lm

@@ -0,0 +1,5 @@
+
+preprocess := λ(: program AST). (: (tail(
+   ()
+   ()
+)) Nil);

STRICT/preprocess.lm

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

STRICT/tokenize.lm

@@ -0,0 +1,5 @@
+
+typecheck := λ. (: (tail(
+   ()
+   ()
+)) Nil);