summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJari Vetoniemi <mailroxas@gmail.com>2018-09-26 18:46:01 +0300
committerJari Vetoniemi <mailroxas@gmail.com>2018-09-26 18:46:01 +0300
commitd067b8b70ad503f003a56193ec7d4bebfd3c0276 (patch)
tree6a700651f2e20d031c5b24f5b69ca2a99e9ffc37
parent06c4761a3a2b129d221851391ced380e233c6ee1 (diff)
remove type::name add endianess support
type::name is too agressive as it clashes with keywords use reference::variable::type and reference::function::type instead
-rw-r--r--src/compiler/compiler.lm114
-rw-r--r--src/compiler/expr.lm23
-rw-r--r--src/compiler/types.lm9
3 files changed, 99 insertions, 47 deletions
diff --git a/src/compiler/compiler.lm b/src/compiler/compiler.lm
index 72e000f..b19743d 100644
--- a/src/compiler/compiler.lm
+++ b/src/compiler/compiler.lm
@@ -4,8 +4,6 @@
include 'expr.lm'
context fspec
- token WS / space /
-
context primitive
token TYPE_SIGN / [us] /
token TYPE_BITS / [1-9][0-9]* /
@@ -37,16 +35,19 @@ context fspec
def item
value:int
- [name:name::type `= expr::enum::type `, item] { lhs.value = const_int_expr(r3.collapsed) }
- | [name:name::type `= expr::enum::type] { lhs.value = const_int_expr(r3.collapsed) }
- | [name:name::type `, item] { lhs.value = 0 } # TODO: count
- | [name:name::type] { lhs.value = 0 } # TODO: count
+ [name:reference::variable::type `= expr::enum::type `, item] { lhs.value = const_int_expr(r3.collapsed) }
+ | [name:reference::variable::type `= expr::enum::type] { lhs.value = const_int_expr(r3.collapsed) }
+ | [name:reference::variable::type `, item] { lhs.value = 0 } # TODO: count
+ | [name:reference::variable::type] { lhs.value = 0 } # TODO: count
def type
name:str
items:item+
select:expr::paren::type
- [type:`enum WS+ name::type? `{ item+ `}] { if (name::type in r3) lhs.name = $(name::type in r3) lhs.items = r5 }
+ [type:`enum WS+ reference::variable::type? `{ item+ `}] {
+ for n:reference::variable::type in child(r3)
+ lhs.name = $n lhs.items = r5
+ }
end
context strukt # <- struct is taken :(
@@ -64,7 +65,10 @@ context fspec
name:str
items:item+
select:expr::paren::type
- [type:`struct WS+ name::type? `{ item+ `}] { if (name::type in r3) lhs.name = $(name::type in r3) lhs.items = r5 }
+ [type:`struct WS+ reference::variable::type? `{ item+ `}] {
+ for n:reference::variable::type in child(r3) lhs.name = $n
+ lhs.items = r5
+ }
end
context select
@@ -95,10 +99,14 @@ context fspec
ignore / '//' [^\n]* '\n' | space+ /
literal `: `[ `] `| `;
token VISUAL / 'nul' | 'dec' | 'hex' | 'str' /
+ token ENDIANESS / 'le' | 'be' /
end
literal `enum `struct
+ def endianess
+ [name:ENDIANESS]
+
def visual
[name:VISUAL]
@@ -141,22 +149,22 @@ context fspec
def type
# enum name <primitive> name <extra>;
- [cref:`enum WS+ parent:name::type WS+ primitive:primitive::type WS+ name:name::type extra:extra `;]
+ [cref:`enum WS+ parent:reference::variable::type WS+ primitive:primitive::type WS+ name:reference::variable::type extra:extra `;]
# struct name name <extra>;
- | [cref:`struct WS+ parent:name::type WS+ name:name::type extra:extra `;]
+ | [cref:`struct WS+ parent:reference::variable::type WS+ name:reference::variable::type extra:extra `;]
# <primitive> name <extra>;
- | [primitive:primitive::type WS+ name:name::type extra:extra `;]
+ | [primitive:primitive::type WS+ name:reference::variable::type extra:extra `;]
# select ((thing)) { ... } <extra>; INVALID
| [container::select::type extra `;] commit { reject }
# select ((thing)) { ... } <primitive> name <extra>; INVALID
- | [container::select::type primitive::type WS+ name::type extra `;] commit { reject }
+ | [container::select::type primitive::type WS+ reference::variable::type extra `;] commit { reject }
# struct (optional) { ... } <primitive> name <extra>; INVALID
- | [container::strukt::type primitive::type WS+ name::type extra `;] commit { reject }
+ | [container::strukt::type primitive::type WS+ reference::variable::type extra `;] commit { reject }
# enum (optional) { ... } <primitive> name <extra>;
- | [container:container::type primitive:primitive::type WS+ name:name::type extra:extra `;]
+ | [container:container::type primitive:primitive::type WS+ name:reference::variable::type extra:extra `;]
# select ((expr)) { ... } name <extra>;
# struct (optional) { ... } name <extra>;
- | [container:container::type name:name::type extra:extra `;]
+ | [container:container::type name:reference::variable::type extra:extra `;]
# (enum|struct) name { ... } <(le|be)>;
| [container:container::type endianess:endianess? `;]
end
@@ -173,15 +181,17 @@ if (!source) {
}
struct scope
+ endianess:str
names:map<str, map<str, any>>
end
global g_scopes:list<scope> = new list<scope>()
void
-push_scope() {
+push_scope(endianess:str) {
s:scope = new scope()
s->names = new map<str, map<str, any>>()
+ s->endianess = endianess
g_scopes->push_head(s)
}
@@ -241,10 +251,33 @@ lookup(type:str, name:str)
}
str
-container_name_str(s:ref<str>) { if (!s) return '<anon>' return s }
+container_name_str(s:str) { if (!s) return '<anon>' return s }
str
-signed_str(s:ref<bool>) { if (s) return 'signed' return 'unsigned' }
+signed_str(s:bool) { if (s) return 'signed' return 'unsigned' }
+
+str
+endianess_str(s:str)
+{
+ if (s == 'be')
+ return 'big-endian'
+ else if (s == 'le')
+ return 'little-endian'
+
+ print('something went wrong!\n')
+ exit(1)
+}
+
+str
+endianess_from_decl(d:fspec::declaration::type)
+{
+ endianess:str = g_scopes->top->endianess
+ if (d.endianess)
+ for e:fspec::declaration::endianess in child(d.endianess) endianess = $e
+ if (d.extra && d.extra.endianess)
+ for e:fspec::declaration::endianess in child(d.extra.endianess) endianess = $e
+ return endianess
+}
void
print_declaration(d:fspec::declaration::type)
@@ -287,47 +320,56 @@ print_declaration(d:fspec::declaration::type)
for v:fspec::declaration::visual in child(d.extra.visual)
print(' and it should be visualized as `', $v.name, '`\n')
+
+ print(' the field is in ', endianess_str(endianess_from_decl(d)), ' byte order\n')
}
}
void
-walk(s:fspec::container::type)
+walk(d:fspec::declaration::type)
{
+ if (!d.container) {
+ print('something went wrong!\n')
+ exit(1)
+ }
+
+ s:fspec::container::type = d.container
insert($s.data.type, s.data.name, s)
+
if ($s.data.type == 'enum') {
for i:fspec::container::enum::item in repeat(s.data.items) {
print('constant `', $i.name, '` is ', $i.value, '\n')
insert('variable', $i.name, i)
}
} else if ($s.data.type == 'struct') {
- push_scope()
- for d:fspec::container::strukt::item in repeat(s.data.items) {
- if (d.data.name)
- print_declaration(d.data)
- if (d.data.container)
- walk(d.data.container)
+ push_scope(endianess_from_decl(d))
+ for i:fspec::container::strukt::item in repeat(s.data.items) {
+ if (i.data.container)
+ walk(i.data)
+ else
+ print_declaration(i.data)
}
pop_scope()
} else if ($s.data.type == 'select') {
- push_scope()
+ push_scope(endianess_from_decl(d))
print('━━━━ start of (', $s.data.select, ') ━━━━\n')
- for d:fspec::container::select::item in repeat(s.data.items) {
- if (d.expr)
- print('━━━━ (', $d.expr, ')\n')
+ for i:fspec::container::select::item in repeat(s.data.items) {
+ if (i.expr)
+ print('━━━━ (', $i.expr, ')\n')
else
print('━━━━ DEFAULT\n')
- if (d.data.name)
- print_declaration(d.data)
- if (d.data.container)
- walk(d.data.container)
+ if (i.data.container)
+ walk(i.data)
+ else
+ print_declaration(i.data)
}
print('━━━━ end of (', $s.data.select, ') ━━━━\n')
pop_scope()
}
}
-push_scope()
-for s:fspec::declaration::type in repeat(source.items)
- walk(s.container)
+push_scope('le')
+for d:fspec::declaration::type in repeat(source.items)
+ walk(d)
pop_scope()
diff --git a/src/compiler/expr.lm b/src/compiler/expr.lm
index 1bf6746..b763005 100644
--- a/src/compiler/expr.lm
+++ b/src/compiler/expr.lm
@@ -69,18 +69,34 @@ end
context reference
context function
- literal `( `) `,
+ lex
+ # reserved
+ literal `struct `enum `select
+ literal `nul `dec `hex `str `be `le
+ token PRIMITIVE / [us][1-9][0-9]* /
+ literal `( `) `,
+ token NAME / [a-zA-Z_][a-zA-Z_0-9]* /
+ end
def arg
[expr::arg::type `, arg] | [expr::arg::type]
def type
- [name:name::type `( args:arg* `)]
+ [name:NAME WS* `( args:arg* `)]
end
context variable
+ lex
+ # reserved
+ literal `struct `enum `select
+ literal `until `sizeof
+ literal `nul `dec `hex `str `be `le
+ token PRIMITIVE / [us][1-9][0-9]* /
+ token NAME / [a-zA-Z_][a-zA-Z_0-9]* /
+ end
+
def type
- [name:name::type]
+ [name:NAME]
end
def type
@@ -101,7 +117,6 @@ context collapser
values:str
next_is_unary:bool
- token WS / space /
literal `+ `-
literal `( `) `+# `-# `! `~ `* `/ `% `#+ `#- `<< `>> `< `> `<= `>= `== `!= `& `^ `| `&& `|| `? `:
literal `. `[ `]
diff --git a/src/compiler/types.lm b/src/compiler/types.lm
index 6edc2ea..c4982ac 100644
--- a/src/compiler/types.lm
+++ b/src/compiler/types.lm
@@ -1,6 +1,8 @@
# Basic (mostly) langauge independent types
# These are the foundation for understanding the source code
+token WS / space /
+
context number
context unsigned
literal `true `false
@@ -49,10 +51,3 @@ context string
[`' raw:raw* `'] { i:int = 0 for s:raw in r2 i = i + 1 lhs.length = i }
| [`" raw:raw* `"] { i:int = 0 for s:raw in r2 i = i + 1 lhs.length = i }
end
-
-context name
- token NAME / [a-zA-Z_][a-zA-Z_0-9]* /
-
- def type
- [NAME]
-end