Commit 87c46d4ddd6945afb58c7721a3dcb1c39837828c
2024-04-02T10:17:38
wip defoperator
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131
diff --git a/.ic3_history b/.ic3_history
index 479953d..bebc422 100644
--- a/.ic3_history
+++ b/.ic3_history
@@ -1,23 +1,3 @@
- quote do
- x = unquote(x)
- {x, x}
- end
-end
-dt(200)
-dt(a)
-a = [1, 2, 3]
-dt(a)
-def dt = macro (x) do
- quote do
- x = ^ unquote(x)
- {x, x}
- end
-end
-dt(a)
-1 + 10000000000000000000000000000000000000000000
-def beaucoup = 1 + 10000000000000000000000000000000000000000000
-type(beaucoup)
-def beaucoup = 1 + 10000000000000000000000000000000000000000000
type(beaucoup)
beaucoup
def beaucoup = (U8) beaucoup
@@ -97,3 +77,23 @@ defmodule Plop do end
defmodule Plop do def a = 1 end
quote_cfn Plop
defmodule Plop do def a = 1 end
+Plop.a
+defmodule Plop do def a = 1 end
+Plop.a
+Plop
+defmodule Plop do def a = 1 end
+Plop.a
+defmodule Plop do def a = 1 end
+Plop.a
+defmodule Plop do defoperator :operator_add :+ cfn Tag "tag_add" (Tag, Tag, Result) 10 :left end
+defmodule Plop do defoperator :operator_add :+ cfn Tag "tag_mul" (Tag, Tag, Result) 10 :left end
+defmodule Plop do
+ defoperator :operator_add :+ cfn Tag "tag_mul" (Tag, Tag, Result) 10 :left
+ def sq = fn (x) { x + x }
+end
+Plop.sq(4)
+defmodule Plop do defoperator :operator_add :+ cfn Tag "tag_mul" (Tag, Tag, Result) 10 :left end
+defmodule Plop do
+ def sq = fn (x) { x + x }
+end
+Plop.sq(4)
diff --git a/ic3/.ic3_history b/ic3/.ic3_history
index 16965a7..be20bb9 100644
--- a/ic3/.ic3_history
+++ b/ic3/.ic3_history
@@ -1,18 +1,3 @@
-dt(a)
-def dt = macro (x) do
- quote do
- x = ^ unquote(x)
- {x, x}
- end
-end
-dt(a)
-1 + 10000000000000000000000000000000000000000000
-def beaucoup = 1 + 10000000000000000000000000000000000000000000
-type(beaucoup)
-def beaucoup = 1 + 10000000000000000000000000000000000000000000
-type(beaucoup)
-beaucoup
-def beaucoup = (U8) beaucoup
type(beaucoup)
beacoup
beaucoup
@@ -97,3 +82,18 @@ defmodule Plop do def a = 1 end
Plop.a
defmodule Plop do def a = 1 end
Plop.a
+defmodule Plop do defoperator :operator_add :+ cfn Tag "tag_add" (Tag, Tag, Result) 10 :left end
+defmodule Plop do defoperator :operator_add :+ cfn Tag "tag_mul" (Tag, Tag, Result) 10 :left end
+defmodule Plop do
+ defoperator :operator_add :+ cfn Tag "tag_mul" (Tag, Tag, Result) 10 :left
+ def sq = fn (x) { x + x }
+end
+Plop.sq(4)
+defmodule Plop do defoperator :operator_add :+ cfn Tag "tag_mul" (Tag, Tag, Result) 10 :left end
+defmodule Plop do
+ def sq = fn (x) { x + x }
+end
+Plop.sq(4)
+defmodule Plop do defoperator :operator_add :+ cfn Tag "tag_mul" (Tag, Tag, Result) 10 :left end
+defmodule Plop do def sq = fn (x) { x + x } end
+Plop.sq(4)
diff --git a/libc3/env.c b/libc3/env.c
index fa3bada..c5517f4 100644
--- a/libc3/env.c
+++ b/libc3/env.c
@@ -128,12 +128,11 @@ s_tag * env_defmodule (s_env *env, const s_sym **name,
tag_init_sym(&tag_module, &g_sym_module);
tag_init_sym(&tag_module_name, *name);
if (facts_add_tags(&env->facts, &tag_module_name, &tag_is_a,
- &tag_module)) {
- if (env_eval_block(env, block, &tmp)) {
- tag_clean(&tmp);
- tag_init_sym(dest, *name);
- result = dest;
- }
+ &tag_module) &&
+ env_eval_block(env, block, &tmp)) {
+ tag_clean(&tmp);
+ tag_init_sym(dest, *name);
+ result = dest;
}
env->current_module = module;
env_module_is_loading_set(env, *name, false);
@@ -187,6 +186,14 @@ s_tag * env_defoperator (s_env *env, const s_sym **name,
*operator_associativity);
facts_add_tags(&env->facts, &tag_module_name, &tag_operator,
&tag_ident);
+ facts_add_tags(&env->facts, &tag_ident, &tag_is_a, &tag_operator);
+ facts_add_tags(&env->facts, &tag_ident, &tag_symbol, &tag_sym);
+ facts_add_tags(&env->facts, &tag_ident, &tag_arity_sym, &tag_arity_u8);
+ facts_add_tags(&env->facts, &tag_ident, &tag_symbol_value, symbol_value);
+ facts_add_tags(&env->facts, &tag_ident, &tag_operator_precedence_sym,
+ &tag_operator_precedence_u8);
+ facts_add_tags(&env->facts, &tag_ident, &tag_operator_associativity_rel,
+ &tag_operator_associativity_value);
*dest = tag_ident;
return dest;
}