Merge branch 'master' of github.com:ben-marshall/verilog-parser

ben-marshall · Jul 13, 2016 · 06e4c86 · 06e4c86
2 parents 3fe3bd0 + ef5efbf
commit 06e4c86
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/src/verilog_ast.c b/src/verilog_ast.c
@@ -1837,7 +1837,7 @@ ast_port_declaration * ast_new_port_declaration(
     ast_list          * port_names      //!< [in] The names of the ports.
 ){
     ast_port_declaration * tr = ast_calloc(1,sizeof(ast_port_declaration));
-    
+
     tr -> direction   =  direction  ;
     tr -> net_type    =  net_type   ;
     tr -> net_signed  =  net_signed ;
@@ -2141,9 +2141,12 @@ ast_identifier ast_new_identifier(
     unsigned int   from_line  
 ){
     ast_identifier tr = ast_calloc(1,sizeof(struct ast_identifier_t));
+
+    size_t length = strlen(identifier);
+    tr -> identifier = calloc(length, sizeof(char));
+    strcat(tr -> identifier, identifier);
 
     tr -> from_line = from_line;
-    tr -> identifier = identifier;
     tr -> type = ID_UNKNOWN;
     tr -> next = NULL;
     tr -> range_or_idx = ID_HAS_NONE;

diff --git a/src/verilog_parser.h b/src/verilog_parser.h
@@ -10,7 +10,6 @@ as well as an easy way to change the input stream.
 #include "stdio.h"
 
 // Essential to make sure we have access to all of the yy functions.
-#include "verilog_parser.tab.h"
 #include "verilog_preprocessor.h"
 
 #ifndef H_VERILOG_PARSER

diff --git a/src/verilog_parser.y b/src/verilog_parser.y
@@ -1146,24 +1146,34 @@ port_declarations :
 
 port_declaration_l: 
   net_type_o signed_o range_o port_identifier{
+    ast_list * names = ast_list_new();
+    ast_list_append(names, $4);
     $$ = ast_new_port_declaration(PORT_NONE, $1, $2,
-    AST_FALSE,AST_FALSE,NULL,$3);
+    AST_FALSE,AST_FALSE,NULL,names);
 }
 |            signed_o range_o port_identifier{
+    ast_list * names = ast_list_new();
+    ast_list_append(names, $3);
     $$ = ast_new_port_declaration(PORT_NONE, NET_TYPE_NONE, $1,
-    AST_FALSE,AST_FALSE,NULL,$3);
+    AST_FALSE,AST_FALSE,NULL,names);
 }
 | KW_REG     signed_o range_o port_identifier eq_const_exp_o{
+    ast_list * names = ast_list_new();
+    ast_list_append(names, $4);
     $$ = ast_new_port_declaration(PORT_NONE, NET_TYPE_NONE, AST_FALSE,
-    AST_TRUE,AST_FALSE,NULL,$4);
+    AST_TRUE,AST_FALSE,NULL,names);
 }
 | output_variable_type_o      port_identifier{
+    ast_list * names = ast_list_new();
+    ast_list_append(names, $2);
     $$ = ast_new_port_declaration(PORT_NONE, NET_TYPE_NONE, AST_FALSE,
-    AST_FALSE,AST_TRUE,NULL,$2);
+    AST_FALSE,AST_TRUE,NULL,names);
 }
 | output_variable_type        port_identifier eq_const_exp_o{
+    ast_list * names = ast_list_new();
+    ast_list_append(names, $2);
     $$ = ast_new_port_declaration(PORT_NONE, NET_TYPE_NONE, AST_FALSE,
-    AST_FALSE,AST_TRUE,NULL,$2);
+    AST_FALSE,AST_TRUE,NULL,names);
 }
 ;