From ee762ccd32ca19ab46514f59998c0ebb4919522a Mon Sep 17 00:00:00 2001
From: Erwan Jahier <jahier@imag.fr>
Date: Wed, 30 Jan 2008 17:12:11 +0100
Subject: [PATCH] src/lexer.mll: ident where not authorized to begin by
"_"...
---
src/lexer.mll | 6 +++---
src/test/Makefile | 2 +-
src/test/test.res | 2 +-
src/test/test.res.exp | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/lexer.mll b/src/lexer.mll
index 9be7c57a..c6a846b9 100644
--- a/src/lexer.mll
+++ b/src/lexer.mll
@@ -219,9 +219,9 @@ rule lexer = parse
| "<" { TK_LT ( Lxm.make lexbuf ) }
| ">" { TK_GT ( Lxm.make lexbuf ) }
(* identificateur pointé *)
- | ['A'-'Z' 'a'-'z'] ['A'-'Z' 'a'-'z' '\'' '_' '0'-'9'] *
+ | ['_' 'A'-'Z' 'a'-'z'] ['A'-'Z' 'a'-'z' '\'' '_' '0'-'9'] *
':' ':'
- ['A'-'Z' 'a'-'z'] ['A'-'Z' 'a'-'z' '\'' '_' '0'-'9'] *
+ ['_' 'A'-'Z' 'a'-'z'] ['A'-'Z' 'a'-'z' '\'' '_' '0'-'9'] *
{
let lxm = Lxm.make lexbuf in
TK_LONGIDENT (lxm)
@@ -236,7 +236,7 @@ rule lexer = parse
| '.' chiffres (exposant)? { TK_RCONST (Lxm.make lexbuf ) }
(* mot-clé ou identificateur *)
- | ['A'-'Z' 'a'-'z'] ['A'-'Z' 'a'-'z' '\'' '_' '0'-'9'] *
+ | ['_' 'A'-'Z' 'a'-'z'] ['A'-'Z' 'a'-'z' '\'' '_' '0'-'9'] *
{
let lxm = Lxm.make lexbuf in
let x = is_a_keyword ( Lxm.str lxm ) in
diff --git a/src/test/Makefile b/src/test/Makefile
index eeeaedbd..a77e031c 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -55,7 +55,7 @@ test:
echo " " >> test.res; echo "====> $(LC) pfs.lus" >> test.res
$(LC) pfs.lus >> test.res 2>&1 || true
\
- diff -u test.res.exp test.res > test.diff || cat test.diff ; echo "cf test.diff"
+ diff -u test.res.exp test.res > test.diff || (cat test.diff ; echo "cf test.diff")
utest:
cp test.res test.res.exp
diff --git a/src/test/test.res b/src/test/test.res
index c95b4887..0eac2a13 100644
--- a/src/test/test.res
+++ b/src/test/test.res
@@ -634,5 +634,5 @@ End of Syntax table dump.
const DELTA = 0.500000
====> ../lus2lic -vl 3 pfs.lus
-Error. '_' (file:pfs.lus, line:39, col:7 to 7):
+Error. '[' (file:pfs.lus, line:40, col:18 to 18):
---> syntax error
diff --git a/src/test/test.res.exp b/src/test/test.res.exp
index c95b4887..0eac2a13 100644
--- a/src/test/test.res.exp
+++ b/src/test/test.res.exp
@@ -634,5 +634,5 @@ End of Syntax table dump.
const DELTA = 0.500000
====> ../lus2lic -vl 3 pfs.lus
-Error. '_' (file:pfs.lus, line:39, col:7 to 7):
+Error. '[' (file:pfs.lus, line:40, col:18 to 18):
---> syntax error
--
GitLab