summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2019-10-09 15:19:33 +0200
committernsensfel <SpamShield0@noot-noot.org>2019-10-09 15:19:33 +0200
commit1c068ee5c16b300261b3a54cfe8e0c49e36fb7ae (patch)
tree1ceb8b0c2cc2eb1af057b6f9a6a9f596cb6fc41e
parent5172e8d4a9fe225e0b867366f9524f51ad19c069 (diff)
downloadataxia-1c068ee5c16b300261b3a54cfe8e0c49e36fb7ae.zip
ataxia-1c068ee5c16b300261b3a54cfe8e0c49e36fb7ae.tar.bz2
...
-rw-r--r--Makefile4
-rw-r--r--include/ataxia/ataxic.hrl38
2 files changed, 21 insertions, 21 deletions
diff --git a/Makefile b/Makefile
index f4c728d..143d114 100644
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,10 @@ ERL_NAME_VS_SNAME ?= -sname
## Binaries
ERLC ?= erlc
-ERLC_OPTS ?=
+ERLC_OPTS ?= -I $(INCLUDE_DIR)
DIALYZER ?= dialyzer
-DIALYZER_OPTS ?=
+DIALYZER_OPTS ?= -I $(INCLUDE_DIR)
M4 ?= m4
M4_OPTS ?=
diff --git a/include/ataxia/ataxic.hrl b/include/ataxia/ataxic.hrl
index cea5819..6e6f34b 100644
--- a/include/ataxia/ataxic.hrl
+++ b/include/ataxia/ataxic.hrl
@@ -1,9 +1,9 @@
%%%% Select
--record(field, {ix :: non_neg_integer(), op :: basic()}).
--record(upfield, {ix :: non_neg_integer(), op :: basic()}).
+-record(field, {ix :: non_neg_integer(), op :: ataxic:basic()}).
+-record(upfield, {ix :: non_neg_integer(), op :: ataxic:basic()}).
%%%% Sequence of instructions
--record(seq, {ops :: list(basic())}).
+-record(seq, {ops :: list(ataxic:basic())}).
%%%% Values Access
-record(const, {value :: any()}).
@@ -12,7 +12,7 @@
% Possible improvement: add support for some sort of registers.
% This would add a dict (no need for orddict here) when evaluating Ataxic
% expressions, with the following functions:
-% -record(reg_store, {name :: binary(), op :: basic()}).
+% -record(reg_store, {name :: binary(), op :: ataxic:basic()}).
% -record(reg_load, {name :: binary()}).
% It's kind of weird to use though, cause you can't retrieve what you've stored
% at a node that was deeper in the query's tree. It can be used to move values
@@ -25,29 +25,29 @@
{
module :: atom(),
function :: atom(),
- params :: list(basic())
+ params :: list(ataxic:basic())
}
).
%%%% Number Comparison
--record(gt, {p0 :: basic(), p1 :: basic()}).
--record(ge, {p0 :: basic(), p1 :: basic()}).
--record(lt, {p0 :: basic(), p1 :: basic()}).
--record(le, {p0 :: basic(), p1 :: basic()}).
--record(eq, {p0 :: basic(), p1 :: basic()}).
+-record(gt, {p0 :: ataxic:basic(), p1 :: ataxic:basic()}).
+-record(ge, {p0 :: ataxic:basic(), p1 :: ataxic:basic()}).
+-record(lt, {p0 :: ataxic:basic(), p1 :: ataxic:basic()}).
+-record(le, {p0 :: ataxic:basic(), p1 :: ataxic:basic()}).
+-record(eq, {p0 :: ataxic:basic(), p1 :: ataxic:basic()}).
%%%% Bool Operations
--record(land, {params :: list(basic())}).
--record(lor, {params :: list(basic())}).
--record(neg, {param :: basic()}).
+-record(land, {params :: list(ataxic:basic())}).
+-record(lor, {params :: list(ataxic:basic())}).
+-record(neg, {param :: ataxic:basic()}).
--record(list_cons, {param :: basic()}).
+-record(list_cons, {param :: ataxic:basic()}).
%%%% META OP %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% Select
--record(read_perm, {op :: basic()}).
--record(write_perm, {op :: basic()}).
--record(lock, {op :: basic()}).
--record(value, {op :: basic()}).
+-record(read_perm, {op :: ataxic:basic()}).
+-record(write_perm, {op :: ataxic:basic()}).
+-record(lock, {op :: ataxic:basic()}).
+-record(value, {op :: ataxic:basic()}).
--record(mseq, {ops :: list(meta())}).
+-record(mseq, {ops :: list(ataxic:meta())}).