jyapayne/nimterop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reduce redundancy in grammar

Browse source
This commit is contained in:
Ganesh Viswanathan 2018-12-26 23:46:09 -06:00
commit 9b93fb6561
1 changed files with 38 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

146
nimterop/grammar.nim
View file

@ -24,12 +24,7 @@ proc initGrammar() =
gStateRT.constStr &= &" {name}* = {val}\n" gStateRT.constStr &= &" {name}* = {val}\n"
)) ))
# typedef int X let typeGrammar = """
# typedef X Y
# typedef struct X Y
# typedef ?* Y
gStateRT.grammar.add(("""
(type_definition
(primitive_type|type_identifier?) (primitive_type|type_identifier?)
(sized_type_specifier? (sized_type_specifier?
(primitive_type?) (primitive_type?)
@ -37,6 +32,15 @@ proc initGrammar() =
(struct_specifier|union_specifier|enum_specifier? (struct_specifier|union_specifier|enum_specifier?
(type_identifier) (type_identifier)
) )
"""
# typedef int X
# typedef X Y
# typedef struct X Y
# typedef ?* Y
gStateRT.grammar.add((&"""
(type_definition
{typeGrammar}
(type_identifier?) (type_identifier?)
(pointer_declarator? (pointer_declarator?
(type_identifier) (type_identifier)
@ -96,30 +100,24 @@ proc initGrammar() =
gStateRT.typeStr &= &" {fname}*: {ftyp}\n" gStateRT.typeStr &= &" {fname}*: {ftyp}\n"
i += 2 i += 2
let fieldGrammar = """
(field_identifier?)
(array_declarator?
(field_identifier)
(identifier|number_literal)
)
"""
# struct X {} # struct X {}
gStateRT.grammar.add((""" gStateRT.grammar.add((&"""
(struct_specifier|union_specifier (struct_specifier|union_specifier
(type_identifier) (type_identifier)
(field_declaration_list (field_declaration_list
(field_declaration+ (field_declaration+
(primitive_type|type_identifier?) {typeGrammar}
(sized_type_specifier? {fieldGrammar}
(primitive_type?)
)
(struct_specifier|union_specifier|enum_specifier?
(type_identifier)
)
(field_identifier?)
(pointer_declarator? (pointer_declarator?
(field_identifier?) {fieldGrammar}
(array_declarator?
(field_identifier)
(identifier|number_literal)
)
)
(array_declarator?
(field_identifier)
(identifier|number_literal)
) )
) )
) )
@ -130,34 +128,9 @@ proc initGrammar() =
)) ))
# typedef struct X {} # typedef struct X {}
gStateRT.grammar.add((""" gStateRT.grammar.add((&"""
(type_definition (type_definition
(struct_specifier|union_specifier {gStateRT.grammar[^1].grammar}
(type_identifier?)
(field_declaration_list
(field_declaration+
(primitive_type|type_identifier?)
(sized_type_specifier?
(primitive_type?)
)
(struct_specifier|union_specifier|enum_specifier?
(type_identifier)
)
(field_identifier?)
(pointer_declarator?
(field_identifier?)
(array_declarator?
(field_identifier)
(identifier|number_literal)
)
)
(array_declarator?
(field_identifier)
(identifier|number_literal)
)
)
)
)
(type_identifier) (type_identifier)
) )
""", """,
@ -231,20 +204,9 @@ proc initGrammar() =
)) ))
# typedef enum {} X # typedef enum {} X
gStateRT.grammar.add((""" gStateRT.grammar.add((&"""
(type_definition (type_definition
(enum_specifier {gStateRT.grammar[^1].grammar}
(type_identifier?)
(enumerator_list
(enumerator+
(identifier)
(number_literal?)
(math_expression?
(number_literal)
)
)
)
)
(type_identifier) (type_identifier)
) )
""", """,
@ -258,33 +220,13 @@ proc initGrammar() =
pEnumCommon(ast, node, gStateRT.data[^1].val, offset, 1) pEnumCommon(ast, node, gStateRT.data[^1].val, offset, 1)
)) ))
# typ function(typ param1, ...) let funcGrammar = &"""
gStateRT.grammar.add(("""
(declaration
(storage_class_specifier?)
(type_qualifier?)
(primitive_type|type_identifier?)
(sized_type_specifier?
(primitive_type?)
)
(struct_specifier|union_specifier?
(type_identifier)
)
(function_declarator? (function_declarator?
(identifier) (identifier)
(parameter_list (parameter_list
(parameter_declaration* (parameter_declaration*
(type_qualifier?) (type_qualifier?)
(primitive_type|type_identifier?) {typeGrammar}
(sized_type_specifier?
(primitive_type?)
)
(struct_specifier|union_specifier?
(type_identifier)
)
(enum_specifier?
(type_identifier)
)
(identifier?) (identifier?)
(pointer_declarator? (pointer_declarator?
(identifier) (identifier)
@ -292,29 +234,17 @@ proc initGrammar() =
) )
) )
) )
"""
# typ function(typ param1, ...)
gStateRT.grammar.add((&"""
(declaration
(storage_class_specifier?)
(type_qualifier?)
{typeGrammar}
{funcGrammar}
(pointer_declarator? (pointer_declarator?
(function_declarator {funcGrammar}
(identifier)
(parameter_list
(parameter_declaration*
(type_qualifier?)
(primitive_type|type_identifier?)
(sized_type_specifier?
(primitive_type?)
)
(struct_specifier|union_specifier?
(type_identifier)
)
(enum_specifier?
(type_identifier)
)
(identifier?)
(pointer_declarator?
(identifier)
)
)
)
)
) )
) )
""", """,