Merge pull request #1197 from andrew-johnson-4/more-lm-to-lsts-faefwm

More lm to lsts faefwm

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lambda_mountain"
-version = "1.20.53"
+version = "1.20.54"
 authors = ["Andrew <[email protected]>"]
 license = "MIT"
 description = "Typed Macro Assembler (backed by Coq proofs-of-correctness)"

PLUGINS/BACKEND/BLOB/index-index.lm

@@ -1,2 +1,3 @@
 
 import PLUGINS/BACKEND/BLOB/compile-blob.lm;
+import PLUGINS/BACKEND/BLOB/register-hook.lsts;

PLUGINS/BACKEND/BLOB/register-hook.lsts

@@ -0,0 +1,2 @@
+
+register-backend(c"--blob",  &plugins-backend-blob-compile);

PLUGINS/BACKEND/C/index-index.lm

@@ -31,3 +31,4 @@ import PLUGINS/BACKEND/C/fragment::chain.lm;
 import PLUGINS/BACKEND/C/fragment::local-variable.lm;
 import PLUGINS/BACKEND/C/fragment::label.lm;
 import PLUGINS/BACKEND/C/is-const-array.lm;
+import PLUGINS/BACKEND/C/register-hook.lsts;

PLUGINS/BACKEND/C/mangle-c-type.lm

@@ -33,7 +33,13 @@ mangle-c-type-internal := λ(: tt Type). (: (
       ( (TGround( 'IO::File_s _ )) (set r (SAtom 'FILE*_s)) )
       ( (TGround( 'PID_s _ )) (set r (SAtom 'pid_t_s)) )
       ( (TGround( 'Regex_s _ )) (set r (SAtom 'regex_t_s)) )
-      ( (TGround( 'Array_s (LCons( _ (LCons( array-base _ )) )) )) (set r (+( (mangle-c-type array-base) (SAtom '*_s) ))) )
+      ( (TGround( 'Array_s (LCons( _ (LCons( array-base _ )) )) )) (
+         (if (.is-arrow array-base) (
+            (set r (mangle-c-type array-base))
+         ) (
+            (set r (+( (mangle-c-type array-base) (SAtom '*_s) )))
+         ))
+      ))
       ( (TGround( 'Arrow_s _ )) (
          (let pre-post (mangle-c-declaration-internal tt))
          (let td-id (uuid()))

PLUGINS/BACKEND/C/register-hook.lsts

@@ -0,0 +1,2 @@
+
+register-backend(c"--c",  &plugins-backend-c-compile);

SRC/index-plugins.lm

@@ -2,10 +2,6 @@
 # TODO: replace frotends this will file-extension based plugin management
 #     * SRC/unit-drivers.lst
 
-plugin-null-backend := λ. (: (
-   (fail 'Cannot\sCompile:\sNo\sBackend\sWas\sSpecified_s)
-) Nil);
-
 plugin-current-backend := (: (& plugins-backend-c-compile) Arrow<Nil,Nil>[]);
 
 import PLUGINS/BACKEND/C/index-index.lm;

SRC/main.lm

@@ -5,16 +5,6 @@ main := λ(: argc C_int)(: argv String[]). (: (
    (while (<( argi (as argc U64) )) (
       (match ([]( argv (as argi U64) )) (
          ()
-         ('--c_s (
-            (set config-platform-prefix 'PLATFORM/C/_s)
-            (if (==( config-target '_s )) (set config-target 'tmp.c_s) ())
-            (set plugin-current-backend (& plugins-backend-c-compile))
-         ))
-         ('--blob_s (
-            (set config-platform-prefix 'PLATFORM/BLOB/_s)
-            (if (==( config-target '_s )) (set config-target 'tmp.txt_s) ())
-            (set plugin-current-backend (& plugins-backend-blob-compile))          
-         ))
          ('--dev_s (set config-devmode 1_u64))
          ('--typecheck_s (set config-mode ModeTypecheck))
          ('--compile_s (set config-mode ModeCompile))
@@ -28,10 +18,14 @@ main := λ(: argc C_int)(: argv String[]). (: (
             (set config-target ([]( argv argi )))
          ))
          (fp (
-            (set input (SCons(
-               (close input)
-               (close (SAtom( fp )))
-            )))
+            (if (.has( plugins-backends-index fp )) (
+               (set plugin-current-backend (.lookup( plugins-backends-index fp (& plugin-null-backend) )))
+            ) (
+               (set input (SCons(
+                  (close input)
+                  (close (SAtom( fp )))
+               )))
+            ))
          ))
       ))
       (set argi (+( argi 1_u64 )))

SRC/plugins-backends.lsts

@@ -0,0 +1,13 @@
+
+let plugins-backends-index = {} :: HashtableEq<CString,Arrow<Nil,Nil>[]>;
+
+let plugin-null-backend(): Nil = (
+   print("Cannot Compile: No Backend Was Specified\n");
+   exit(1);
+);
+
+let register-backend(flag: CString, hook: Arrow<Nil,Nil>[]): Nil = (
+   plugins-backends-index = plugins-backends-index.bind(flag, hook);
+);
+
+register-backend(c"--c",  &plugins-backend-c-compile);

SRC/unit-drivers.lsts

@@ -1,2 +1,3 @@
 
 import SRC/plugins-frontends.lsts;
+import SRC/plugins-backends.lsts;