Merge branch 'master' into work

Update at Fri Jun 1 08:47:33 EDT 2018 by tim
Added a missing top-level clean to the Makefile, which is mainly
2026-08-25 23:47:06 +02:00 · 2018-06-01 08:47:34 -04:00 · 2018-06-01 08:47:33 -04:00 · 2018-06-01 08:46:52 -04:00 · 2018-05-28 21:39:13 -04:00 · 2018-05-28 21:39:11 -04:00
5 changed files with 4 additions and 10 deletions
@@ -1,7 +1,6 @@
 netgen
 netgenexec
 defs.mak
-Depend
 config.cache
 config.log
 config.status
@@ -78,6 +78,7 @@ install-tcl-real: install-tcl-dirs
 clean:
 	for dir in ${MODULES} ${PROGRAMS} ${UNUSED_MODULES}; do \
 		(cd $$dir && ${MAKE} clean); done
+	${RM} *.tmp */*.tmp *.sav */*.sav *.log TAGS tags

 distclean:
 	touch defs.mak
@@ -1 +1 @@
-1.5.99
+1.5.102
@@ -884,6 +884,7 @@ skip_endmodule:

         while (nexttok != NULL) {
 	    char *paramname;
+
 	    SkipTok(VLOG_DELIMITERS2);
 	    while (match(nexttok, "//")) {
 		SkipNewLine(VLOG_DELIMITERS);
@@ -896,14 +897,7 @@ skip_endmodule:

 	    // We need to look for parameters of the type ".name(value)"

-	    SkipTok(VLOG_DELIMITERS2);
-	    while (match(nexttok, "//")) {
-		SkipNewLine(VLOG_DELIMITERS);
-		SkipTok(VLOG_DELIMITERS2);
-	    }
-	    if (nexttok[0] != '.') {
-	        Printf("Badly formed subcircuit parameter line at \"%s\"\n", nexttok);
-	    }
+	    if (nexttok[0] != '.') break;
 	    else {
 		paramname = strsave(nexttok + 1);
 	        SkipTok(VLOG_DELIMITERS2);
Author	SHA1	Message	Date
Tim Edwards	821145f9c1	Merge branch 'master' into work	2018-06-01 08:47:34 -04:00
Tim Edwards	6eb1efd55a	Update at Fri Jun 1 08:47:33 EDT 2018 by tim	2018-06-01 08:47:33 -04:00
Tim Edwards	6d569ca396	Added a missing top-level clean to the Makefile, which is mainly responsible for removing the log files. Otherwise the log files just keep accumulating output forever.	2018-06-01 08:46:52 -04:00
Tim Edwards	7a0bff846f	Merge branch 'master' into work	2018-05-28 21:39:13 -04:00
Tim Edwards	ced1299351	Update at Mon May 28 21:39:11 EDT 2018 by tim	2018-05-28 21:39:11 -04:00
Tim Edwards	f213376bfd	Removed "Depend" from the .gitignore file, as compilation depends on it and fails the first time if it does not exist, requiring running "make" twice (which is not advertised in the build instructions).	2018-05-28 21:37:35 -04:00
Tim Edwards	223b197b71	Merge branch 'master' into work	2018-05-23 13:05:17 -04:00
Tim Edwards	f0eb14be5e	Update at Wed May 23 13:05:15 EDT 2018 by tim	2018-05-23 13:05:15 -04:00
Tim Edwards	534ea839c0	Revised the verilog parser to correctly identify and parse parameters passed to instances, so that these can match critical parameters in the SPICE netlist being compared against.	2018-05-23 13:04:31 -04:00
@@ -1 +1 @@
 .5.99
 .5.102