reorganisation

AUTHORS

@@ -13,4 +13,6 @@ Nathan Razafimanantsoa, Kumar Mahadayya (2021)
 	C AST
 
 Theo Souchon (2022-2023)
-  ?
+    metalanguage features, development, tests, examples
+    grammar, object system changes for metalanguage
+    source and repository reorganisation

README.md

@@ -1,94 +0,0 @@
-# CCMETA
-
-C compiler with embedded metalanguage.
-
-## <div id="toc">Table of contents<div>
-1. [Architecture](#ar)
-2. [Build the project](#bp)
-   - [Requirements](#ar)
-   - [Makefile](#makefile)
-     - [Build](#makefile_Build)
-     - [Clean](#makefile_Clean)
-     - [Test](#makefile_Test)
-3. [Usage](#usage)
-4. [Help](#help)
-   - [Peg/Leg](#pegleg)
-5. [Authors](#authors)
-
-
-## <div id="ar">Architecture<div>
-![alt text](http://git.piumarta.com/piumarta/ccmeta/raw/branch/develop/src/images/ccmeta.drawio.png)
-### [Go to the table of contents](#toc)
-
-## <div id="bp">Build the project<div>
-### <div id="req">Requirements<div>
-
-Please install [peg/leg](https://www.piumarta.com/software/peg/) manually or with a package manager, for example with Homebrew: 
-```bash
-$ brew install peg
-```
-
-Please install [the Boehm-Demers-Weiser conservative garbage collector](https://www.hboehm.info/gc/) manually or with a package manager, for example with Homebrew:
-```bash
-$ brew install bdw-gc
-```
-
-### <div id="makefile"> Makefile<div>
->Compatible with the homebrew installed on the apple silicon ship
-
-#### <div id="makefile_Build">Build<div>
-```bash
-$ make
-```
-
-#### <div id="makefile_Clean">Clean<div>
-```bash
-$ make clean
-```
-
-#### <div id="makefile_Test">Test <div>
-```bash
-$ make test
-```
-### [Go to the table of contents](#toc)
-
-## <div id="usage">Usage<div>
-### How it works
-You can pass your program:
-* via an input file
-```bash
-$ ./ccmeta < file
-```
-* via a file
-```bash
-$ ./ccmeta file
-```
-### **Check each test file to get an idea of how parsimony works**
-### [Go to the table of contents](#toc)
-
-## <div id="help">Help<div>
-
-### <div id="pegleg">peg/leg<div>
-
-``` shell
-$ man peg
-```
-### [Go to the table of contents](#toc)
-
-## <div id="authors">Authors<div>
-#### Ian Piumarta (2016-)
-- infrastructure
-- parsing framework
-- C grammar, C AST
-- object system design and implementation
-- metalanguage design and implementation
-
-#### Mahe Tardy (2020)
-- object system implementation
-- metalanguage implementation
-
-#### Nathan Razafimanantsoa, Kumar Mahadayya (2021)
-- C AST
-
-#### Theo Souchon (2022-2023)
-- ?

README.md

@@ -0,0 +1 @@
+doc/README.md

doc/README.md

@@ -0,0 +1,96 @@
+# CCMETA
+
+C compiler with embedded metalanguage.
+
+## <div id="toc">Table of contents<div>
+1. [Architecture](#ar)
+2. [Build the project](#bp)
+   - [Requirements](#ar)
+   - [Makefile](#makefile)
+     - [Build](#makefile_Build)
+     - [Clean](#makefile_Clean)
+     - [Test](#makefile_Test)
+3. [Usage](#usage)
+4. [Help](#help)
+   - [Peg/Leg](#pegleg)
+5. [Authors](#authors)
+
+
+## <div id="ar">Architecture<div>
+![alt text](http://git.piumarta.com/piumarta/ccmeta/raw/branch/develop/src/images/ccmeta.drawio.png)
+### [Go to the table of contents](#toc)
+
+## <div id="bp">Build the project<div>
+### <div id="req">Requirements<div>
+
+Please install [peg/leg](https://www.piumarta.com/software/peg/) manually or with a package manager, for example with Homebrew: 
+```bash
+$ brew install peg
+```
+
+Please install [the Boehm-Demers-Weiser conservative garbage collector](https://www.hboehm.info/gc/) manually or with a package manager, for example with Homebrew:
+```bash
+$ brew install bdw-gc
+```
+
+### <div id="makefile"> Makefile<div>
+>Compatible with the homebrew installed on the apple silicon ship
+
+#### <div id="makefile_Build">Build<div>
+```bash
+$ make
+```
+
+#### <div id="makefile_Clean">Clean<div>
+```bash
+$ make clean
+```
+
+#### <div id="makefile_Test">Test <div>
+```bash
+$ make test
+```
+### [Go to the table of contents](#toc)
+
+## <div id="usage">Usage<div>
+### How it works
+You can pass your program:
+* via an input file
+```bash
+$ ./ccmeta < file
+```
+* via a file
+```bash
+$ ./ccmeta file
+```
+### **Check each test file to get an idea of how parsimony works**
+### [Go to the table of contents](#toc)
+
+## <div id="help">Help<div>
+
+### <div id="pegleg">peg/leg<div>
+
+``` shell
+$ man peg
+```
+### [Go to the table of contents](#toc)
+
+## <div id="authors">Authors<div>
+#### Ian Piumarta (2016-)
+- infrastructure
+- parsing framework
+- C grammar, C AST
+- object system design and implementation
+- metalanguage design and implementation
+
+#### Mahe Tardy (2020)
+- object system implementation
+- metalanguage implementation
+
+#### Nathan Razafimanantsoa, Kumar Mahadayya (2021)
+- C AST
+
+#### Theo Souchon (2022-2023)
+- metalanguage features, development, tests, examples
+- grammar, object system changes for metalanguage
+- source and repository reorganisation

src/tests/tests-parsimony/projectExample → examples/projectExample

@@ -1,3 +1,3 @@
 enum foo { Closed = 0, ReadOnly = 1, WriteOnly = 2 };
 
-static char *stateNames[] = { "Closed", "ReadOnly", "WriteOnly"};
+static char *stateNames[] = { "Closed", "ReadOnly", "WriteOnly"};

examples/projectExample.c

@@ -0,0 +1,19 @@
+@{
+  mapast(f, seq)
+  {
+    out = {};
+    for (i in seq) {
+      e = seq[i];
+      out[length(out)] = e.__proto__ != Token ? f(e) : e ;
+    }
+    out;
+  }
+
+  idToString(x) { { __proto__: C_string, value: "\"" + string(x.name.identifier) + "\"" } }
+
+  nil;
+}
+
+enum foo { Closed = 0, ReadOnly = 1, WriteOnly = 2 };
+
+static char *stateNames[] = { @(mapast(idToString, program.last.enumList)) };

src/ccmeta.leg

@@ -2600,7 +2600,6 @@ MO_OPERATION  = META_BACKTICK ( MO_CONSTANT     c:constant            { $$= newU
                               | MO_FUN          f:functionDefinition  { $$= newUnary(Quasiquote_proto, f) }
                               | MO_DECLARATION  d:declaration         { $$= newUnary(Quasiquote_proto, d) }
                               | MO_STATEMENT    s:statement           { $$= newUnary(Quasiquote_proto, s) }
-                              | MO_ED           e:externalDeclaration { $$= newUnary(Quasiquote_proto, e) }
                               )
 
 MO_CONSTANT     = 'constant'      ![(a-zA-Z0-9_] --
@@ -2609,7 +2608,6 @@ MO_EXPRESSION   = 'expression'    ![(a-zA-Z0-9_] --
 MO_FUN          = 'fun'           ![(a-zA-Z0-9_] --
 MO_DECLARATION  = 'declaration'   ![(a-zA-Z0-9_] --
 MO_STATEMENT    = 'statement'     ![(a-zA-Z0-9_] --
-MO_ED           = 'ed'            ![(a-zA-Z0-9_] --
 
 
 #--------------------------------------------- Meta rules ----------------------------------------------#
@@ -3710,7 +3708,7 @@ oop prim_print(oop scope, oop params)
     }
     return params;
 }
-//TRY
+
 oop evalArgs(oop scope, oop args)
 {
    int i = 0;
@@ -3739,15 +3737,9 @@ void readEvalPrint(oop scope, char *fileName)
     int jbt= sigsetjmp(jbs->jb, 0);
     if (0 == jbt) {
         while (yyparse(&ctx)) {
-          // println(yylval);
             if (!yylval) { // EOF
                 assert(top == inputStack);
                 break;
-                // fclose(inputStack->file);
-                // if (top == inputStack) break;
-                // inputStackPop();
-                // assert(inputStack);
-                // continue;
             }
             assert(yylval);
             if (null == yylval) { // change of language or input file

src/object.c

@@ -548,12 +548,6 @@ oop map_append(oop map, oop value)
     return map_set(map, makeInteger(map_size(map)), value);
 }
 
-oop map_appendNonNil(oop map, oop value)
-{
-    if (value != null) map_set(map, makeInteger(map_size(map)), value);
-    return value;
-}
-
 oop map_pop(oop map)
 {                                                                   assert(map_isArray(map));
     size_t size = get(map, Map, size);

src/parsimonyLibrary/boot.mc

@@ -99,24 +99,10 @@
     map(f, seq, g)
     {
         out = {};
-        if (g)
-        {
-            for (i in seq)
-            {
-                e = seq[i];
-                if (g(e))
-                {
-                    e = f(e);
-                }
-                append(out, e);
-            }
-        }
-        else
-        {
-            for (i in seq)
-            {
-                append(out, f(seq[i]));
-            }
+        if (!g) g = (){ 1 };
+        for (i in seq) {
+            e = seq[i];
+            out[length(out)] = g(e) ? f(e) : e ;
         }
         out;
     }

src/parsimonyLibrary/dynamicObjectExtDecl.mc

@@ -105,7 +105,7 @@ struct __oop { int class; };
 
 typedef struct __oop *oop;
 
-@import("parsimonyLibrary/boot.mc")
+@import("../src/parsimonyLibrary/boot.mc")
 
 @{
 

src/parsimonyLibrary/dynamicObjectParsFrom.mc

@@ -105,7 +105,7 @@ struct __oop { int class; };
 
 typedef struct __oop *oop;
 
-@import("parsimonyLibrary/boot.mc")
+@import("../src/parsimonyLibrary/boot.mc")
 
 @{
 

src/tests/tests-parsimony/002

@@ -1,6 +0,0 @@
-char t = 10;
-int i = 2;
-int q = 10;
-int k = (1,2,"stringy thingy",21<<1);
-int i = (1,2,"string",21<<1);
-int w = 10;

src/tests/tests-parsimony/002.c

@@ -1,17 +0,0 @@
-@{ 
-	saved = `expression (1,2,"string",21<<1);
-	first  = `constant 2;
-  nil;
-}
-
-@{ 
-  second = `constant 10; 
-  nil;
-}
-
-char t = @(`constant @second);
-int i = @first;
-int q = @(`constant 10);
-int k = @(`expression (1,2,"stringy thingy",21<<1));
-int i = @saved;
-int w = @second;

src/tests/tests-parsimony/projectExample.c

@@ -1,10 +0,0 @@
-@{import("parsimonyLibrary/boot.mc");}
-
-enum foo { Closed = 0, ReadOnly = 1, WriteOnly = 2 };
-
-@{
-  idToString(x)   {{ __proto__: C_string, value: "\"" + string(x.name.identifier) + "\"" }} 
-  nil;
-}
-
-static char *stateNames[] = { @(map(idToString, program.last.enumList, notToken)) };

src/dotest → tests/dotest

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-make
+make -C ../src
 
 if test $# -gt 0; then
     run="$@"
 else
-    run="./ccmeta"
+    run="../src/ccmeta"
 fi
 
 die()
@@ -14,37 +14,37 @@ die()
     exit 1
 }
 
-for i in tests/tests-parsimony/*.c; do
+for i in tests-parsimony/*.c; do
     echo $i
     j="${i%.c}"
-    k="tests/tests-parsimony/tmp.out"
+    k="tests-parsimony/tmp.out"
     $run $i > $k
     cmp $k $j || die $k $j
 done
-rm tests/tests-parsimony/tmp.out
+rm tests-parsimony/tmp.out
 
-for i in tests/tests-std/*.c; do
+for i in tests-std/*.c; do
     echo $i
     j="${i%.c}.out"
     $run < $i > $j
     cmp $i $j || die $i $j
 done
 
-for i in tests/tests-gnu/*.c; do
+for i in tests-gnu/*.c; do
     echo $i
     j="${i%.c}.out"
     $run < $i > $j
     cmp $i $j || die $i $j
 done
 
-for i in tests/tests-err/*.c; do
+for i in tests-err/*.c; do
     echo $i
     j="${i%.c}.out"
     $run < $i > $j
     cmp -s $i $j || echo failed
 done
 
-for i in tests/tests-c/*.c; do
+for i in tests-c/*.c; do
     echo $i
     j="${i%.c}.out"
     $run < $i > $j