Skip to content

Commit

Permalink
Merge pull request #1211 from andrew-johnson-4/lm-to-lsts-fwelq
Browse files Browse the repository at this point in the history 
t
  • Loading branch information
@andrew-johnson-4
andrew-johnson-4 authored Feb 1, 2025
2 parents dc2396a + d8a124b commit c966b4d
Show file tree
Hide file tree
Showing 56 changed files with 21,536 additions and 21,534 deletions.
42,866 changes: 21,433 additions & 21,433 deletions BOOTSTRAP/cli.c
View file

Large diffs are not rendered by default.

49 changes: 1 addition & 48 deletions PLATFORM/C/LIB/default.lm
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,2 @@

import PLATFORM/C/LIB/common-macros.lm;
import PLATFORM/C/LIB/platform-macros.lm;
import PLATFORM/C/LIB/blob.lm;
import PLATFORM/C/LIB/primitives.lm;
import PLATFORM/C/LIB/primitives.lsts;
import PLATFORM/C/LIB/field-accessors.lsts;
import PLATFORM/C/LIB/sized.lm;
import PLATFORM/C/LIB/bool.lsts;
import PLATFORM/C/LIB/u8.lm;
import PLATFORM/C/LIB/i8.lm;
import PLATFORM/C/LIB/u16.lm;
import PLATFORM/C/LIB/i16.lm;
import PLATFORM/C/LIB/u32.lm;
import PLATFORM/C/LIB/i32.lm;
import PLATFORM/C/LIB/u64.lm;
import PLATFORM/C/LIB/i64.lm;
import PLATFORM/C/LIB/f64.lm;
import PLATFORM/C/LIB/u8.lsts;
import PLATFORM/C/LIB/i8.lsts;
import PLATFORM/C/LIB/u16.lsts;
import PLATFORM/C/LIB/i16.lsts;
import PLATFORM/C/LIB/u32.lsts;
import PLATFORM/C/LIB/i32.lsts;
import PLATFORM/C/LIB/u64.lsts;
import PLATFORM/C/LIB/i64.lsts;
import PLATFORM/C/LIB/f64.lsts;
import PLATFORM/C/LIB/usize.lsts;
import PLATFORM/C/LIB/buffer.lm;
import PLATFORM/C/LIB/string.lm;
import PLATFORM/C/LIB/string.lsts;
import PLATFORM/C/LIB/smart-string.lm;
import PLATFORM/C/LIB/smart-string.lsts;
import PLATFORM/C/LIB/s.lsts;
import PLATFORM/C/LIB/tuple.lsts;
import PLATFORM/C/LIB/list.lm;
import PLATFORM/C/LIB/list.lsts;
import PLATFORM/C/LIB/maybe.lsts;
import PLATFORM/C/LIB/vector.lsts;
import PLATFORM/C/LIB/hashtable.lm;
import PLATFORM/C/LIB/hashtable.lsts;
import PLATFORM/C/LIB/array.lm;
import PLATFORM/C/LIB/array.lsts;
import PLATFORM/C/LIB/io.lm;
import PLATFORM/C/LIB/io.lsts;
import PLATFORM/C/LIB/regex.lm;
import PLATFORM/C/LIB/cmp.lsts;
import PLATFORM/C/LIB/print.lsts;
import PLATFORM/C/LIB/umbra.lsts;
import LIB/default.lsts;
49 changes: 49 additions & 0 deletions PLATFORM/C/LIB/default.lsts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@

import PLATFORM/C/LIB/common-macros.lm;
import PLATFORM/C/LIB/platform-macros.lm;
import PLATFORM/C/LIB/blob.lm;
import PLATFORM/C/LIB/primitives.lm;
import PLATFORM/C/LIB/primitives.lsts;
import PLATFORM/C/LIB/field-accessors.lsts;
import PLATFORM/C/LIB/sized.lm;
import PLATFORM/C/LIB/bool.lsts;
import PLATFORM/C/LIB/u8.lm;
import PLATFORM/C/LIB/i8.lm;
import PLATFORM/C/LIB/u16.lm;
import PLATFORM/C/LIB/i16.lm;
import PLATFORM/C/LIB/u32.lm;
import PLATFORM/C/LIB/i32.lm;
import PLATFORM/C/LIB/u64.lm;
import PLATFORM/C/LIB/i64.lm;
import PLATFORM/C/LIB/f64.lm;
import PLATFORM/C/LIB/u8.lsts;
import PLATFORM/C/LIB/i8.lsts;
import PLATFORM/C/LIB/u16.lsts;
import PLATFORM/C/LIB/i16.lsts;
import PLATFORM/C/LIB/u32.lsts;
import PLATFORM/C/LIB/i32.lsts;
import PLATFORM/C/LIB/u64.lsts;
import PLATFORM/C/LIB/i64.lsts;
import PLATFORM/C/LIB/f64.lsts;
import PLATFORM/C/LIB/usize.lsts;
import PLATFORM/C/LIB/buffer.lm;
import PLATFORM/C/LIB/string.lm;
import PLATFORM/C/LIB/string.lsts;
import PLATFORM/C/LIB/smart-string.lm;
import PLATFORM/C/LIB/smart-string.lsts;
import PLATFORM/C/LIB/s.lsts;
import PLATFORM/C/LIB/tuple.lsts;
import PLATFORM/C/LIB/list.lm;
import PLATFORM/C/LIB/list.lsts;
import PLATFORM/C/LIB/maybe.lsts;
import PLATFORM/C/LIB/vector.lsts;
import PLATFORM/C/LIB/hashtable.lm;
import PLATFORM/C/LIB/hashtable.lsts;
import PLATFORM/C/LIB/array.lm;
import PLATFORM/C/LIB/array.lsts;
import PLATFORM/C/LIB/io.lm;
import PLATFORM/C/LIB/io.lsts;
import PLATFORM/C/LIB/regex.lm;
import PLATFORM/C/LIB/cmp.lsts;
import PLATFORM/C/LIB/print.lsts;
import PLATFORM/C/LIB/umbra.lsts;
2 changes: 1 addition & 1 deletion SRC/index-index.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

import SRC/unit-drivers.lsts;

Expand Down
2 changes: 1 addition & 1 deletion tests/lib/cmp.lsts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

assert( LessThan == LessThan );
assert( LessThan != Equal );
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/s.lsts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

assert( SNil == SNil );
assert( SNil != SAtom{ c"A" } );
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/tuple.lsts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

assert( Tuple(1, 2) == Tuple(1, 2) );
assert( Tuple(1, 2) != Tuple(1, 3) );
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/umbra.lsts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

# UmbraShort
let a = to-umbra("Hey");
Expand Down
2 changes: 1 addition & 1 deletion tests/perf/btree.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

b := (: (HashtableIs( 0_u64 0_u64 (as 0_u64 Tuple<U64,U64>[]) )) HashtableIs<U64,U64>);
bb := (: (HashtableEq( 0_u64 0_u64 (as 0_u64 Tuple<U64,U64>[]) )) HashtableEq<U64,U64>);
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/3tuple.lsts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

let t2 = Tuple{ 1, 2 };
print(t2);
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/arithmetic.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

main := λ. (: (
(print 1_u64)(print '\n_s)
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/bad-hook.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

f := λ: Hook+HookPriority<-1>(: a U64). (: (
a
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/big_return.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

type XY X | (Y( U64 ));
type XYZ (Z( XY , U64 ));
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/cdecl.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

type XY X | (Y( U64 ));
type XYZ (Z( XY , U64 ));
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/cell.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

main := λ. (: (
(let c (cell( 1_u64 )))
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/clone-rope.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

main := λ. (: (
(let s (SAtom 'ABC_s))
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/comparison.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

g0 := 0_u64;
g1 := 1_u64;
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/custom_macro.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

macro ('m1 a) (print a);

Expand Down
2 changes: 1 addition & 1 deletion tests/regress/dev.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;
import LIB/dev-u64.lm;

main := λ.(: (
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/enforce-scope.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

main := λ. (: (
()
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/eprint.lsts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

let main(): Nil = (
print(1);
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/exec.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

main := λ. (: (
(let tmp (as (mktemp(as (clone-rope(SAtom '/tmp/lm.tmp.XXXXXX_s)) U8[])) U8[]))
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/expression-if.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

type A (A( U64 , U64 )) | (B( U64 , U64 ));

Expand Down
2 changes: 1 addition & 1 deletion tests/regress/forward-type-definition.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

type A (A( B , B ));
type B (B( U64 , U64 ));
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/function-hierarchy.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

f := λ(: x U64). 1_u64;
f := λ(: x U64+Nonce1+Nonce2). 2_u64;
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/function-pointers.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

fa := λ. (: (print 'A_s) Nil);
fb := λ. (: (print 'B_s) Nil);
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/functions-as-arguments.lsts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

let f(x: U64): U64 = x;
let g(f: Arrow<U64,U64>, x: U64): U64 = x + 1;
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/hashtable.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

main := λ. (: (
(let index (HashtableIs( 0_u64 0_u64 (as 0_u64 Tuple<U64,U64>[]) )))
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/if-let.lsts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

type A = A { x: U64 };

Expand Down
2 changes: 1 addition & 1 deletion tests/regress/import-c.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;
import math.h;
import stdlib.h;

Expand Down
2 changes: 1 addition & 1 deletion tests/regress/left-struct-match.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

type A (A( U64 ));
type B (B( A ));
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/list.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

type A (AA( U64 ));
type B (B( List<A> ));
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/lsts-frontend.lsts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import $"LIB/default.lm";
import $"LIB/default.lsts";

let $"***"(x: I64, y: I64): I64 = (x + y) - 2_i64 * y;

Expand Down
2 changes: 1 addition & 1 deletion tests/regress/malloc.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

main := λ. (: (
(let region1 (malloc 11_u64))
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/match-error.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

main := λ. (: (
()
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/mono-struct.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

type A (A( a:U64 , b:U64 , c:U64 , d:U64 , e:U64 ));
type B (B( f:A ));
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/numerical-pyramid.lsts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

let a(x: U8): Nil = print(x);
let b(x: I8): Nil = print(x);
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/paradata.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

type XYZ<x,y> (XY( x , y )) | X | (Y( x ));

Expand Down
2 changes: 1 addition & 1 deletion tests/regress/parametric.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

f := λ(: x x). (: (
(+( x x ))
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/phi.lsts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

let fp = fopen(c"input-file.txt", c"r");

Expand Down
2 changes: 1 addition & 1 deletion tests/regress/poly_mov.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

type XY X | (Y( U64 ));
type XYZ (Z( XY , U64 ));
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/prep-sub-types.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

macro ('my-seq base-type v ) (
a := λ(: t base-type+base-type). v;
Expand Down
2 changes: 1 addition & 1 deletion tests/regress/propositional-types.lsts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

type A = A { x: U64 };

Expand Down
2 changes: 1 addition & 1 deletion tests/regress/rc.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

type A (ACons( Rc<A> , Rc<A> )) | (AAtom( String ));

Expand Down
2 changes: 1 addition & 1 deletion tests/regress/read-file.lm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import LIB/default.lm;
import LIB/default.lsts;

main := λ.(: (
(print(read-file( 'tests/regress/read-file.lm.out_s )))
Expand Down
Loading

0 comments on commit c966b4d

Please sign in to comment.