Support negative defined values (#3001)

neuronsimulator · Jul 18, 2024 · c48d7d5 · c48d7d5
1 parent b925999
commit c48d7d5
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/src/nmodl/parse1.ypp b/src/nmodl/parse1.ypp
@@ -172,14 +172,26 @@ model: MODEL line
 line:	{$$ = inputline();}
 	;
 define1: DEFINE1 NAME INTEGER
-		/* all subsequent occurences of NAME will be replaced
-			by integer during parseing.  See 'integer:' */
-	{ Symbol *sp = SYM($2);
-	 if (sp->subtype)
-		diag(sp->name, " used before DEFINEed");
-	 sp->u.str = STR($3);
-	 sp->type = DEFINEDVAR;
-	 deltokens($1, $3);}
+	/* all subsequent occurences of NAME will be replaced
+	   by integer during parseing.  See 'integer:' */
+	{
+	    Symbol *sp = SYM($2);
+	    if (sp->subtype)
+	        diag(sp->name, " used before DEFINEed");
+	    sp->u.str = STR($3);
+	    sp->type = DEFINEDVAR;
+	    deltokens($1, $3);
+	}
+	| DEFINE1 NAME '-' INTEGER
+	{
+	   Symbol *sp = SYM($2);
+	   if (sp->subtype)
+	       diag(sp->name, " used before DEFINEed");
+	   Sprintf(buf, "-%s", STR($4));
+	   sp->u.str = stralloc(buf, nullptr);
+	   sp->type = DEFINEDVAR;
+	   deltokens($1, $4);
+    }
 	| DEFINE1 error {myerr("syntax: DEFINE name integer");}
 	;
 Name:	NAME