func/fift: bugfixes

crypto/fift/lib/Asm.fif

@@ -756,6 +756,12 @@ x{EDF9} @Defop BOOLEVAL
   { PUSHINT c3 PREPAREVAR } cond
 } dup : PREPARE : PREPAREDICT
 //
+// inline support
+{ dup sbits { @addop } {
+  dup srefs 1- abort"exactly one reference expected in inline"
+  ref@ CALLREF } cond
+} : INLINE
+//
 // throwing and handling exceptions
 { dup 6 ufits
   { <b x{F22_} s, swap 6 u, }
@@ -1047,6 +1053,7 @@ x{FFF0} @Defop SETCPX
 //
 variable @proccnt
 variable @proclist
+variable @procdict
 19 constant @procdictkeylen
 { @proclist @ cons @proclist ! } : @proclistadd
 { dup @procdictkeylen fits not abort"procedure index out of range"
@@ -1061,26 +1068,39 @@ variable @proclist
     { swap @declproc }
   cond } : DECLMETHOD
   "main" @proclistadd
-  dictnew
+  dictnew @procdict !
 } : PROGRAM{
-{ dup sbits 1000 > { s>c <b swap ref, b> <s } if } : @adj-long-proc
-{ // d i s
-  @adj-long-proc swap rot @procdictkeylen idict!+ not abort"cannot define procedure, redefined?"
-} : PROC
-{ 2dup swap @procdictkeylen idict@ abort"procedure already defined"
-  1 { -rot @normal? b> <s PROC } does @doafter<{
-} : PROC:<{
-{ 0 swap @procdictkeylen idict@ not abort"`main` procedure not defined" drop
+{ over sbits < { s>c <b swap ref, b> <s } if } : @adj-long-proc
+{ // i s l
+  @adj-long-proc swap @procdict @ @procdictkeylen
+  idict!+ not abort"cannot define procedure, redefined?"
+  @procdict !
+} : @def-proc
+{ 1000 @def-proc } : PROC
+{ 0 @def-proc } : PROCREF
+{ @procdict @ @procdictkeylen idict@ abort"procedure already defined"
+} : @fail-ifdef
+{ over @fail-ifdef
+  2 { rot @normal? rot b> <s swap @def-proc drop } does
+  null swap @doafter<{
+} : @PROC:<{
+{ 1000 @PROC:<{ } : PROC:<{
+{ 0 @PROC:<{ } : PROCREF:<{
+{ dup @procdict @ @procdictkeylen idict@
+  { nip INLINE } { CALLDICT } cond
+} dup : INLINECALL : INLINECALLDICT
+{ 0 @procdict @ @procdictkeylen idict@ not abort"`main` procedure not defined" drop
 } : @chkmaindef
-{ dup @chkmaindef
+{ @chkmaindef
   @proclist @ { dup null? not } {
     uncons swap dup find not
     { +": undefined procedure name in list" abort } if
-    execute 3 pick @procdictkeylen idict@ not
+    execute @procdict @ @procdictkeylen idict@ not
     { +": procedure declared but left undefined" abort } if
     drop (forget)
   } while
   drop @proclist null! @proccnt 0!
+  @procdict dup @ swap null!
 } : }END
 forget @proclist  forget @proccnt
 { }END <{ SETCP0 swap @procdictkeylen DICTPUSHCONST DICTIGETJMP 11 THROWARG }> } : }END>

crypto/fift/utils.cpp

@@ -43,6 +43,9 @@ td::Result<std::string> load_TonUtil_fif(std::string dir = "") {
 td::Result<std::string> load_Lists_fif(std::string dir = "") {
   return load_source("Lists.fif", dir);
 }
+td::Result<std::string> load_Lisp_fif(std::string dir = "") {
+  return load_source("Lisp.fif", dir);
+}
 
 class MemoryFileLoader : public fift::FileLoader {
  public:
@@ -91,7 +94,8 @@ class MemoryFileLoader : public fift::FileLoader {
 };
 
 td::Result<fift::SourceLookup> create_source_lookup(std::string main, bool need_preamble = true, bool need_asm = true,
-                                                    bool need_ton_util = true, std::string dir = "") {
+                                                    bool need_ton_util = true, bool need_lisp = true,
+                                                    std::string dir = "") {
   auto loader = std::make_unique<MemoryFileLoader>();
   loader->add_file("/main.fif", std::move(main));
   if (need_preamble) {
@@ -112,6 +116,10 @@ td::Result<fift::SourceLookup> create_source_lookup(std::string main, bool need_
       loader->add_file("/TonUtil.fif", std::move(f));
     }
   }
+  if (need_lisp) {
+    TRY_RESULT(f, load_Lisp_fif(dir));
+    loader->add_file("/Lisp.fif", std::move(f));
+  }
   auto res = fift::SourceLookup(std::move(loader));
   res.add_include_path("/");
   return std::move(res);
@@ -143,7 +151,7 @@ td::Result<fift::SourceLookup> run_fift(fift::SourceLookup source_lookup, std::o
 }  // namespace
 td::Result<FiftOutput> mem_run_fift(std::string source, std::vector<std::string> args, std::string fift_dir) {
   std::stringstream ss;
-  TRY_RESULT(source_lookup, create_source_lookup(source, true, true, true, fift_dir));
+  TRY_RESULT(source_lookup, create_source_lookup(source, true, true, true, true, fift_dir));
   TRY_RESULT_ASSIGN(source_lookup, run_fift(std::move(source_lookup), &ss, true, std::move(args)));
   FiftOutput res;
   res.source_lookup = std::move(source_lookup);
@@ -159,8 +167,8 @@ td::Result<FiftOutput> mem_run_fift(SourceLookup source_lookup, std::vector<std:
   return std::move(res);
 }
 td::Result<fift::SourceLookup> create_mem_source_lookup(std::string main, std::string fift_dir, bool need_preamble,
-                                                        bool need_asm, bool need_ton_util) {
-  return create_source_lookup(main, need_preamble, need_asm, need_ton_util, fift_dir);
+                                                        bool need_asm, bool need_ton_util, bool need_lisp) {
+  return create_source_lookup(main, need_preamble, need_asm, need_ton_util, need_lisp, fift_dir);
 }
 
 td::Result<td::Ref<vm::Cell>> compile_asm(td::Slice asm_code, std::string fift_dir, bool is_raw) {
@@ -168,7 +176,7 @@ td::Result<td::Ref<vm::Cell>> compile_asm(td::Slice asm_code, std::string fift_d
   TRY_RESULT(source_lookup,
              create_source_lookup(PSTRING() << "\"Asm.fif\" include\n " << (is_raw ? "<{" : "") << asm_code << "\n"
                                             << (is_raw ? "}>c" : "") << " boc>B \"res\" B>file",
-                                  true, true, true, fift_dir));
+                                  true, true, true, false, fift_dir));
   TRY_RESULT(res, run_fift(std::move(source_lookup), &ss));
   TRY_RESULT(boc, res.read_file("res"));
   return vm::std_boc_deserialize(std::move(boc.data));

crypto/fift/utils.h

@@ -28,7 +28,7 @@ struct FiftOutput {
 };
 td::Result<fift::SourceLookup> create_mem_source_lookup(std::string main, std::string fift_dir = "",
                                                         bool need_preamble = true, bool need_asm = true,
-                                                        bool need_ton_util = true);
+                                                        bool need_ton_util = true, bool need_lisp = true);
 td::Result<FiftOutput> mem_run_fift(std::string source, std::vector<std::string> args = {}, std::string fift_dir = "");
 td::Result<FiftOutput> mem_run_fift(SourceLookup source_lookup, std::vector<std::string> args);
 td::Result<td::Ref<vm::Cell>> compile_asm(td::Slice asm_code, std::string fift_dir = "", bool is_raw = true);

crypto/fift/words.cpp

@@ -2346,7 +2346,7 @@ void compile_one_literal(WordList& wlist, vm::StackEntry val) {
     auto x = std::move(val).as_int();
     if (!x->signed_fits_bits(257)) {
       throw IntError{"invalid numeric literal"};
-    } else if (x->signed_fits_bits(64)) {
+    } else if (x->signed_fits_bits(td::BigIntInfo::word_shift)) {
       wlist.push_back(Ref<StackWord>{true, std::bind(interpret_const, _1, x->to_long())});
     } else {
       wlist.push_back(Ref<StackWord>{true, std::bind(interpret_big_const, _1, std::move(x))});