expressions: Minor error message improvement.

diff --git a/src/language/expressions/parse.c b/src/language/expressions/parse.c
index 7b723fb18a7e43fdb99efe2ab9e31660ba63fd59..3a4466ad55e4cf8e93fc60b6d1573f6bd20c5a0d 100644 (file)
--- a/src/language/expressions/parse.c
+++ b/src/language/expressions/parse.c
@@ -993,7 +993,7 @@ parse_primary__ (struct lexer *lexer, struct expression *e)
       }
 
     default:
-      lex_error (lexer, NULL);
+      lex_error (lexer, _("Syntax error parsing expression."));
       return NULL;
     }
 }

diff --git a/tests/language/control/do-if.at b/tests/language/control/do-if.at
index 6281a0fd680b1c60f5148bf9f4e831a7cc83b4ea..078ab9a099e07f488290048d6d36769c76277620 100644 (file)
--- a/tests/language/control/do-if.at
+++ b/tests/language/control/do-if.at
@@ -128,7 +128,7 @@ AT_CHECK([pspp -O format=csv do-if.sps], [1], [dnl
    15 | DO IF 0.
       | ^~~~~~~~"
 
-"do-if.sps:20.7: error: DO IF: Syntax error.
+"do-if.sps:20.7: error: DO IF: Syntax error parsing expression.
    20 | DO IF !.
       |       ^"
 

diff --git a/tests/language/control/loop.at b/tests/language/control/loop.at
index 23ab6b5b1873cd556f25c7661b70696ae9a6a195..ce066d8c46e62cd0022ed5acdd4d8bf8abb5024b 100644 (file)
--- a/tests/language/control/loop.at
+++ b/tests/language/control/loop.at
@@ -325,15 +325,15 @@ loop.sps:9.8: error: LOOP: Syntax error expecting `='.
     9 | LOOP B !.
       |        ^
 
-loop.sps:11.8: error: LOOP: Syntax error.
+loop.sps:11.8: error: LOOP: Syntax error parsing expression.
    11 | LOOP B=!.
       |        ^
 
-loop.sps:13.13: error: LOOP: Syntax error.
+loop.sps:13.13: error: LOOP: Syntax error parsing expression.
    13 | LOOP A=1 TO !.
       |             ^
 
-loop.sps:15.13: error: LOOP: Syntax error.
+loop.sps:15.13: error: LOOP: Syntax error parsing expression.
    15 | LOOP A=1 BY !.
       |             ^
 
@@ -357,11 +357,11 @@ loop.sps:26.11-26.12: error: LOOP: Subcommand IF may only be specified once.
    26 | LOOP IF 1 IF 0.
       |           ^~
 
-loop.sps:29.9: error: LOOP: Syntax error.
+loop.sps:29.9: error: LOOP: Syntax error parsing expression.
    29 | LOOP IF !.
       |         ^
 
-loop.sps:33.13: error: LOOP: Syntax error.
+loop.sps:33.13: error: LOOP: Syntax error parsing expression.
    33 | END LOOP IF !.
       |             ^
 

diff --git a/tests/language/data-io/inpt-pgm.at b/tests/language/data-io/inpt-pgm.at
index 87418c2cb40725f2a5bdebab89a7287e42afbd59..77a50018415d1f9dfac61c909e2ec24b4c2ed5d6 100644 (file)
--- a/tests/language/data-io/inpt-pgm.at
+++ b/tests/language/data-io/inpt-pgm.at
@@ -383,7 +383,7 @@ AT_CHECK([pspp --testing-mode -O format=csv insert.sps], [1], [dnl
     2 | REREAD COLUMN=1 COLUMN=**.
       |                 ^~~~~~"
 
-"reread.sps:6.15-6.16: error: REREAD: Syntax error.
+"reread.sps:6.15-6.16: error: REREAD: Syntax error parsing expression.
     6 | REREAD COLUMN=**.
       |               ^~"
 

diff --git a/tests/language/data-io/print-space.at b/tests/language/data-io/print-space.at
index 9cd621cf52592cb11623bba3d5644c979f6c4869..e5c573333f3840fe646d79e46884b82f6994c549 100644 (file)
--- a/tests/language/data-io/print-space.at
+++ b/tests/language/data-io/print-space.at
@@ -117,7 +117,7 @@ AT_CHECK([pspp -O format=csv print-space.sps], [1], [dnl
     3 | PRINT SPACE OUTFILE='out.txt' ENCODING=**.
       |                                        ^~"
 
-"print-space.sps:4.13-4.14: error: PRINT SPACE: Syntax error.
+"print-space.sps:4.13-4.14: error: PRINT SPACE: Syntax error parsing expression.
     4 | PRINT SPACE **.
       |             ^~"
 

diff --git a/tests/language/expressions/evaluate.at b/tests/language/expressions/evaluate.at
index 4cce31d174e8d5024d7626e99631feeecfa21ce7..add2e11c6ac6308058b0ee2a9d0677aea623cf79 100644 (file)
--- a/tests/language/expressions/evaluate.at
+++ b/tests/language/expressions/evaluate.at
@@ -751,7 +751,7 @@ c').  To disable this warning, insert parentheses.
 
 2 le 2 => true
 
-evaluate.sps:25.21: error: DEBUG EVALUATE: Syntax error.
+evaluate.sps:25.21: error: DEBUG EVALUATE: Syntax error parsing expression.
    25 | DEBUG EVALUATE /2 < = 2.
       |                     ^
 
@@ -954,7 +954,7 @@ for opt in OPT NOOPT; do
 
 2 ge 2 => true
 
-evaluate.sps:8.21: error: DEBUG EVALUATE: Syntax error.
+evaluate.sps:8.21: error: DEBUG EVALUATE: Syntax error parsing expression.
     8 | DEBUG EVALUATE /2 > = 2.
       |                     ^
 
@@ -1124,7 +1124,7 @@ evaluate.sps:36.27-36.30: note: DEBUG EVALUATE: This operand has type 'number'.
 
 'asdf       ' ~= "asdf   " => false
 
-evaluate.sps:41.21: error: DEBUG EVALUATE: Syntax error.
+evaluate.sps:41.21: error: DEBUG EVALUATE: Syntax error parsing expression.
    41 | DEBUG EVALUATE /1 < > 1.
       |                     ^