Skip to content
This repository has been archived by the owner on Oct 20, 2024. It is now read-only.

Commit

Permalink
fix: allow index into AstSpan (#299)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maddiaa0
Maddiaa0 authored Oct 1, 2023
1 parent 09d7a24 commit 08531a9
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 39 deletions.
78 changes: 40 additions & 38 deletions huff_parser/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ impl Parser {
TokenKind::Macro | TokenKind::Fn | TokenKind::Test => {
let m = self.parse_macro()?;
tracing::info!(target: "parser", "SUCCESSFULLY PARSED MACRO {}", m.name);
self.check_duplicate_macro(&contract, m.clone())?;
self.check_duplicate_macro(&contract, &m)?;
contract.macros.push(m);
}
TokenKind::JumpTable | TokenKind::JumpTablePacked | TokenKind::CodeTable => {
Expand Down Expand Up @@ -133,7 +133,7 @@ impl Parser {
TokenKind::Include
)),
spans: AstSpan(self.spans.clone()),
});
})
}
}

Expand All @@ -158,7 +158,7 @@ impl Parser {
kind: ParserErrorKind::InvalidName(tok.clone()),
hint: Some(format!("Expected import string. Got: \"{tok}\"")),
spans: AstSpan(new_spans),
});
})
}
};

Expand Down Expand Up @@ -190,14 +190,14 @@ impl Parser {
pub fn check_duplicate_macro(
&self,
contract: &Contract,
m: MacroDefinition,
m: &MacroDefinition,
) -> Result<(), ParserError> {
if contract.macros.binary_search_by(|_macro| _macro.name.cmp(&m.name)).is_ok() {
tracing::error!(target: "parser", "DUPLICATE MACRO NAME FOUND: {}", m.name);
Err(ParserError {
kind: ParserErrorKind::DuplicateMacro(m.name),
kind: ParserErrorKind::DuplicateMacro(m.name.to_owned()),
hint: Some("MACRO names should be unique".to_string()),
spans: AstSpan(vec![self.spans[2].clone()]),
spans: AstSpan(vec![m.span[2].clone()]),
})
} else {
Ok(())
Expand All @@ -216,7 +216,7 @@ impl Parser {
loop {
let token = self.peek().unwrap();
if !kinds.contains(&token.kind) {
break;
break
}
self.current_token = token;
self.cursor += 1;
Expand Down Expand Up @@ -257,7 +257,7 @@ impl Parser {
kind: ParserErrorKind::InvalidName(tok.clone()),
hint: Some(format!("Expected function name, found: \"{tok}\"")),
spans: AstSpan(self.spans.clone()),
});
})
}
};

Expand Down Expand Up @@ -319,7 +319,7 @@ impl Parser {
kind: ParserErrorKind::InvalidName(tok.clone()),
hint: Some(format!("Expected event name, found: \"{tok}\"")),
spans: AstSpan(self.spans.clone()),
});
})
}
};

Expand Down Expand Up @@ -350,7 +350,7 @@ impl Parser {
kind: ParserErrorKind::UnexpectedType(tok),
hint: Some("Expected constant name.".to_string()),
spans: AstSpan(self.spans.clone()),
});
})
}
};

Expand All @@ -375,7 +375,7 @@ impl Parser {
.to_string(),
),
spans: AstSpan(vec![self.current_token.span.clone()]),
});
})
}
};

Expand Down Expand Up @@ -403,7 +403,7 @@ impl Parser {
kind: ParserErrorKind::UnexpectedType(tok),
hint: Some("Expected error name.".to_string()),
spans: AstSpan(self.spans.clone()),
});
})
}
};

Expand Down Expand Up @@ -450,7 +450,7 @@ impl Parser {
),
hint: Some(format!("Expected string for decorator flag: {s}")),
spans: AstSpan(vec![self.current_token.span.clone()]),
});
})
}
}
// The value flag accepts a single literal as an argument
Expand All @@ -466,7 +466,7 @@ impl Parser {
),
hint: Some(format!("Expected literal for decorator flag: {s}")),
spans: AstSpan(vec![self.current_token.span.clone()]),
});
})
}
}
Err(_) => {
Expand All @@ -475,7 +475,7 @@ impl Parser {
kind: ParserErrorKind::InvalidDecoratorFlag(s.clone()),
hint: Some(format!("Unknown decorator flag: {s}")),
spans: AstSpan(self.spans.clone()),
});
})
}
}

Expand All @@ -493,7 +493,7 @@ impl Parser {
)),
hint: Some(String::from("Unknown decorator flag")),
spans: AstSpan(self.spans.clone()),
});
})
}
}

Expand Down Expand Up @@ -654,7 +654,9 @@ impl Parser {
let mut curr_spans = vec![self.current_token.span.clone()];
self.consume();
let inner_statements: Vec<Statement> = self.parse_label()?;
inner_statements.iter().for_each(|a| curr_spans.extend_from_slice(&a.span.0));
inner_statements
.iter()
.for_each(|a| curr_spans.extend_from_slice(a.span.inner_ref()));
tracing::info!(target: "parser", "PARSED LABEL \"{}\" INSIDE MACRO WITH {} STATEMENTS.", l, inner_statements.len());
statements.push(Statement {
ty: StatementType::Label(Label {
Expand Down Expand Up @@ -685,7 +687,7 @@ impl Parser {
let mut curr_spans = vec![self.current_token.span.clone()];
self.match_kind(TokenKind::BuiltinFunction(String::default()))?;
let args = self.parse_args(true, false, false, true)?;
args.iter().for_each(|a| curr_spans.extend_from_slice(&a.span.0));
args.iter().for_each(|a| curr_spans.extend_from_slice(a.span.inner_ref()));
tracing::info!(target: "parser", "PARSING MACRO BODY: [BUILTIN FN: {}({:?})]", f, args);
statements.push(Statement {
ty: StatementType::BuiltinFunctionCall(BuiltinFunctionCall {
Expand All @@ -702,7 +704,7 @@ impl Parser {
kind: ParserErrorKind::InvalidTokenInMacroBody(kind),
hint: None,
spans: AstSpan(vec![self.current_token.span.clone()]),
});
})
}
};
}
Expand All @@ -725,8 +727,8 @@ impl Parser {
pub fn parse_label(&mut self) -> Result<Vec<Statement>, ParserError> {
let mut statements: Vec<Statement> = Vec::new();
self.match_kind(TokenKind::Colon)?;
while !self.check(TokenKind::Label("NEXT_LABEL".to_string()))
&& !self.check(TokenKind::CloseBrace)
while !self.check(TokenKind::Label("NEXT_LABEL".to_string())) &&
!self.check(TokenKind::CloseBrace)
{
match self.current_token.kind.clone() {
TokenKind::Literal(val) => {
Expand Down Expand Up @@ -798,7 +800,7 @@ impl Parser {
let mut curr_spans = vec![self.current_token.span.clone()];
self.match_kind(TokenKind::BuiltinFunction(String::default()))?;
let args = self.parse_args(true, false, false, true)?;
args.iter().for_each(|a| curr_spans.extend_from_slice(&a.span.0));
args.iter().for_each(|a| curr_spans.extend_from_slice(a.span.inner_ref()));
tracing::info!(target: "parser", "PARSING LABEL BODY: [BUILTIN FN: {}({:?})]", f, args);
statements.push(Statement {
ty: StatementType::BuiltinFunctionCall(BuiltinFunctionCall {
Expand All @@ -815,7 +817,7 @@ impl Parser {
kind: ParserErrorKind::InvalidTokenInLabelDefinition(kind),
hint: None,
spans: AstSpan(vec![self.current_token.span.clone()]),
});
})
}
};
}
Expand Down Expand Up @@ -867,7 +869,7 @@ impl Parser {
self.consume();
on_type = true;
}
continue;
continue
}

// Check for literals
Expand All @@ -887,7 +889,7 @@ impl Parser {
self.consume();
on_type = true;
}
continue;
continue
}
}

Expand Down Expand Up @@ -928,9 +930,9 @@ impl Parser {
}

// name comes second (is optional)
if select_name
&& (self.check(TokenKind::Ident("x".to_string()))
|| self.check(TokenKind::PrimitiveType(PrimitiveEVMType::Address)))
if select_name &&
(self.check(TokenKind::Ident("x".to_string())) ||
self.check(TokenKind::PrimitiveType(PrimitiveEVMType::Address)))
{
// We need to check if the name is a keyword - not the type
if !on_type {
Expand All @@ -946,7 +948,7 @@ impl Parser {
"Argument names cannot be EVM types: {arg_str}"
)),
spans: AstSpan(vec![self.current_token.span.clone()]),
});
})
}
}
TokenKind::PrimitiveType(ty) => {
Expand Down Expand Up @@ -979,7 +981,7 @@ impl Parser {
kind: ParserErrorKind::InvalidArgs(self.current_token.kind.clone()),
hint: None,
spans: AstSpan(vec![self.current_token.span.clone()]),
});
})
}

arg.span = AstSpan(arg_spans);
Expand Down Expand Up @@ -1057,7 +1059,7 @@ impl Parser {
.to_string(),
),
spans: AstSpan(new_spans),
});
})
}
}
if self.check(TokenKind::Comma) {
Expand Down Expand Up @@ -1104,8 +1106,8 @@ impl Parser {
0_usize
}
})
.sum::<usize>()
/ 2
.sum::<usize>() /
2
}
};

Expand Down Expand Up @@ -1145,7 +1147,7 @@ impl Parser {
),
hint: Some("Expected valid hex bytecode.".to_string()),
spans: AstSpan(new_spans),
});
})
}
} else {
StatementType::LabelCall(ident_str.to_string())
Expand All @@ -1160,7 +1162,7 @@ impl Parser {
kind: ParserErrorKind::InvalidTableBodyToken(kind.clone()),
hint: Some("Expected an identifier string.".to_string()),
spans: AstSpan(new_spans),
});
})
}
};
}
Expand Down Expand Up @@ -1265,7 +1267,7 @@ impl Parser {
kind: ParserErrorKind::InvalidUint256(size),
hint: None,
spans: AstSpan(vec![self.current_token.span.clone()]),
});
})
}
Ok(self.match_kind(self.current_token.kind.clone())?)
}
Expand All @@ -1275,7 +1277,7 @@ impl Parser {
kind: ParserErrorKind::InvalidBytes(size),
hint: None,
spans: AstSpan(vec![self.current_token.span.clone()]),
});
})
}
Ok(self.match_kind(self.current_token.kind.clone())?)
}
Expand All @@ -1289,7 +1291,7 @@ impl Parser {
kind: ParserErrorKind::InvalidInt(size),
hint: None,
spans: AstSpan(vec![self.current_token.span.clone()]),
});
})
}
let curr_token_kind = self.current_token.kind.clone();
self.consume();
Expand Down
14 changes: 14 additions & 0 deletions huff_utils/src/ast.rs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use itertools::Itertools;
use serde::{Deserialize, Serialize};
use std::ops::Index;

use crate::{
bytecode::*,
Expand Down Expand Up @@ -76,6 +77,19 @@ impl AstSpan {
None => Default::default(),
})
}

/// Retrieve the underlying vector of spans
pub fn inner_ref(&self) -> &Vec<Span> {
&self.0
}
}

/// Allows AstSpan to be indexed into
impl Index<usize> for AstSpan {
type Output = Span;
fn index(&self, index: usize) -> &Self::Output {
&self.0[index]
}
}

/// A Huff Contract Representation
Expand Down
2 changes: 1 addition & 1 deletion huff_utils/src/error.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ pub enum CodegenErrorKind {

impl Spanned for CodegenError {
fn span(&self) -> Span {
self.span.0[0].clone()
self.span[0].clone()
}
}

Expand Down

0 comments on commit 08531a9

Please sign in to comment.