diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2015-12-20 09:37:34 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-12-20 09:39:51 (GMT) |
| commit | 4bef27771fec1892331df637dd6184abac36fd8f (patch) | |
| tree | 76c9d48141c37b2986c00c1669b100b80de2f416 /vhdlparser/vhdlparser.jj | |
| parent | da09bff6dc9cad40c72b6a858728093cc41dff47 (diff) | |
| download | Doxygen-4bef27771fec1892331df637dd6184abac36fd8f.zip Doxygen-4bef27771fec1892331df637dd6184abac36fd8f.tar.gz Doxygen-4bef27771fec1892331df637dd6184abac36fd8f.tar.bz2 | |
Bug 758495 - Bug in VHDL parser + other fixes
Diffstat (limited to 'vhdlparser/vhdlparser.jj')
| -rw-r--r-- | vhdlparser/vhdlparser.jj | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj index 7b56cef..2886d29 100644 --- a/vhdlparser/vhdlparser.jj +++ b/vhdlparser/vhdlparser.jj @@ -1367,10 +1367,10 @@ QCString index_subtype_definition() : {QCString s;} s=type_mark() <RANGE_T> <BOX_T> { return s+" range <> ";} } -QCString instantiation_unit() : {QCString s,s1,s2;Token *tok=0;} +QCString instantiation_unit() : {QCString s,s1,s2;} { -[ tok=<COMPONENT_T> ] s=identifier() {s1="component"; return s; } -| tok=<ENTITY_T> s2=name() {s=tok->image.c_str()+s2;} [ <LPAREN_T> s1=identifier() <RPAREN_T> {s+="(";s+=s1;s+=")" ;}] { return s;} +[ <COMPONENT_T> ] s=identifier() {s1="component "; return s; } +| <ENTITY_T> [LOOKAHEAD(2)<BASIC_IDENTIFIER> <DOT_T>] s2=name() {s="entity "+s2;} [ <LPAREN_T> s1=identifier() <RPAREN_T> {s+="(";s+=s1;s+=")" ;}] { return s;} | <CONFIGURATION_T> s=name() {s1="configuration ";return s;} } |