update for TON

Author: Fabrice Le Fessant

src/solidity-alcotest/version.mlt

@@ -14,16 +14,6 @@ let query cmd =
 let commit_hash = query "git show -s --pretty=format:%H"
 let commit_date = query "git show -s --pretty=format:%ci"
 let version = "0.3.6"
-let version =
-  match commit_hash with
-  | Some commit_hash ->
-    let commit_hash =
-      if String.length commit_hash > 8 then
-        String.sub commit_hash 0 8
-      else commit_hash
-    in
-    Printf.sprintf "%s-%s" version commit_hash
-  | None -> version
 
 let string_option = function
   | None -> "None"

src/solidity-common/solidity_common.ml

@@ -523,7 +523,7 @@ let add_primitive id p =
   begin
     match prim_by_id.(id) with
     | None -> prim_by_id.(id) <- Some p;
-    | Some _ -> error "Primitive id already defined"
+    | Some _ -> error "Primitive id %d already defined" id
   end;
   begin
     match prim_of_ident (Ident.of_string p.prim_name) with

src/solidity-common/version.mlt

@@ -14,16 +14,6 @@ let query cmd =
 let commit_hash = query "git show -s --pretty=format:%H"
 let commit_date = query "git show -s --pretty=format:%ci"
 let version = "0.3.6"
-let version =
-  match commit_hash with
-  | Some commit_hash ->
-    let commit_hash =
-      if String.length commit_hash > 8 then
-        String.sub commit_hash 0 8
-      else commit_hash
-    in
-    Printf.sprintf "%s-%s" version commit_hash
-  | None -> version
 
 let string_option = function
   | None -> "None"

src/solidity-parser/solidity_lexer.mli

@@ -11,6 +11,7 @@
 (**************************************************************************)
 
 val init : freeton:bool -> unit
+val init2 : ?list:(string * Solidity_raw_parser.token) list -> unit -> unit
 
 val reset : unit -> unit
 

src/solidity-parser/solidity_lexer.mll

@@ -236,12 +236,12 @@ and end_pragma = parse
 
  {
    let initialized = ref false
-let init ~freeton =
+let init2 ?(list=[]) () =
   if not !initialized then begin
     initialized := true;
     List.iter (fun (kwd, token) ->
         add_keyword kwd token
-      ) [ "import", IMPORT;
+      ) ( [ "import", IMPORT;
           "as", AS;
           "from", FROM;
           "abstract", ABSTRACT;
@@ -312,18 +312,23 @@ let init ~freeton =
           "days", NUMBERUNIT (Days);
           "weeks", NUMBERUNIT (Weeks);
           "years", NUMBERUNIT (Years);
-        ];
-if freeton then
-    List.iter (fun (kwd, token) ->
-        add_keyword kwd token
-      ) [
+        ] @ list)
+  end
+
+let init ~freeton =
+  if freeton then
+    init2 () ~list:[
         "inline", INLINE;
         "static", STATIC;
         "optional", OPTIONAL;
         "onBounce", ONBOUNCE;
         "repeat", REPEAT;
         "responsible", RESPONSIBLE;
 
+        "TvmCell", TYPEABSTRACT "TvmCell";
+        "TvmSlice", TYPEABSTRACT "TvmSlice";
+        "TvmBuilder", TYPEABSTRACT "TvmBuilder";
+
         "nano", NUMBERUNIT (Nanoton);
         "nanoton", NUMBERUNIT (Nanoton);
         "nTon", NUMBERUNIT (Nanoton);
@@ -367,7 +372,8 @@ if freeton then
 
         "gigaever", NUMBERUNIT (Gigaever);
         "GEver", NUMBERUNIT (Gigaever);
-      ];
-      ()
-  end
+      ]
+  else
+    init2 ()
+
 }

src/solidity-parser/solidity_raw_parser.mly

@@ -201,13 +201,13 @@
     | AmbiguousIdentifier l ->
        begin
          match List.map (fun id -> id.contents) l with
-         | [ id ] when !for_freeton
+(*         | [ id ] when !for_freeton
                        && ( match Ident.to_string id with
                             | "TvmCell"
                             | "TvmBuilder"
                             | "TvmSlice"-> true
                             | _ -> false ) ->
-            ElementaryType ( TypeAbstract ( Ident.to_string id ) )
+            ElementaryType ( TypeAbstract ( Ident.to_string id ) ) *)
          | list ->
             let contents =
               LongIdent.of_ident_list_rel list in
@@ -266,6 +266,7 @@
 %token OPTIONAL (* freeton *)
 %token ONBOUNCE (* freeton *)
 %token REPEAT  (* freeton *)
+%token <string> TYPEABSTRACT
 %token PRIVATE
 %token EXTERNAL
 %token INTERNAL
@@ -977,6 +978,7 @@ elementary_type_name:
   | BYTES                      { TypeBytes ($1) }
   | BYTE                       { TypeBytes (Some 1) }
   | BOOL                       { TypeBool }
+  | TYPEABSTRACT               { TypeAbstract $1 }
   | INT                        { TypeInt (Option.value ~default:256 $1) }
   | UINT                       { TypeUint (Option.value ~default:256 $1) }
   | FIXED

src/solidity-parser/version.mlt

@@ -14,16 +14,6 @@ let query cmd =
 let commit_hash = query "git show -s --pretty=format:%H"
 let commit_date = query "git show -s --pretty=format:%ci"
 let version = "0.3.6"
-let version =
-  match commit_hash with
-  | Some commit_hash ->
-    let commit_hash =
-      if String.length commit_hash > 8 then
-        String.sub commit_hash 0 8
-      else commit_hash
-    in
-    Printf.sprintf "%s-%s" version commit_hash
-  | None -> version
 
 let string_option = function
   | None -> "None"

src/solidity-test/version.mlt

@@ -14,16 +14,6 @@ let query cmd =
 let commit_hash = query "git show -s --pretty=format:%H"
 let commit_date = query "git show -s --pretty=format:%ci"
 let version = "0.3.6"
-let version =
-  match commit_hash with
-  | Some commit_hash ->
-    let commit_hash =
-      if String.length commit_hash > 8 then
-        String.sub commit_hash 0 8
-      else commit_hash
-    in
-    Printf.sprintf "%s-%s" version commit_hash
-  | None -> version
 
 let string_option = function
   | None -> "None"

src/solidity-typechecker/solidity_tenv.ml

@@ -64,8 +64,11 @@ let is_visible lookup visibility ~origin ~variable =
   | LStatic (Contract, false) ->
       false
   | LStatic (Contract, true) ->
-      is_statically_visible visibility ~library:false &&
-        not (is_inherited origin)
+      (* Fabrice: I set ~library:true for a freeton contract in
+         tvm.functionId(D4Auct) *)
+      let a = is_statically_visible visibility ~library:true in
+      let b = not (is_inherited origin) in
+      a && b
   | LStatic (Library, false) ->
       is_statically_visible visibility ~library:true
   | LStatic (Library, true) -> (* i.e. call from the library itself *)

src/solidity-typechecker/solidity_typechecker.ml

@@ -119,6 +119,7 @@ let unop_type pos op t : type_ =
      TEnum _ | TStruct _ | TContract _ |
      TArray _ | TFunction _), UDelete ->
       TTuple []
+  | (TMapping _), UDelete when !for_freeton -> TTuple []
   | _, UDelete ->
       error_incompat ()
   | _, (UMinus | UNot | UInc | UDec) ->
@@ -1838,7 +1839,7 @@ let preprocess_contract_definitions cd =
             begin
               if is_none fd.fun_body then
                 error pos "Constructor must be implemented if declared";
-              if fd.fun_virtual then
+              if not !for_freeton && fd.fun_virtual then
                 error pos "Constructors cannot be virtual";
               if not !for_freeton &&
                  ( is_private || is_external ) then