luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix space errors in various files

This commit is contained in:
Cary R 2012-08-16 11:06:20 -07:00
parent 0d61f7384d
commit 4313fbbf1f
7 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -241,7 +241,7 @@ version.exe: $(srcdir)/version.c $(srcdir)/version_base.h version_tag.h
%.o: %.cc config.h
$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep/$*.d
# Here are some explicit dependencies needed to get things going.
main.o: main.cc version_tag.h

11
configure.in
View File

@ -92,8 +92,8 @@ fi
AC_LANG(C++)
AC_ARG_WITH([m32], [AC_HELP_STRING([--with-m32], [Compile 32-bit on x86_64])],
[ with_m32=yes ],[ with_m32=no ])
[ with_m32=yes ],[ with_m32=no ])
AS_IF( [test "x$with_m32" = xyes],
[ AC_MSG_NOTICE([Compiling for 32-bit environment - needs gcc on x86_64])
LDTARGETFLAGS="-m elf_i386"
@ -325,11 +325,4 @@ AC_MSG_ERROR(cannot configure white space in libdir: $libdir)
fi
AC_MSG_RESULT(ok)
# XXX disable tgt-fpga for the moment
#
# Ensure compiler target options go in...
AC_OUTPUT(Makefile ivlpp/Makefile vhdlpp/Makefile vvp/Makefile vpi/Makefile driver/Makefile driver-vpi/Makefile cadpli/Makefile libveriuser/Makefile tgt-null/Makefile tgt-stub/Makefile tgt-vvp/Makefile tgt-vhdl/Makefile tgt-fpga/Makefile tgt-verilog/Makefile tgt-pal/Makefile tgt-vlog95/Makefile tgt-pcb/Makefile)

4
parse.y
View File

@ -4407,7 +4407,7 @@ var_type
;
param_type
:
:
{ param_active_range = 0;
param_active_signed = false;
param_active_type = IVL_VT_LOGIC;
@ -4449,7 +4449,7 @@ param_type
}
;
/* parameter and localparam assignment lists are broken into
/* parameter and localparam assignment lists are broken into
separate BNF so that I can call slightly different parameter
handling code. localparams parse the same as parameters, they
just behave differently when someone tries to override them. */

2
pform.cc
View File

@ -473,7 +473,7 @@ data_type_t* pform_test_type_identifier(const char*txt)
cur = cur_scope->typedefs.find(name);
if (cur != cur_scope->typedefs.end())
return cur->second;
cur_scope = cur_scope->parent_scope();
} while (cur_scope);
return 0;

2
vhdlpp/expression_emit.cc
View File

@ -449,7 +449,7 @@ int ExpConditional::emit(ostream&out, Entity*ent, Architecture*arc)
// expressions to close.
for (size_t idx = 1 ; idx < else_clause_.size() ; idx += 1)
out << ")";
return errors;
}

4
vvp/lexor.lex
View File

@ -4,7 +4,7 @@
%{
/*
* Copyright (c) 2001-2011 Stephen Williams (steve@icarus.com)
* Copyright (c) 2001-2012 Stephen Williams (steve@icarus.com)
*
* This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU
@ -270,7 +270,7 @@ static char* strdupnew(char const *str)
yylval.text = strdup(yytext);
assert(yylval.text);
return T_SYMBOL; }
"/INPUT" { return K_PORT_INPUT; }
"/OUTPUT" { return K_PORT_OUTPUT; }
"/INOUT" { return K_PORT_INOUT; }

14
vvp/parse.y
View File

@ -1,7 +1,7 @@
%{
/*
* Copyright (c) 2001-2011 Stephen Williams (steve@icarus.com)
* Copyright (c) 2001-2012 Stephen Williams (steve@icarus.com)
*
* This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU
@ -68,7 +68,7 @@ static struct __vpiModPath*modpath_dst = 0;
vpiHandle vpi;
vvp_delay_t*cdelay;
int vpi_enum;
};
@ -633,7 +633,6 @@ statement
T_NUMBER T_NUMBER T_NUMBER ',' T_SYMBOL ';'
{ compile_scope_decl($1, $3, $5, $6, $14, $7, $8, $10, $11, $12); }
/* Legacy declaration that does not have `celldefine information. */
| T_LABEL K_SCOPE T_SYMBOL ',' T_STRING T_STRING T_NUMBER T_NUMBER ','
@ -656,9 +655,10 @@ statement
/* Port information for scopes... currently this is just meta-data for VPI queries */
| K_PORT_INFO T_NUMBER port_type T_NUMBER T_STRING
{ compile_port_info( $2 /* port_index */, $3, $4 /* width */, $5 /*&name */ ); }
| K_PORT_INFO T_NUMBER port_type T_NUMBER T_STRING
{ compile_port_info( $2 /* port_index */, $3, $4 /* width */,
$5 /*&name */ ); }
| K_TIMESCALE T_NUMBER T_NUMBER';'
{ compile_timescale($2, $3); }
| K_TIMESCALE '-' T_NUMBER T_NUMBER';'
@ -1077,7 +1077,7 @@ port_type
: K_PORT_INPUT { $$ = vpiInput; }
| K_PORT_OUTPUT { $$ = vpiOutput; }
| K_PORT_INOUT { $$ = vpiInout; }
| K_PORT_MIXED { $$ = vpiMixedIO; }
| K_PORT_MIXED { $$ = vpiMixedIO; }
| K_PORT_NODIR { $$ = vpiNoDirection; }
;