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

Merge branch 'master' into netgen-1.5

This commit is contained in:
Tim Edwards 2024-01-04 02:00:02 -05:00
parent bf53d52970 eb27a18ae3
commit 93b9cf6577
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.264 1.5.265

4
base/netcmp.c
View File

@ -6124,7 +6124,9 @@ PropertyMatch(struct Element *E1, struct Element *E2,
if (kl2 != NULL) if (kl2 != NULL)
break; // Property is required break; // Property is required
} }
else if (vl2->value.ival != 1) else if ((vl2->type == PROP_INTEGER) && (vl2->value.ival != 1))
break; // Property M != 1 or S != 1 is a mismatch.
else if ((vl2->type == PROP_DOUBLE) && (vl2->value.dval != 1))
break; // Property M != 1 or S != 1 is a mismatch. break; // Property M != 1 or S != 1 is a mismatch.
} }
if (vl2->type != PROP_ENDLIST) { if (vl2->type != PROP_ENDLIST) {

16
base/netfile.c
View File

@ -587,6 +587,12 @@ void SkipTokNoNewline(char *delimiter)
/* */ /* */
/* Modified 3/30/2015 to include the condition where a comment line is */ /* Modified 3/30/2015 to include the condition where a comment line is */
/* in the middle of a series of continuation lines. */ /* in the middle of a series of continuation lines. */
/* */
/* Modified 1/3/2024 to avoid skipping two lines if a line has only the */
/* comment character '*' followed by a newline. It seems that '\n' is */
/* being ignored in WHITESPACE_DELIMITER, but it's easier to write the */
/* code to find the exception rather than track down the problem in */
/* GetNextLine(). */
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
void SpiceTokNoNewline(void) void SpiceTokNoNewline(void)
@ -598,8 +604,14 @@ void SpiceTokNoNewline(void)
while (nexttok == NULL) { while (nexttok == NULL) {
contline = getc(infile); contline = getc(infile);
if (contline == '*') { if (contline == '*') {
GetNextLine(WHITESPACE_DELIMITER); char testline = ' ';
SkipNewLine(NULL); while ((testline == ' ') || (testline == '\t'))
testline = getc(infile);
if (testline != '\n') {
ungetc(testline, infile);
GetNextLine(WHITESPACE_DELIMITER);
SkipNewLine(NULL);
}
continue; continue;
} }
else if (contline != '+') { else if (contline != '+') {