solc-typed-ast 10.2.0 → 10.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ast/implementation/declaration/contract_definition.js +1 -1
- package/dist/ast/implementation/declaration/contract_definition.js.map +1 -1
- package/dist/ast/implementation/declaration/error_definition.d.ts +4 -0
- package/dist/ast/implementation/declaration/error_definition.d.ts.map +1 -1
- package/dist/ast/implementation/declaration/error_definition.js +4 -0
- package/dist/ast/implementation/declaration/error_definition.js.map +1 -1
- package/dist/ast/implementation/declaration/event_definition.d.ts +4 -0
- package/dist/ast/implementation/declaration/event_definition.d.ts.map +1 -1
- package/dist/ast/implementation/declaration/event_definition.js +4 -0
- package/dist/ast/implementation/declaration/event_definition.js.map +1 -1
- package/dist/ast/implementation/declaration/function_definition.d.ts +4 -0
- package/dist/ast/implementation/declaration/function_definition.d.ts.map +1 -1
- package/dist/ast/implementation/declaration/function_definition.js +4 -0
- package/dist/ast/implementation/declaration/function_definition.js.map +1 -1
- package/dist/ast/implementation/declaration/modifier_definition.d.ts +4 -0
- package/dist/ast/implementation/declaration/modifier_definition.d.ts.map +1 -1
- package/dist/ast/implementation/declaration/modifier_definition.js +4 -0
- package/dist/ast/implementation/declaration/modifier_definition.js.map +1 -1
- package/dist/ast/implementation/declaration/variable_declaration.d.ts +11 -0
- package/dist/ast/implementation/declaration/variable_declaration.d.ts.map +1 -1
- package/dist/ast/implementation/declaration/variable_declaration.js +11 -0
- package/dist/ast/implementation/declaration/variable_declaration.js.map +1 -1
- package/dist/ast/implementation/expression/function_call.d.ts +4 -0
- package/dist/ast/implementation/expression/function_call.d.ts.map +1 -1
- package/dist/ast/implementation/expression/function_call.js +4 -0
- package/dist/ast/implementation/expression/function_call.js.map +1 -1
- package/dist/misc/utils.d.ts +1 -0
- package/dist/misc/utils.d.ts.map +1 -1
- package/dist/misc/utils.js +10 -1
- package/dist/misc/utils.js.map +1 -1
- package/dist/types/ast/function_type.d.ts +7 -1
- package/dist/types/ast/function_type.d.ts.map +1 -1
- package/dist/types/ast/function_type.js +2 -1
- package/dist/types/ast/function_type.js.map +1 -1
- package/dist/types/ast/int_type.js +2 -2
- package/dist/types/ast/int_type.js.map +1 -1
- package/dist/types/ast/internal/function_set.d.ts +5 -2
- package/dist/types/ast/internal/function_set.d.ts.map +1 -1
- package/dist/types/ast/internal/function_set.js +4 -4
- package/dist/types/ast/internal/function_set.js.map +1 -1
- package/dist/types/ast/internal/inaccessible_dynamic_type.d.ts +10 -0
- package/dist/types/ast/internal/inaccessible_dynamic_type.d.ts.map +1 -0
- package/dist/types/ast/internal/inaccessible_dynamic_type.js +16 -0
- package/dist/types/ast/internal/inaccessible_dynamic_type.js.map +1 -0
- package/dist/types/ast/internal/index.d.ts +1 -0
- package/dist/types/ast/internal/index.d.ts.map +1 -1
- package/dist/types/ast/internal/index.js +1 -0
- package/dist/types/ast/internal/index.js.map +1 -1
- package/dist/types/ast/string_literal.d.ts +1 -2
- package/dist/types/ast/string_literal.d.ts.map +1 -1
- package/dist/types/ast/string_literal.js +3 -4
- package/dist/types/ast/string_literal.js.map +1 -1
- package/dist/types/builtins.d.ts.map +1 -1
- package/dist/types/builtins.js +2 -1
- package/dist/types/builtins.js.map +1 -1
- package/dist/types/eval_const.d.ts.map +1 -1
- package/dist/types/eval_const.js +22 -15
- package/dist/types/eval_const.js.map +1 -1
- package/dist/types/infer.d.ts +34 -18
- package/dist/types/infer.d.ts.map +1 -1
- package/dist/types/infer.js +389 -115
- package/dist/types/infer.js.map +1 -1
- package/dist/types/polymorphic.d.ts +2 -2
- package/dist/types/polymorphic.d.ts.map +1 -1
- package/dist/types/polymorphic.js +23 -18
- package/dist/types/polymorphic.js.map +1 -1
- package/dist/types/reserved.d.ts +1 -0
- package/dist/types/reserved.d.ts.map +1 -1
- package/dist/types/reserved.js +1 -0
- package/dist/types/reserved.js.map +1 -1
- package/dist/types/typeStrings/typeString_parser.d.ts +4 -0
- package/dist/types/typeStrings/typeString_parser.d.ts.map +1 -1
- package/dist/types/typeStrings/typeString_parser.js +312 -268
- package/dist/types/typeStrings/typeString_parser.js.map +1 -1
- package/dist/types/typeStrings/typeString_parser_header.d.ts +4 -0
- package/dist/types/typeStrings/typeString_parser_header.d.ts.map +1 -1
- package/dist/types/typeStrings/typeString_parser_header.js +19 -10
- package/dist/types/typeStrings/typeString_parser_header.js.map +1 -1
- package/dist/types/utils.d.ts +10 -4
- package/dist/types/utils.d.ts.map +1 -1
- package/dist/types/utils.js +112 -29
- package/dist/types/utils.js.map +1 -1
- package/package.json +14 -14
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function_set.js","sourceRoot":"","sources":["../../../../src/types/ast/internal/function_set.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"function_set.js","sourceRoot":"","sources":["../../../../src/types/ast/internal/function_set.ts"],"names":[],"mappings":";;;AAEA,8CAA0C;AAE1C,kCAAmC;AAInC,+EAA+E;AAC/E,cAAc;AACd,MAAa,mBAEX,SAAQ,eAAQ;IAGd,YAAY,IAAS,EAAE,GAAW;QAC9B,KAAK,CAAC,GAAG,CAAC,CAAC;QAEX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,EAAE;QACE,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,sBAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC;QACjF,OAAO,GAAG,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC3E,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;CACJ;AAnBD,kDAmBC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { TypeNode } from "../type";
|
|
2
|
+
/**
|
|
3
|
+
* Place-holder type used only by the typestring parser for
|
|
4
|
+
* cases when the typestring contains "inaccessible dynamic type".
|
|
5
|
+
* @todo move under test/ along with typestring parser
|
|
6
|
+
*/
|
|
7
|
+
export declare class InaccessibleDynamicType extends TypeNode {
|
|
8
|
+
pp(): string;
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=inaccessible_dynamic_type.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inaccessible_dynamic_type.d.ts","sourceRoot":"","sources":["../../../../src/types/ast/internal/inaccessible_dynamic_type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC;;;;GAIG;AACH,qBAAa,uBAAwB,SAAQ,QAAQ;IACjD,EAAE,IAAI,MAAM;CAGf"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.InaccessibleDynamicType = void 0;
|
|
4
|
+
const type_1 = require("../type");
|
|
5
|
+
/**
|
|
6
|
+
* Place-holder type used only by the typestring parser for
|
|
7
|
+
* cases when the typestring contains "inaccessible dynamic type".
|
|
8
|
+
* @todo move under test/ along with typestring parser
|
|
9
|
+
*/
|
|
10
|
+
class InaccessibleDynamicType extends type_1.TypeNode {
|
|
11
|
+
pp() {
|
|
12
|
+
return "inaccessible_dynamic_type";
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
exports.InaccessibleDynamicType = InaccessibleDynamicType;
|
|
16
|
+
//# sourceMappingURL=inaccessible_dynamic_type.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inaccessible_dynamic_type.js","sourceRoot":"","sources":["../../../../src/types/ast/internal/inaccessible_dynamic_type.ts"],"names":[],"mappings":";;;AAAA,kCAAmC;AAEnC;;;;GAIG;AACH,MAAa,uBAAwB,SAAQ,eAAQ;IACjD,EAAE;QACE,OAAO,2BAA2B,CAAC;IACvC,CAAC;CACJ;AAJD,0DAIC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/types/ast/internal/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/types/ast/internal/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,YAAY,CAAC"}
|
|
@@ -15,5 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./function_set"), exports);
|
|
18
|
+
__exportStar(require("./inaccessible_dynamic_type"), exports);
|
|
18
19
|
__exportStar(require("./type_var"), exports);
|
|
19
20
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/types/ast/internal/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,6CAA2B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/types/ast/internal/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,8DAA4C;AAC5C,6CAA2B"}
|
|
@@ -2,9 +2,8 @@ import { Range } from "../../misc";
|
|
|
2
2
|
import { TypeNode } from "./type";
|
|
3
3
|
export declare type StringLiteralKind = "string" | "unicodeString" | "hexString";
|
|
4
4
|
export declare class StringLiteralType extends TypeNode {
|
|
5
|
-
readonly literal: string;
|
|
6
5
|
readonly kind: StringLiteralKind;
|
|
7
|
-
constructor(
|
|
6
|
+
constructor(kind: StringLiteralKind, src?: Range);
|
|
8
7
|
get isHex(): boolean;
|
|
9
8
|
pp(): string;
|
|
10
9
|
getFields(): any[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string_literal.d.ts","sourceRoot":"","sources":["../../../src/types/ast/string_literal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,oBAAY,iBAAiB,GAAG,QAAQ,GAAG,eAAe,GAAG,WAAW,CAAC;AAEzE,qBAAa,iBAAkB,SAAQ,QAAQ;
|
|
1
|
+
{"version":3,"file":"string_literal.d.ts","sourceRoot":"","sources":["../../../src/types/ast/string_literal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,oBAAY,iBAAiB,GAAG,QAAQ,GAAG,eAAe,GAAG,WAAW,CAAC;AAEzE,qBAAa,iBAAkB,SAAQ,QAAQ;IAC3C,SAAgB,IAAI,EAAE,iBAAiB,CAAC;gBAE5B,IAAI,EAAE,iBAAiB,EAAE,GAAG,CAAC,EAAE,KAAK;IAMhD,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED,EAAE,IAAI,MAAM;IAIZ,SAAS,IAAI,GAAG,EAAE;CAGrB"}
|
|
@@ -3,19 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.StringLiteralType = void 0;
|
|
4
4
|
const type_1 = require("./type");
|
|
5
5
|
class StringLiteralType extends type_1.TypeNode {
|
|
6
|
-
constructor(
|
|
6
|
+
constructor(kind, src) {
|
|
7
7
|
super(src);
|
|
8
|
-
this.literal = literal;
|
|
9
8
|
this.kind = kind;
|
|
10
9
|
}
|
|
11
10
|
get isHex() {
|
|
12
11
|
return this.kind === "hexString";
|
|
13
12
|
}
|
|
14
13
|
pp() {
|
|
15
|
-
return
|
|
14
|
+
return this.isHex ? `literal_hex_string` : `literal_string`;
|
|
16
15
|
}
|
|
17
16
|
getFields() {
|
|
18
|
-
return [this.
|
|
17
|
+
return [this.kind];
|
|
19
18
|
}
|
|
20
19
|
}
|
|
21
20
|
exports.StringLiteralType = StringLiteralType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string_literal.js","sourceRoot":"","sources":["../../../src/types/ast/string_literal.ts"],"names":[],"mappings":";;;AACA,iCAAkC;AAIlC,MAAa,iBAAkB,SAAQ,eAAQ;
|
|
1
|
+
{"version":3,"file":"string_literal.js","sourceRoot":"","sources":["../../../src/types/ast/string_literal.ts"],"names":[],"mappings":";;;AACA,iCAAkC;AAIlC,MAAa,iBAAkB,SAAQ,eAAQ;IAG3C,YAAY,IAAuB,EAAE,GAAW;QAC5C,KAAK,CAAC,GAAG,CAAC,CAAC;QAEX,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC;IACrC,CAAC;IAED,EAAE;QACE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAChE,CAAC;IAED,SAAS;QACL,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;CACJ;AApBD,8CAoBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builtins.d.ts","sourceRoot":"","sources":["../../src/types/builtins.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,mBAAmB,EACnB,iBAAiB,EAKjB,QAAQ,EACX,MAAM,OAAO,CAAC;AAGf,oBAAY,oBAAoB,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAEtD;;GAEG;AACH,eAAO,MAAM,OAAO,qBAYnB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"builtins.d.ts","sourceRoot":"","sources":["../../src/types/builtins.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,mBAAmB,EACnB,iBAAiB,EAKjB,QAAQ,EACX,MAAM,OAAO,CAAC;AAGf,oBAAY,oBAAoB,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAEtD;;GAEG;AACH,eAAO,MAAM,OAAO,qBAYnB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,qBAcxB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,qBAczB,CAAC;AAEF,eAAO,MAAM,GAAG,mBA0Df,CAAC;AAEF,eAAO,MAAM,GAAG,mBAgBf,CAAC;AAEF,eAAO,MAAM,KAAK,mBAqBjB,CAAC;AAEF,eAAO,MAAM,EAAE,mBAad,CAAC;AAyDF,eAAO,MAAM,eAAe,mBAG3B,CAAC;AAEF,eAAO,MAAM,iBAAiB,mBAG7B,CAAC;AAEF,eAAO,MAAM,wBAAwB,mBAGpC,CAAC;AAEF,eAAO,MAAM,cAAc,mBAmI1B,CAAC"}
|
package/dist/types/builtins.js
CHANGED
|
@@ -19,7 +19,8 @@ exports.typeContract = new ast_1.BuiltinFunctionType("type", [new ast_1.TypeName
|
|
|
19
19
|
new ast_1.BuiltinStructType("typeContract", new Map([
|
|
20
20
|
["name", [[reserved_1.types.stringMemory, ">=0.5.5"]]],
|
|
21
21
|
["creationCode", [[reserved_1.types.bytesMemory, ">=0.5.3"]]],
|
|
22
|
-
["runtimeCode", [[reserved_1.types.bytesMemory, ">=0.5.3"]]]
|
|
22
|
+
["runtimeCode", [[reserved_1.types.bytesMemory, ">=0.5.3"]]],
|
|
23
|
+
["interfaceId", [[reserved_1.types.bytes4, ">=0.6.7"]]]
|
|
23
24
|
]))
|
|
24
25
|
]);
|
|
25
26
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builtins.js","sourceRoot":"","sources":["../../src/types/builtins.ts"],"names":[],"mappings":";;;AAAA,+BASe;AACf,yCAAmC;AAInC;;GAEG;AACU,QAAA,OAAO,GAAG,IAAI,yBAAmB,CAC1C,MAAM,EACN,CAAC,IAAI,kBAAY,CAAC,IAAI,UAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EACjC;IACI,IAAI,uBAAiB,CACjB,SAAS,EACT,IAAI,GAAG,CAAC;QACJ,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,UAAI,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;QACrC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,UAAI,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;KACxC,CAAC,CACL;CACJ,CACJ,CAAC;AAEF;;GAEG;AACU,QAAA,YAAY,GAAG,IAAI,yBAAmB,CAC/C,MAAM,EACN,CAAC,IAAI,kBAAY,CAAC,IAAI,UAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EACjC;IACI,IAAI,uBAAiB,CACjB,cAAc,EACd,IAAI,GAAG,CAAC;QACJ,CAAC,MAAM,EAAE,CAAC,CAAC,gBAAK,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC;QAC3C,CAAC,cAAc,EAAE,CAAC,CAAC,gBAAK,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;QAClD,CAAC,aAAa,EAAE,CAAC,CAAC,gBAAK,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"builtins.js","sourceRoot":"","sources":["../../src/types/builtins.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eval_const.d.ts","sourceRoot":"","sources":["../../src/types/eval_const.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAGH,UAAU,EASb,MAAM,QAAQ,CAAC;AAWhB,oBAAY,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;AAExD,qBAAa,SAAU,SAAQ,KAAK;IAChC,IAAI,EAAE,UAAU,CAAC;gBAEL,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM;CAKzC;AAED,qBAAa,0BAA2B,SAAQ,SAAS;gBACzC,CAAC,EAAE,UAAU;CAG5B;
|
|
1
|
+
{"version":3,"file":"eval_const.d.ts","sourceRoot":"","sources":["../../src/types/eval_const.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAGH,UAAU,EASb,MAAM,QAAQ,CAAC;AAWhB,oBAAY,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;AAExD,qBAAa,SAAU,SAAQ,KAAK;IAChC,IAAI,EAAE,UAAU,CAAC;gBAEL,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM;CAKzC;AAED,qBAAa,0BAA2B,SAAQ,SAAS;gBACzC,CAAC,EAAE,UAAU;CAG5B;AAcD,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CA6DpD;AAkPD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,UAAU,GAAG,KAAK,CA+CxD"}
|
package/dist/types/eval_const.js
CHANGED
|
@@ -28,6 +28,15 @@ class NonConstantExpressionError extends EvalError {
|
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
exports.NonConstantExpressionError = NonConstantExpressionError;
|
|
31
|
+
function promoteToDec(v) {
|
|
32
|
+
if (!(typeof v === "bigint" || v instanceof decimal_js_1.default)) {
|
|
33
|
+
throw new Error(`Expected number not ${v}`);
|
|
34
|
+
}
|
|
35
|
+
return v instanceof decimal_js_1.default ? v : new decimal_js_1.default(v.toString());
|
|
36
|
+
}
|
|
37
|
+
function demoteFromDec(d) {
|
|
38
|
+
return d.isInt() ? BigInt(d.toFixed()) : d;
|
|
39
|
+
}
|
|
31
40
|
function isConstant(expr) {
|
|
32
41
|
if (expr instanceof ast_1.Literal) {
|
|
33
42
|
return true;
|
|
@@ -84,16 +93,16 @@ function evalLiteral(expr) {
|
|
|
84
93
|
return expr.hexValue;
|
|
85
94
|
}
|
|
86
95
|
if (expr.kind === ast_1.LiteralKind.Number) {
|
|
87
|
-
const dec = new decimal_js_1.default(expr.value.
|
|
88
|
-
|
|
96
|
+
const dec = new decimal_js_1.default(expr.value.replaceAll("_", ""));
|
|
97
|
+
const val = dec.isInteger() ? BigInt(dec.toFixed()) : dec;
|
|
89
98
|
if (expr.subdenomination !== undefined) {
|
|
90
99
|
if (infer_1.subdenominationMultipliers[expr.subdenomination] === undefined) {
|
|
91
100
|
throw new EvalError(expr, `Unknown denomination ${expr.subdenomination}`);
|
|
92
101
|
}
|
|
93
|
-
val
|
|
94
|
-
val
|
|
95
|
-
|
|
96
|
-
|
|
102
|
+
if (val instanceof decimal_js_1.default) {
|
|
103
|
+
return demoteFromDec(val.times(infer_1.subdenominationMultipliers[expr.subdenomination]));
|
|
104
|
+
}
|
|
105
|
+
return val * BigInt(infer_1.subdenominationMultipliers[expr.subdenomination].toFixed());
|
|
97
106
|
}
|
|
98
107
|
return val;
|
|
99
108
|
}
|
|
@@ -143,15 +152,6 @@ function evalBinaryLogic(expr, lVal, rVal) {
|
|
|
143
152
|
}
|
|
144
153
|
throw new Error(`Unknown logic op ${op}`);
|
|
145
154
|
}
|
|
146
|
-
function promoteToDec(v) {
|
|
147
|
-
if (!(typeof v === "bigint" || v instanceof decimal_js_1.default)) {
|
|
148
|
-
throw new Error(`Expected number not ${v}`);
|
|
149
|
-
}
|
|
150
|
-
return v instanceof decimal_js_1.default ? v : new decimal_js_1.default(v.toString());
|
|
151
|
-
}
|
|
152
|
-
function demoteFromDec(d) {
|
|
153
|
-
return d.isInt() ? BigInt(d.toFixed()) : d;
|
|
154
|
-
}
|
|
155
155
|
function evalBinaryEquality(expr, lVal, rVal) {
|
|
156
156
|
let equal;
|
|
157
157
|
if (typeof lVal === "string" || typeof rVal === "string") {
|
|
@@ -293,6 +293,13 @@ function evalConstantExpr(expr) {
|
|
|
293
293
|
return evalConstantExpr(decl.vValue);
|
|
294
294
|
}
|
|
295
295
|
}
|
|
296
|
+
if (expr instanceof ast_1.FunctionCall) {
|
|
297
|
+
/**
|
|
298
|
+
* @todo Implement properly, as Solidity permits overflow and underflow
|
|
299
|
+
* during constant evaluation.
|
|
300
|
+
*/
|
|
301
|
+
return evalConstantExpr(expr.vArguments[0]);
|
|
302
|
+
}
|
|
296
303
|
/// Note that from the point of view of the type system constant conditionals and
|
|
297
304
|
/// indexing in constant array literals are not considered constant expressions.
|
|
298
305
|
/// So for now we don't support them, but we may change that in the future.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eval_const.js","sourceRoot":"","sources":["../../src/types/eval_const.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"eval_const.js","sourceRoot":"","sources":["../../src/types/eval_const.ts"],"names":[],"mappings":"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"}
|
package/dist/types/infer.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Decimal } from "decimal.js";
|
|
2
2
|
import { Assignment, ASTNode, BinaryOperation, Conditional, ErrorDefinition, EventDefinition, Expression, FunctionCall, FunctionDefinition, Identifier, IndexAccess, IndexRangeAccess, Literal, MemberAccess, NewExpression, TupleExpression, UnaryOperation, VariableDeclaration } from "../ast";
|
|
3
|
+
import { DataLocation } from "../ast/constants";
|
|
3
4
|
import { ErrorType, EventType, FunctionType, IntLiteralType, IntType, TypeNode } from "./ast";
|
|
4
5
|
export declare const unaryImpureOperators: string[];
|
|
5
6
|
export declare const binaryOperatorGroups: {
|
|
@@ -34,22 +35,14 @@ export declare class InferType {
|
|
|
34
35
|
* Given two types `a` and `b` infer the common type that they are both
|
|
35
36
|
* implicitly casted to, when appearing in a binary op/conditional.
|
|
36
37
|
* Its currently usually `a` or `b`
|
|
37
|
-
*
|
|
38
|
-
* TODO: We should be able to simplify inferCommonType by moving a bunch of this logic to
|
|
39
|
-
* `castable(fromT, toT)` and then just doing something like:
|
|
40
|
-
*
|
|
41
|
-
* if (castable(a, b)) { return b; }
|
|
42
|
-
* if (castable(b, a)) { return a; }
|
|
43
|
-
*
|
|
44
|
-
* For a bunch of cases.
|
|
45
38
|
*/
|
|
46
39
|
inferCommonType(a: TypeNode, b: TypeNode): TypeNode;
|
|
47
40
|
/**
|
|
48
|
-
* Infer the type of the binary op
|
|
41
|
+
* Infer the type of the binary op
|
|
49
42
|
*/
|
|
50
43
|
typeOfBinaryOperation(node: BinaryOperation): TypeNode;
|
|
51
44
|
/**
|
|
52
|
-
* Infer the type of the conditional
|
|
45
|
+
* Infer the type of the conditional expression
|
|
53
46
|
*/
|
|
54
47
|
typeOfConditional(node: Conditional): TypeNode;
|
|
55
48
|
/**
|
|
@@ -77,7 +70,14 @@ export declare class InferType {
|
|
|
77
70
|
typeOfNewCall(node: FunctionCall): TypeNode;
|
|
78
71
|
private matchArguments;
|
|
79
72
|
/**
|
|
80
|
-
*
|
|
73
|
+
* Return true IFF the passed in node is an external callee. There are 2 cases for external calls:
|
|
74
|
+
*
|
|
75
|
+
* 1. The builtin functions (address).call/callcode/staticcall/delegatecall/transfer/send
|
|
76
|
+
* 2. Calling a function on some variable of type ContractDefinition
|
|
77
|
+
*/
|
|
78
|
+
private isFunctionCallExternal;
|
|
79
|
+
/**
|
|
80
|
+
* Infer the type of the function call
|
|
81
81
|
*/
|
|
82
82
|
typeOfFunctionCall(node: FunctionCall): TypeNode;
|
|
83
83
|
typeOfIndexAccess(node: IndexAccess): TypeNode;
|
|
@@ -96,11 +96,22 @@ export declare class InferType {
|
|
|
96
96
|
typeOfBuiltin(node: Identifier): TypeNode;
|
|
97
97
|
private getRHSTypeForDecl;
|
|
98
98
|
/**
|
|
99
|
-
* Infer the type of the identifier
|
|
99
|
+
* Infer the type of the identifier
|
|
100
100
|
*/
|
|
101
101
|
typeOfIdentifier(node: Identifier): TypeNode;
|
|
102
102
|
typeOfLiteral(node: Literal): TypeNode;
|
|
103
|
+
/**
|
|
104
|
+
* If the `MemberAccess` corresponds to a library function
|
|
105
|
+
* bound with a `using for` directive, return the type of that function.
|
|
106
|
+
*/
|
|
107
|
+
private typeOfMemberAccessUsingFor;
|
|
108
|
+
/**
|
|
109
|
+
* If the `MemberAccess` corresponds to a external function or a getter invoked on a contract
|
|
110
|
+
* return the type of the function/getter.
|
|
111
|
+
*/
|
|
103
112
|
typeOfMemberAccess(node: MemberAccess): TypeNode;
|
|
113
|
+
private changeLocToMemory;
|
|
114
|
+
private typeOfMemberAccessImpl;
|
|
104
115
|
typeOfNewExpression(newExpr: NewExpression): TypeNode;
|
|
105
116
|
typeOfTupleExpression(node: TupleExpression): TypeNode;
|
|
106
117
|
typeOfUnaryOperation(node: UnaryOperation): TypeNode;
|
|
@@ -119,18 +130,23 @@ export declare class InferType {
|
|
|
119
130
|
* functions, state variables, and type defs in that contract are now
|
|
120
131
|
* visible.
|
|
121
132
|
*/
|
|
122
|
-
typeOfResolved(name: string,
|
|
133
|
+
typeOfResolved(name: string, ctxs: ASTNode | ASTNode[], externalOnly: boolean): TypeNode | undefined;
|
|
123
134
|
/**
|
|
124
|
-
* Infer the data location for the given `VariableDeclaration`.
|
|
125
|
-
* solidity <=0.4.26 we infer the location from the RHS.
|
|
135
|
+
* Infer the data location for the given `VariableDeclaration`.
|
|
136
|
+
* For local vars with solidity <=0.4.26 we infer the location from the RHS.
|
|
126
137
|
*/
|
|
127
|
-
|
|
138
|
+
inferVariableDeclLocation(decl: VariableDeclaration): DataLocation;
|
|
128
139
|
/**
|
|
129
|
-
* Given a `VariableDeclaration` node
|
|
140
|
+
* Given a `VariableDeclaration` node compute the `TypeNode` that corresponds to the variable.
|
|
130
141
|
* This takes into account the storage location of the `decl`.
|
|
131
142
|
*/
|
|
132
143
|
variableDeclarationToTypeNode(decl: VariableDeclaration): TypeNode;
|
|
133
|
-
|
|
144
|
+
/**
|
|
145
|
+
* Convert a `FunctionDefinition` `def` into a function type.
|
|
146
|
+
* If `skipFirstArg` is true, omit the first parameter.
|
|
147
|
+
* This is used for functions bound with `using for` directives.
|
|
148
|
+
*/
|
|
149
|
+
funDefToType(def: FunctionDefinition, implicitFirstArg?: boolean): FunctionType;
|
|
134
150
|
eventDefToType(def: EventDefinition): EventType;
|
|
135
151
|
errDefToType(def: ErrorDefinition): ErrorType;
|
|
136
152
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infer.d.ts","sourceRoot":"","sources":["../../src/types/infer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAEH,UAAU,EACV,OAAO,EACP,eAAe,EACf,WAAW,EAKX,eAAe,EACf,eAAe,EACf,UAAU,EAGV,YAAY,EAGZ,kBAAkB,EAGlB,UAAU,EAGV,WAAW,EACX,gBAAgB,EAChB,OAAO,EAEP,YAAY,EAEZ,aAAa,EAMb,eAAe,EAEf,cAAc,EAEd,mBAAmB,EAEtB,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"infer.d.ts","sourceRoot":"","sources":["../../src/types/infer.ts"],"names":[],"mappings":"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"}
|