Merge branch 'develop' into fix/autotools

lmntal · Feb 14, 2024 · aef586b · aef586b
2 parents 12667ee + efda4f5
commit aef586b
Show file tree

Hide file tree

Showing 19 changed files with 322 additions and 437 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -33,7 +33,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - run: sudo apt -qq update
-    - run: sudo apt install -y ant re2c
+    - run: sudo apt install -y ant re2c autoconf2.69
     - run: git clone https://github.com/lmntal/lmntal-compiler.git
     - run: cd lmntal-compiler && ant && cd ..
     - run: ./autogen.sh

diff --git a/NEWS b/NEWS
@@ -1,3 +1,7 @@
+SLIM (2.6.0) -- 2023/04/03
+  * new feature
+    + compatible to CSLMNtal
+
 SLIM (2.5.0) -- 2021/04/19
   * new feature
     + add --history-management

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5.0
+2.6.0
diff --git a/autogen.sh b/autogen.sh
@@ -11,7 +11,18 @@ run ()
   fi
 }
 
+# makeshift
+autoheader=autoheader
+autoreconf=autoreconf
+autoconf --version | grep 2.69 >/dev/null
+if test $? != 0 ; then
+  echo "autoconf 2.69 is not installed."
+  echo "Trying to use autoconf2.69 instead."
+  autoheader=autoheader2.69
+  autoreconf=autoreconf2.69
+fi
+
 run aclocal
-run autoheader
+run $autoheader
 run automake --add-missing
-run autoreconf
+run $autoreconf
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@
 # $Id: configure.ac,v 1.13 2008/10/05 11:22:41 riki Exp $
 
 AC_PREREQ([2.71])
-AC_INIT([SLIM],[2.5.0],[lmntal@ueda.info.waseda.ac.jp],[slim])
+AC_INIT([SLIM], [2.6.0], [lmntal@ueda.info.waseda.ac.jp], [slim])
 # AC_REVISION($Revision: 1.13 $)
 # AC_COPYRIGHT (copyright-notice)
 AC_CANONICAL_TARGET

diff --git a/src/element/alloc.cpp b/src/element/alloc.cpp
@@ -74,6 +74,7 @@ LmnSymbolAtomRef lmn_new_atom(LmnFunctor f) {
   ap->set_functor(f);
   ap->set_id(0);
 
+  ap->record_flag = false;
   return ap;
 }
 

diff --git a/src/element/instruction.cpp b/src/element/instruction.cpp
@@ -247,12 +247,14 @@ const std::map<LmnInstruction, InstrSpec> instr_spec = {
     {INSTR_IDIV, {"idiv", {InstrVar, InstrVar, InstrVar}}},
     {INSTR_INEG, {"ineg", {InstrVar, InstrVar}}},
     {INSTR_IMOD, {"imod", {InstrVar, InstrVar, InstrVar}}},
+    {INSTR_IABS, {"iabs", {InstrVar, InstrVar, InstrVar}}},
     {INSTR_ILT, {"ilt", {InstrVar, InstrVar}}},
     {INSTR_ILE, {"ile", {InstrVar, InstrVar}}},
     {INSTR_IGT, {"igt", {InstrVar, InstrVar}}},
     {INSTR_IGE, {"ige", {InstrVar, InstrVar}}},
     {INSTR_IEQ, {"ieq", {InstrVar, InstrVar}}},
     {INSTR_INE, {"ine", {InstrVar, InstrVar}}},
+    {INSTR_INOT, {"inot", {InstrVar, InstrVar, InstrVar}}},
     {INSTR_IAND, {"iand", {InstrVar, InstrVar, InstrVar}}},
     {INSTR_IOR, {"ior", {InstrVar, InstrVar, InstrVar}}},
     {INSTR_IXOR, {"ixor", {InstrVar, InstrVar, InstrVar}}},
@@ -268,6 +270,7 @@ const std::map<LmnInstruction, InstrSpec> instr_spec = {
     {INSTR_IMULFUNC, {"imulfunc", {InstrVar, InstrVar, InstrVar}}},
     {INSTR_IDIVFUNC, {"idivfunc", {InstrVar, InstrVar, InstrVar}}},
     {INSTR_IMODFUNC, {"imodfunc", {InstrVar, InstrVar, InstrVar}}},
+    {INSTR_IABSFUNC, {"iabsfunc", {InstrVar, InstrVar, InstrVar}}},
 
     {INSTR_GETCLASS, {"getclass", {InstrVar, InstrVar}}},
     {INSTR_SUBCLASS, {"subclass", {InstrVar, InstrVar}}},

diff --git a/src/element/instruction.hpp b/src/element/instruction.hpp
@@ -190,6 +190,7 @@ enum LmnInstruction {
   INSTR_IDIV,
   INSTR_INEG,
   INSTR_IMOD,
+  INSTR_IABS,
   INSTR_INOT,
   INSTR_IAND,
   INSTR_IOR,
@@ -203,6 +204,7 @@ enum LmnInstruction {
   INSTR_IDIVFUNC,
   INSTR_INEGFUNC,
   INSTR_IMODFUNC,
+  INSTR_IABSFUNC,
   INSTR_INOTFUNC,
   INSTR_IANDFUNC,
   INSTR_IORFUNC,

diff --git a/src/loader/il_lexer.cpp.re b/src/loader/il_lexer.cpp.re
@@ -117,7 +117,7 @@ start:
     exponent = [eE][-+]?integer;
     blank = [ \t\n\r];
 
-    sstr = "'"  [^']* "'";
+    sstr = "'"  ([^']|"\\'")* "'";
     dstr = "\"" ([^"]|"\\\"")* "\"";
 
     linecomment = ("//"|"%"|"#") .* [\n];
@@ -127,7 +127,7 @@ start:
 
     '-'?digit+ {
       string s = get_token();
-      yylval->as<int>() = s.empty() ? 0 : stol(s);
+      yylval->as<long>() = s.empty() ? 0 : stol(s);
       return parser::token::INT;
     }
     '-'?integer("."integer)?exponent? {

diff --git a/src/loader/il_parser.ypp b/src/loader/il_parser.ypp
@@ -56,7 +56,7 @@ namespace c17 = slim::element;
 %lex-param {il::lexer* scanner}
 
 %define api.value.type variant
-%token <int> INT
+%token <long> INT
 %token <double> FLOAT
 %token <lmn_interned_str> ID SUBRULE_ID
 %token <LmnInstruction> INST_NAME