Merge branch 'master' into netgen-1.5

Extended the code from the last commit to cover cases in which the
definition covers multiple lines; this also is a general handler of the backslash-newline continuation line.
2026-08-27 00:16:37 +02:00 · 2020-07-02 03:00:09 -04:00 · 2020-07-01 16:00:54 -04:00 · 2020-07-01 14:28:00 -04:00 · 2020-07-01 13:11:37 -04:00
4 changed files with 48 additions and 6 deletions
@@ -1 +1 @@
-1.5.148
+1.5.149
@@ -289,6 +289,7 @@ int GetNextLineNoNewline(char *delimiter)
    char *newbuf;
    int testc;
    int nested = 0;
+    int llen;

    if (feof(infile)) return -1;

@@ -306,12 +307,25 @@ int GetNextLineNoNewline(char *delimiter)
 	    linetok = (char *)MALLOC(linesize + 1);
 	}
 	fgets(line, linesize, infile);
-	while (strlen(line) == linesize - 1) {
+	/* Immediately resolve backslash-EOL */
+	llen = strlen(line);
+	while ((llen > 1) && (llen < linesize - 1) && *(line + llen - 2) == '\\') {
+	    *(line + llen - 2) = '\n';
+	    fgets(line + llen - 1, linesize - llen + 1, infile);
+	    llen = strlen(line);
+	}
+	while (llen == linesize - 1) {
 	    newbuf = (char *)MALLOC(linesize + 501);
 	    strcpy(newbuf, line);
 	    FREE(line);
 	    line = newbuf;
 	    fgets(line + linesize - 1, 501, infile);
+	    llen = strlen(line);
+	    while ((llen > 1) && (llen < linesize - 1) && *(line + llen - 2) == '\\') {
+		*(line + llen - 2) = '\n';
+		fgets(line + llen - 1, linesize - llen + 1, infile);
+		llen = strlen(line);
+	    }
 	    linesize += 500;
 	    FREE(linetok);
 	    linetok = (char *)MALLOC(linesize + 1);
@@ -329,7 +343,7 @@ int GetNextLineNoNewline(char *delimiter)
 	    for (s = line; *s != '\0'; s++) {
 		if (*s == '`') {
 		    w = s + 1;
-		    while (isalnum(*w)) w++;
+		    while (isalnum(*w) || (*w == '_') || (*w == '$')) w++;
 		    e = *w;
 		    *w = '\0';
 		    kl = (struct property *)HashLookup(s + 1, definitions);
@@ -365,7 +379,7 @@ int GetNextLineNoNewline(char *delimiter)
 	    for (s = line; *s != '\0'; s++) {
 		if (*s == '`') {
 		    w = s + 1;
-		    while (isalnum(*w)) w++;
+		    while (isalnum(*w) || (*w == '_') || (*w == '$')) w++;
 		    e = *w;
 		    *w = '\0';
 		    kl = (struct property *)HashLookup(s + 1, definitions);
@@ -496,6 +510,24 @@ void GetNextLine(char *delimiter)
    } while (nexttok == NULL);
 }

+/*----------------------------------------------------------------------*/
+/* Return a pointer to the line at the position of nexttok		*/
+/* This is used only when returning the entire line, untokenized, and	*/
+/* is only called by the verilog read routine when reading the value of	*/
+/* a `define statement.							*/
+/*----------------------------------------------------------------------*/
+
+char *GetLineAtTok()
+{
+    char *lpos;
+
+    if (nexttok == NULL) return NULL;
+    if (line == NULL) return NULL;
+
+    lpos = strstr(line, nexttok);
+    return lpos;
+}
+
 /*----------------------------------------------------------------------*/
 /* if nexttok is already NULL, force scanner to read new line		*/
 /*----------------------------------------------------------------------*/
@@ -31,6 +31,7 @@ extern struct hashdict *definitions;
 extern char *nexttok;
 #define SKIPTO(a) do {SkipTok(NULL);} while (!match(nexttok,a))
 extern char *strdtok(char *pstring, char *delim1, char *delim2);
+extern char *GetLineAtTok();
 extern void SkipTok(char *delimiter);
 extern void SkipTokNoNewline(char *delimiter);
 extern void SkipTokComments(char *delimiter);
@@ -1115,10 +1115,17 @@ skip_endmodule:
         kl->slop.dval = 0.01;		// One percent default
      }
      else {
-	 /* Treat the parameter as a string */
+         char *toks;
+
+	 /* Treat the parameter as a string; BUT pull everything to */
+	 /* EOL, not just the current token.			    */
+	 toks = GetLineAtTok();
+
      	 kl->type = PROP_STRING;
-	 kl->pdefault.string = strsave(nexttok);
+	 kl->pdefault.string = strsave(toks);
         kl->slop.dval = 0.0;
+
+	 SkipNewLine(VLOG_DELIMITERS);
      }
      if (kl) HashPtrInstall(kl->key, kl, &verilogdefs);
    }
@@ -1218,9 +1225,11 @@ skip_endmodule:
 		    lhs = LookupObject(nodename, CurrentCell);
 		    *aptr = '[';
 		}
+		else strcpy(noderoot, nexttok);
 	    }
 	    else {
 		lhs = LookupObject(nexttok, CurrentCell);
+		strcpy(noderoot, nexttok);
 	    }
 	    SkipTokComments(VLOG_DELIMITERS);
 	    if (lhs && ((!nexttok) || (!match(nexttok, "=")))) {
Author	SHA1	Message	Date
Tim Edwards	d73b711e3a	Merge branch 'master' into netgen-1.5	2020-07-02 03:00:09 -04:00
Tim Edwards	18739235a9	Extended the code from the last commit to cover cases in which the definition covers multiple lines; this also is a general handler of the backslash-newline continuation line.	2020-07-01 16:00:54 -04:00
Tim Edwards	07c493c796	Corrected the verilog parser's behavior with respect to string definitions: Now correctly parses everything from the definition name to the end of line as the definition value. Also: The search for definitions in the body of the text does not reject non-alphanumerics "_" and "$" in the definition name, without which definition names containing those characters will go unrecongized. Have not yet extended this to multi-line definition values.	2020-07-01 14:28:00 -04:00
Tim Edwards	cca0e4b3f3	Corrected an error in bundle assignment that failed to make a copy of the root name of the LHS net, and so would use the last root name copied, which might have belonged to something entirely different, or nothing at all.	2020-07-01 13:11:37 -04:00
@@ -1 +1 @@
 .5.148
 .5.149