Import module collisions

benchmarks/AddImport.c

@@ -0,0 +1,93 @@
+/* Gibbon program. */
+
+#include "gibbon_rts.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <math.h>
+#include <stdbool.h>
+#include <string.h>
+#include <time.h>
+#include <alloca.h>
+#include <sys/mman.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <uthash.h>
+
+#ifdef _WIN64
+#include <windows.h>
+#endif
+
+#ifdef _GIBBON_POINTER
+#include <gc.h>
+#endif
+
+#ifdef _GIBBON_PARALLEL
+#include <cilk/cilk.h>
+#include <cilk/cilk_api.h>
+#endif
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * Program starts here
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+
+typedef struct GibIntProd_struct {
+            GibInt field0;
+        } GibIntProd;
+GibInt add1(GibInt x_1_10_13);
+typedef enum {
+            GibInt_T,
+            GibFloat_T,
+            GibSym_T,
+            GibBool_T,
+            GibVector_T,
+            GibList_T,
+            GibCursor_T,
+        } GibDatatype;
+void info_table_initialize(void)
+{
+    int error = gib_info_table_initialize(7);
+
+    if (error < 0) {
+        fprintf(stderr, "Couldn't initialize info table, errorno=%d", error);
+        exit(1);
+    }
+
+    GibDatatype field_tys[0];
+
+    gib_info_table_finalize();
+}
+void symbol_table_initialize(void)
+{ }
+GibInt add1(GibInt x_1_10_13)
+{
+    GibInt flt_15 = x_1_10_13 + 1;
+
+    return flt_15;
+}
+int main(int argc, char **argv)
+{
+    int init_0 = gib_init(argc, argv);
+
+    info_table_initialize();
+    symbol_table_initialize();
+
+    GibInt fltAppE_11_12 =  add1(0);
+    GibInt tmp_app_14 =  add1(fltAppE_11_12);
+
+    printf("%ld", tmp_app_14);
+    printf("\n");
+    return 0;
+
+    int exit_1 = gib_exit();
+
+    return exit_1;
+}

benchmarks/Addone.c

@@ -0,0 +1,76 @@
+/* Gibbon program. */
+
+#include "gibbon_rts.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <math.h>
+#include <stdbool.h>
+#include <string.h>
+#include <time.h>
+#include <alloca.h>
+#include <sys/mman.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <uthash.h>
+
+#ifdef _WIN64
+#include <windows.h>
+#endif
+
+#ifdef _GIBBON_POINTER
+#include <gc.h>
+#endif
+
+#ifdef _GIBBON_PARALLEL
+#include <cilk/cilk.h>
+#include <cilk/cilk_api.h>
+#endif
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * Program starts here
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+
+typedef enum {
+            GibInt_T,
+            GibFloat_T,
+            GibSym_T,
+            GibBool_T,
+            GibVector_T,
+            GibList_T,
+            GibCursor_T,
+        } GibDatatype;
+void info_table_initialize(void)
+{
+    int error = gib_info_table_initialize(7);
+
+    if (error < 0) {
+        fprintf(stderr, "Couldn't initialize info table, errorno=%d", error);
+        exit(1);
+    }
+
+    GibDatatype field_tys[0];
+
+    gib_info_table_finalize();
+}
+void symbol_table_initialize(void)
+{ }
+int main(int argc, char **argv)
+{
+    int init_0 = gib_init(argc, argv);
+
+    info_table_initialize();
+    symbol_table_initialize();
+
+    int exit_1 = gib_exit();
+
+    return exit_1;
+}

benchmarks/Addtwo.c

@@ -0,0 +1,76 @@
+/* Gibbon program. */
+
+#include "gibbon_rts.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <math.h>
+#include <stdbool.h>
+#include <string.h>
+#include <time.h>
+#include <alloca.h>
+#include <sys/mman.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <uthash.h>
+
+#ifdef _WIN64
+#include <windows.h>
+#endif
+
+#ifdef _GIBBON_POINTER
+#include <gc.h>
+#endif
+
+#ifdef _GIBBON_PARALLEL
+#include <cilk/cilk.h>
+#include <cilk/cilk_api.h>
+#endif
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * Program starts here
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+
+typedef enum {
+            GibInt_T,
+            GibFloat_T,
+            GibSym_T,
+            GibBool_T,
+            GibVector_T,
+            GibList_T,
+            GibCursor_T,
+        } GibDatatype;
+void info_table_initialize(void)
+{
+    int error = gib_info_table_initialize(7);
+
+    if (error < 0) {
+        fprintf(stderr, "Couldn't initialize info table, errorno=%d", error);
+        exit(1);
+    }
+
+    GibDatatype field_tys[0];
+
+    gib_info_table_finalize();
+}
+void symbol_table_initialize(void)
+{ }
+int main(int argc, char **argv)
+{
+    int init_0 = gib_init(argc, argv);
+
+    info_table_initialize();
+    symbol_table_initialize();
+
+    int exit_1 = gib_exit();
+
+    return exit_1;
+}

gibbon-compiler/.gitignore

@@ -32,3 +32,4 @@ demo/*.c
 demo/*.exe
 gibbon-compiler/examples/parallel/data/*.txt
 *.log.hs
+*.log

gibbon-compiler/build.log

@@ -0,0 +1,8 @@
+Build profile: -w ghc-9.2.8 -O1
+In order, the following will be built (use -v for more details):
+ - gibbon-0.3 (lib) (file src/Gibbon/Language/Syntax.hs changed)
+ - gibbon-0.3 (exe:test-gibbon-examples) (dependency rebuilt)
+ - gibbon-0.3 (exe:gibbon) (dependency rebuilt)
+Preprocessing library for gibbon-0.3..
+Building library for gibbon-0.3..
+[16 of 61] Compiling Gibbon.NewL2.Syntax ( src/Gibbon/NewL2/Syntax.hs, /home/timmy/git/gibbon/dist-newstyle/build/x86_64-linux/ghc-9.2.8/gibbon-0.3/build/Gibbon/NewL2/Syntax.o, /home/timmy/git/gibbon/dist-newstyle/build/x86_64-linux/ghc-9.2.8/gibbon-0.3/build/Gibbon/NewL2/Syntax.dyn_o ) [Gibbon.Language.Syntax changed]

gibbon-compiler/compile.log

@@ -0,0 +1,7 @@
+Build profile: -w ghc-9.2.8 -O1
+In order, the following will be built (use -v for more details):
+ - gibbon-0.3 (lib) (file src/Gibbon/HaskellFrontend.hs changed)
+ - gibbon-0.3 (exe:test-gibbon-examples) (dependency rebuilt)
+ - gibbon-0.3 (exe:gibbon) (dependency rebuilt)
+Preprocessing library for gibbon-0.3..
+Building library for gibbon-0.3..

gibbon-compiler/examples/add1.hs

@@ -1,9 +1,10 @@
+module Add where
 data Tree = Leaf Int | Node Tree Tree
 
 add1 :: Tree -> Tree
 add1 t = case t of
            Leaf x     -> Leaf (x + 1)
-           Node x1 x2 -> Node (add1 x1) (add1 x2)
+           Node x1 x2 -> Node (Add.add1 x1) (Add.add1 x2)
 
-main :: Tree
-main = add1 (Node (Leaf 1) (Leaf 2))
+gibbon_main :: Tree
+gibbon_main = Add.add1 (Node (Leaf 1) (Leaf 2))

gibbon-compiler/examples/imports/AddTree.hs

@@ -0,0 +1,8 @@
+module AddTree where
+    data Tree = Node Tree Tree | Leaf Int
+
+    sum :: Tree -> Int
+    sum t =
+        case t of
+            Leaf v -> v
+            Node l r -> (sum l) + (sum r)

gibbon-compiler/examples/imports/Addone.hs

@@ -0,0 +1,15 @@
+module Addone where 
+    import AddTree
+
+    add :: Tree -> Tree
+    add t = case t of
+            Leaf x     -> Leaf (x + 1)
+            Node x1 x2 -> Node (add x1) (add x2)
+
+    sub :: Tree -> Tree
+    sub t = case t of
+            Leaf x     -> Leaf (x - 1)
+            Node x1 x2 -> Node (sub x1) (sub x2)
+
+    gibbon_main :: Tree
+    gibbon_main = add (Node (Leaf 1) (Leaf 2))

gibbon-compiler/examples/imports/Addtwo.hs

@@ -0,0 +1,15 @@
+module Addtwo where 
+    import AddTree
+
+    add :: Tree -> Tree
+    add t = case t of
+            Leaf x     -> Leaf (x + 2)
+            Node x1 x2 -> Node (add x1) (add x2)
+
+    sub :: Tree -> Tree
+    sub t = case t of
+            Leaf x     -> Leaf (x - 2)
+            Node x1 x2 -> Node (sub x1) (sub x2)
+
+    gibbon_main :: Tree
+    gibbon_main = add (Node (Leaf 1) (Leaf 2))

gibbon-compiler/examples/imports/AllThreeImportModifications.ans

@@ -0,0 +1 @@
+9

gibbon-compiler/examples/imports/AllThreeImportModifications.hs

@@ -0,0 +1,6 @@
+module AllThreeImportModifications where
+    import qualified Addtwo as T (add)
+    import qualified Addone as O (add)
+    import AddTree as Tree (sum, Node, Leaf)
+
+    gibbon_main = sum (T.add (O.add (Tree.Node (Tree.Leaf 1) (Tree.Leaf 2))))

gibbon-compiler/examples/imports/ImportAliased.ans

@@ -0,0 +1 @@
+9

gibbon-compiler/examples/imports/ImportAliased.hs

@@ -0,0 +1,6 @@
+module ImportAliased where
+    import qualified Addtwo as T
+    import qualified Addone as O
+    import AddTree as Tree
+
+    gibbon_main = sum (T.add (O.add (Tree.Node (Tree.Leaf 1) (Tree.Leaf 2))))

gibbon-compiler/examples/imports/ImportQualified.ans

@@ -0,0 +1 @@
+9

gibbon-compiler/examples/imports/ImportQualified.hs

@@ -0,0 +1,6 @@
+module ImportQualified where
+    import qualified Addtwo
+    import qualified Addone
+    import AddTree
+
+    gibbon_main = sum (Addtwo.add (Addone.add (Node (Leaf 1) (Leaf 2))))

gibbon-compiler/examples/imports/ImportQualifiedAndSpecified.ans

@@ -0,0 +1 @@
+5

gibbon-compiler/examples/imports/ImportQualifiedAndSpecified.hs

@@ -0,0 +1,6 @@
+module ImportQualifiedAndSpecified where
+    import qualified Addtwo (add)
+    import qualified Addone (sub)
+    import AddTree
+
+    gibbon_main = sum (Addtwo.add (Addone.sub (Node (Leaf 1) (Leaf 2))))

gibbon-compiler/examples/imports/ImportSpecified.ans

@@ -0,0 +1 @@
+5

gibbon-compiler/examples/imports/ImportSpecified.hs

@@ -0,0 +1,6 @@
+module ImportSpecified where
+    import Addtwo (add)
+    import Addone (sub)
+    import AddTree
+
+    gibbon_main = sum (add (sub (Node (Leaf 1) (Leaf 2))))