Skip to content

Commit 92a6c6c

Browse files
seanyoungseanyoung
authored
Represent type(f) correctly in the ast (#1609)
This makes the ast correct, and also the following code is now parsed correctly: function foo() { type(int); } `type(enum-type).min` or `type(enum).min` is now supported. This fixes all the issues wrt `type(T)` in the solc tests. Signed-off-by: Sean Young <[email protected]>
1 parent 68b59a4 commit 92a6c6c

File tree

20 files changed

+561
-346
lines changed

20 files changed

+561
-346
lines changed

‎src/bin/languageserver/mod.rs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -662,16 +662,6 @@ impl<'a> Builder<'a> {
662662
},
663663
));
664664
}
665-
ast::Expression::CodeLiteral { loc, .. } => {
666-
self.hovers.push((
667-
loc.file_no(),
668-
HoverEntry {
669-
start: loc.start(),
670-
stop: loc.exclusive_end(),
671-
val: make_code_block("bytes"),
672-
},
673-
));
674-
}
675665
ast::Expression::NumberLiteral { loc, ty, value,.. } => {
676666
if let Type::Enum(id) = ty {
677667
self.references.push((

‎src/codegen/expression.rs‎

Lines changed: 59 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ use crate::sema::{
3232
use crate::Target;
3333
use num_bigint::{BigInt, Sign};
3434
use num_traits::{FromPrimitive, One, ToPrimitive, Zero};
35-
use solang_parser::pt;
36-
use solang_parser::pt::{CodeLocation, Loc};
35+
use solang_parser::pt::{self, CodeLocation, Loc};
3736
use std::{cmp::Ordering, ops::Mul};
3837

3938
pub fn expression(
@@ -1006,6 +1005,22 @@ pub fn expression(
10061005
} if expr.len() == 1 && ns.target == Target::EVM => {
10071006
builtin_evm_gasprice(loc, expr, cfg, contract_no, func, ns, vartab, opt)
10081007
}
1008+
ast::Expression::Builtin {
1009+
loc,
1010+
tys,
1011+
kind: ast::Builtin::TypeMin | ast::Builtin::TypeMax,
1012+
..
1013+
} => {
1014+
let Ok((_, value)) = eval_const_number(expr, ns, &mut Diagnostics::default()) else {
1015+
unreachable!();
1016+
};
1017+
1018+
Expression::NumberLiteral {
1019+
loc: *loc,
1020+
ty: tys[0].clone(),
1021+
value,
1022+
}
1023+
}
10091024
ast::Expression::Builtin {
10101025
loc,
10111026
tys,
@@ -1051,7 +1066,6 @@ pub fn expression(
10511066
right,
10521067
opt,
10531068
),
1054-
ast::Expression::InterfaceId { loc, contract_no } => interfaceid(ns, *contract_no, loc),
10551069
ast::Expression::BoolLiteral { loc, value } => Expression::BoolLiteral {
10561070
loc: *loc,
10571071
value: *value,
@@ -1061,9 +1075,6 @@ pub fn expression(
10611075
ty: ty.clone(),
10621076
value: value.clone(),
10631077
},
1064-
ast::Expression::CodeLiteral {
1065-
loc, contract_no, ..
1066-
} => code(loc, *contract_no, ns, opt),
10671078
ast::Expression::NumberLiteral { loc, ty, value } => Expression::NumberLiteral {
10681079
loc: *loc,
10691080
ty: ty.clone(),
@@ -1145,8 +1156,9 @@ pub fn expression(
11451156
ty,
11461157
}
11471158
}
1148-
1149-
ast::Expression::List { .. } => unreachable!("List shall not appear in the CFG"),
1159+
ast::Expression::TypeOperator { .. } | ast::Expression::List { .. } => {
1160+
unreachable!("List and Type Operator shall not appear in the CFG")
1161+
}
11501162
}
11511163
}
11521164

@@ -2238,6 +2250,45 @@ fn expr_builtin(
22382250
value: 0.into(),
22392251
}
22402252
}
2253+
ast::Builtin::TypeName => {
2254+
let ast::Expression::TypeOperator {
2255+
ty: Type::Contract(no),
2256+
..
2257+
} = &args[0]
2258+
else {
2259+
unreachable!();
2260+
};
2261+
2262+
let value = ns.contracts[*no].id.name.as_bytes().to_owned();
2263+
2264+
Expression::BytesLiteral {
2265+
loc: *loc,
2266+
ty: Type::String,
2267+
value,
2268+
}
2269+
}
2270+
ast::Builtin::TypeInterfaceId => {
2271+
let ast::Expression::TypeOperator {
2272+
ty: Type::Contract(contract_no),
2273+
..
2274+
} = &args[0]
2275+
else {
2276+
unreachable!();
2277+
};
2278+
2279+
interfaceid(ns, *contract_no, loc)
2280+
}
2281+
ast::Builtin::TypeRuntimeCode | ast::Builtin::TypeCreatorCode => {
2282+
let ast::Expression::TypeOperator {
2283+
ty: Type::Contract(contract_no),
2284+
..
2285+
} = &args[0]
2286+
else {
2287+
unreachable!();
2288+
};
2289+
2290+
code(loc, *contract_no, ns, opt)
2291+
}
22412292
_ => {
22422293
let arguments: Vec<Expression> = args
22432294
.iter()

‎src/codegen/mod.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ pub(crate) mod dispatch;
99
pub(crate) mod encoding;
1010
mod events;
1111
mod expression;
12-
mod external_functions;
1312
pub(super) mod polkadot;
1413
mod reaching_definitions;
1514
pub mod revert;
@@ -196,8 +195,6 @@ fn contract(contract_no: usize, ns: &mut Namespace, opt: &Options) {
196195
let mut cfg_no = 0;
197196
let mut all_cfg = Vec::new();
198197

199-
external_functions::add_external_functions(contract_no, ns);
200-
201198
// all the functions should have a cfg_no assigned, so we can generate call instructions to the correct function
202199
for (_, func_cfg) in ns.contracts[contract_no].all_functions.iter_mut() {
203200
*func_cfg = cfg_no;

‎src/codegen/statements/mod.rs‎

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -170,37 +170,45 @@ pub(crate) fn statement(
170170
}
171171
}
172172
Statement::Expression(_, _, expr) => {
173-
if let ast::Expression::Assign { left, right, .. } = &expr {
174-
if should_remove_assignment(left, func, opt, ns) {
175-
let mut params = SideEffectsCheckParameters {
176-
cfg,
177-
contract_no,
178-
func: Some(func),
179-
ns,
180-
vartab,
181-
opt,
182-
};
183-
right.recurse(&mut params, process_side_effects_expressions);
184-
185-
return;
173+
match expr {
174+
ast::Expression::Assign { left, right, .. } => {
175+
if should_remove_assignment(left, func, opt, ns) {
176+
let mut params = SideEffectsCheckParameters {
177+
cfg,
178+
contract_no,
179+
func: Some(func),
180+
ns,
181+
vartab,
182+
opt,
183+
};
184+
right.recurse(&mut params, process_side_effects_expressions);
185+
186+
return;
187+
}
186188
}
187-
} else if let ast::Expression::Builtin { args, .. } = expr {
188-
// When array pop and push are top-level expressions, they can be removed
189-
if should_remove_assignment(expr, func, opt, ns) {
190-
let mut params = SideEffectsCheckParameters {
191-
cfg,
192-
contract_no,
193-
func: Some(func),
194-
ns,
195-
vartab,
196-
opt,
197-
};
198-
for arg in args {
199-
arg.recurse(&mut params, process_side_effects_expressions);
189+
ast::Expression::Builtin { args, .. } => {
190+
// When array pop and push are top-level expressions, they can be removed
191+
if should_remove_assignment(expr, func, opt, ns) {
192+
let mut params = SideEffectsCheckParameters {
193+
cfg,
194+
contract_no,
195+
func: Some(func),
196+
ns,
197+
vartab,
198+
opt,
199+
};
200+
for arg in args {
201+
arg.recurse(&mut params, process_side_effects_expressions);
202+
}
203+
204+
return;
200205
}
201-
206+
}
207+
ast::Expression::TypeOperator { .. } => {
208+
// just a stray type(int), no code to generate
202209
return;
203210
}
211+
_ => (),
204212
}
205213

206214
let _ = expression(expr, cfg, contract_no, Some(func), ns, vartab, opt);

‎src/sema/ast.rs‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,8 @@ pub struct Function {
356356
/// This indexmap stores the accounts this functions needs to be called on Solana
357357
/// The string is the account's name
358358
pub solana_accounts: RefCell<IndexMap<String, SolanaAccount>>,
359+
/// List of contracts this function creates
360+
pub creates: Vec<(pt::Loc, usize)>,
359361
}
360362

361363
/// This struct represents a Solana account. There is no name field, because
@@ -463,6 +465,7 @@ impl Function {
463465
annotations: ConstructorAnnotations::default(),
464466
mangled_name_contracts: HashSet::new(),
465467
solana_accounts: IndexMap::new().into(),
468+
creates: Vec::new(),
466469
}
467470
}
468471

@@ -888,12 +891,6 @@ pub enum Expression {
888891
ty: Type,
889892
value: Vec<u8>,
890893
},
891-
CodeLiteral {
892-
loc: pt::Loc,
893-
contract_no: usize,
894-
// runtime code rather than deployer (evm only)
895-
runtime: bool,
896-
},
897894
NumberLiteral {
898895
loc: pt::Loc,
899896
ty: Type,
@@ -1248,10 +1245,6 @@ pub enum Expression {
12481245
kind: Builtin,
12491246
args: Vec<Expression>,
12501247
},
1251-
InterfaceId {
1252-
loc: pt::Loc,
1253-
contract_no: usize,
1254-
},
12551248
List {
12561249
loc: pt::Loc,
12571250
list: Vec<Expression>,
@@ -1268,6 +1261,10 @@ pub enum Expression {
12681261
ty: Type,
12691262
event_no: usize,
12701263
},
1264+
TypeOperator {
1265+
loc: pt::Loc,
1266+
ty: Type,
1267+
},
12711268
}
12721269

12731270
#[derive(PartialEq, Eq, Clone, Default, Debug)]
@@ -1508,16 +1505,15 @@ impl Recurse for Expression {
15081505
}
15091506

15101507
Expression::NumberLiteral { .. }
1511-
| Expression::InterfaceId { .. }
15121508
| Expression::InternalFunction { .. }
15131509
| Expression::ConstantVariable { .. }
15141510
| Expression::StorageVariable { .. }
15151511
| Expression::Variable { .. }
15161512
| Expression::RationalNumberLiteral { .. }
1517-
| Expression::CodeLiteral { .. }
15181513
| Expression::BytesLiteral { .. }
15191514
| Expression::BoolLiteral { .. }
1520-
| Expression::EventSelector { .. } => (),
1515+
| Expression::EventSelector { .. }
1516+
| Expression::TypeOperator { .. } => (),
15211517
}
15221518
}
15231519
}
@@ -1528,7 +1524,6 @@ impl CodeLocation for Expression {
15281524
match self {
15291525
Expression::BoolLiteral { loc, .. }
15301526
| Expression::BytesLiteral { loc, .. }
1531-
| Expression::CodeLiteral { loc, .. }
15321527
| Expression::NumberLiteral { loc, .. }
15331528
| Expression::RationalNumberLiteral { loc, .. }
15341529
| Expression::StructLiteral { loc, .. }
@@ -1587,11 +1582,11 @@ impl CodeLocation for Expression {
15871582
| Expression::Assign { loc, .. }
15881583
| Expression::List { loc, list: _ }
15891584
| Expression::FormatString { loc, format: _ }
1590-
| Expression::InterfaceId { loc, .. }
15911585
| Expression::And { loc, .. }
15921586
| Expression::NamedMember { loc, .. }
15931587
| Expression::UserDefinedOperator { loc, .. }
1594-
| Expression::EventSelector { loc, .. } => *loc,
1588+
| Expression::EventSelector { loc, .. }
1589+
| Expression::TypeOperator { loc, .. } => *loc,
15951590
}
15961591
}
15971592
}
@@ -1777,6 +1772,12 @@ pub enum Builtin {
17771772
ECRecover,
17781773
StringConcat,
17791774
BytesConcat,
1775+
TypeMin,
1776+
TypeMax,
1777+
TypeName,
1778+
TypeInterfaceId,
1779+
TypeRuntimeCode,
1780+
TypeCreatorCode,
17801781
}
17811782

17821783
#[derive(PartialEq, Eq, Clone, Debug)]

‎src/sema/dotgraphviz.rs‎

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -293,26 +293,6 @@ impl Dot {
293293
Some(parent_rel),
294294
);
295295
}
296-
Expression::CodeLiteral {
297-
loc,
298-
contract_no,
299-
runtime,
300-
} => {
301-
let labels = vec![
302-
format!(
303-
"code {}literal contract {}",
304-
if *runtime { "runtime " } else { "" },
305-
ns.contracts[*contract_no].id,
306-
),
307-
ns.loc_to_string(PathDisplay::FullPath, loc),
308-
];
309-
310-
self.add_node(
311-
Node::new("code_literal", labels),
312-
Some(parent),
313-
Some(parent_rel),
314-
);
315-
}
316296
Expression::NumberLiteral { loc, ty, value } => {
317297
let labels = vec![
318298
format!("{} literal: {}", ty.to_string(ns), value),
@@ -1362,18 +1342,6 @@ impl Dot {
13621342
self.add_expression(arg, func, ns, node, format!("arg #{no}"));
13631343
}
13641344
}
1365-
Expression::InterfaceId { loc, contract_no } => {
1366-
let labels = vec![
1367-
format!("interfaceid contract {}", ns.contracts[*contract_no].id),
1368-
ns.loc_to_string(PathDisplay::FullPath, loc),
1369-
];
1370-
1371-
self.add_node(
1372-
Node::new("interfaceid", labels),
1373-
Some(parent),
1374-
Some(parent_rel),
1375-
);
1376-
}
13771345
Expression::UserDefinedOperator {
13781346
loc,
13791347
oper,
@@ -1447,6 +1415,18 @@ impl Dot {
14471415
Some(parent_rel),
14481416
);
14491417
}
1418+
Expression::TypeOperator { loc, ty } => {
1419+
let labels = vec![
1420+
format!("type({})", ty.to_string(ns)),
1421+
ns.loc_to_string(PathDisplay::FullPath, loc),
1422+
];
1423+
1424+
self.add_node(
1425+
Node::new("type_operator", labels),
1426+
Some(parent),
1427+
Some(parent_rel),
1428+
);
1429+
}
14501430
}
14511431
}
14521432

0 commit comments

Comments
 (0)