Fix line number reporting in unclosed #else condition

riiengineering · Feb 8, 2024 · d2a6015 · d2a6015
1 parent 6db2e5e
commit d2a6015
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 1 deletion.
diff --git a/test/39-ifelse-unclosed/expect.err b/test/39-ifelse-unclosed/expect.err
@@ -0,0 +1 @@
+test/39-ifelse-unclosed/input:5: error: unclosed #if (opened at test/39-ifelse-unclosed/input:2)
diff --git a/test/39-ifelse-unclosed/expect.out b/test/39-ifelse-unclosed/expect.out
@@ -0,0 +1 @@
+X is defined.
diff --git a/test/39-ifelse-unclosed/expect.status b/test/39-ifelse-unclosed/expect.status
@@ -0,0 +1 @@
+1
diff --git a/test/39-ifelse-unclosed/input b/test/39-ifelse-unclosed/input
@@ -0,0 +1,5 @@
+#define X 42
+#ifdef X
+X is defined.
+#else
+X is not defined.
diff --git a/ygpp b/ygpp
@@ -215,6 +215,15 @@ function p_pop(p_name, type,   _ov) {
 	return _ov
 }
 
+function p_set(p_name, v) {
+	# update the value of the top of the p_stack,
+	# this is used for switching conditional branches (if/switch)
+
+	if (p_isempty(p_name)) return
+	p_stacks[p_name, p_stacks[p_name, "p_last"]] = v
+	_p_update(p_name)
+}
+
 function p_last(p_name, info) {
 	return p_stacks[p_name, p_stacks[p_name, "p_last"] (info ? "."info : "")]
 }
@@ -278,7 +287,7 @@ function eval_input(p_name,    _iname, _res, _x) {
 	} else if (_iname == "ifndef") {
 		p_push(p_name, "if", !isdef($2))
 	} else if (_iname == "else") {
-		p_push(p_name, "if", !p_pop(p_name, "if"))
+		p_set(p_name, !p_last(p_name))
 	} else if (_iname == "endif") {
 		p_pop(p_name, "if")
 	} else if (_iname == "define") {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		test/39-ifelse-unclosed/input:5: error: unclosed #if (opened at test/39-ifelse-unclosed/input:2)