Skip to content

Commit

Permalink
Replacing inline_sequence by just sequence
Browse files Browse the repository at this point in the history 
Rebuiling prelude.rs using new tokay.tok resulted in smaller code.
  • Loading branch information
@phorward
phorward committed Dec 4, 2023
1 parent 96521e2 commit 34ce7c5
Show file tree
Hide file tree
Showing 4 changed files with 458 additions and 574 deletions.
6 changes: 3 additions & 3 deletions src/compiler/ast.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1595,8 +1595,8 @@ fn traverse_node(compiler: &mut Compiler, node: &Dict) -> ImlOp {
ImlOp::from(ops)
}

// sequence ------------------------------------------------------
"sequence" | "inline_sequence" | "dict" | "list" => {
// sequence, dict, list -----------------------------------------
"sequence" | "dict" | "list" => {
let children = if let Some(children) = node.get_str("children") {
List::from(children)
} else {
Expand All @@ -1621,7 +1621,7 @@ fn traverse_node(compiler: &mut Compiler, node: &Dict) -> ImlOp {
ops.push(ImlOp::from(Op::MakeList(ops.len())));
ImlOp::seq(ops, false)
}
"dict" | "inline_sequence" if ops.is_empty() => ImlOp::from(Op::MakeDict(0)),
"dict" if ops.is_empty() => ImlOp::from(Op::MakeDict(0)),
_ => ImlOp::seq(ops, true),
}
}
Expand Down
46 changes: 23 additions & 23 deletions src/compiler/parser.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ impl Parser {
"emit" => "op_mod_kle",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down Expand Up @@ -2466,7 +2466,7 @@ impl Parser {
"emit" => "op_mod_opt",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down Expand Up @@ -2556,7 +2556,7 @@ impl Parser {
"emit" => "op_mod_kle",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand All @@ -2571,7 +2571,7 @@ impl Parser {
"emit" => "op_mod_opt",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down Expand Up @@ -2658,7 +2658,7 @@ impl Parser {
"emit" => "op_mod_opt",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down Expand Up @@ -2732,7 +2732,7 @@ impl Parser {
"emit" => "op_mod_pos",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand All @@ -2743,7 +2743,7 @@ impl Parser {
"emit" => "op_mod_opt",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down Expand Up @@ -2937,7 +2937,7 @@ impl Parser {
"emit" => "op_mod_pos",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand All @@ -2948,7 +2948,7 @@ impl Parser {
"emit" => "op_mod_opt",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down Expand Up @@ -4098,7 +4098,7 @@ impl Parser {
"emit" => "op_mod_pos",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down Expand Up @@ -4249,7 +4249,7 @@ impl Parser {
"children" =>
(value!([
"emit" => "value_string",
"value" => "inline_sequence"
"value" => "sequence"
]))
]))
]))
Expand Down Expand Up @@ -4289,7 +4289,7 @@ impl Parser {
"emit" => "op_mod_pos",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down Expand Up @@ -4389,7 +4389,7 @@ impl Parser {
"emit" => "op_mod_pos",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand All @@ -4415,7 +4415,7 @@ impl Parser {
"emit" => "op_mod_opt",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down Expand Up @@ -4470,7 +4470,7 @@ impl Parser {
"value" => "___"
])),
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down Expand Up @@ -4670,11 +4670,11 @@ impl Parser {
"emit" => "genarg",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down Expand Up @@ -4733,7 +4733,7 @@ impl Parser {
"emit" => "op_mod_opt",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down Expand Up @@ -5850,7 +5850,7 @@ impl Parser {
"emit" => "op_mod_opt",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down Expand Up @@ -7590,7 +7590,7 @@ impl Parser {
"emit" => "op_mod_pos",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand All @@ -7612,7 +7612,7 @@ impl Parser {
"emit" => "op_mod_opt",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down Expand Up @@ -7659,7 +7659,7 @@ impl Parser {
]))
])),
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down Expand Up @@ -9634,7 +9634,7 @@ impl Parser {
"emit" => "op_mod_pos",
"children" =>
(value!([
"emit" => "inline_sequence",
"emit" => "sequence",
"children" =>
(value!([
(value!([
Expand Down
Loading

0 comments on commit 34ce7c5

Please sign in to comment.