- Better Any/Dot implementation

diff --git a/re2c/actions.cc b/re2c/actions.cc
index bfa2cfea38984282672df64e045ba348a144c26b..c733b8ebf68e20a9199abe422ec2b1724cea6f26 100644 (file)
--- a/re2c/actions.cc
+++ b/re2c/actions.cc
@@ -854,12 +854,24 @@ RegExp * Scanner::ranToRE(SubStr s) const
        return new MatchOp(r);
 }
 
+RegExp * Scanner::getAnyRE() const
+{
+       if (eFlag)
+       {
+               return ranToRE(SubStr("[\\000-\\377]"));
+       }
+       else
+       {
+               return new MatchOp(new Range(0, nRealChars));
+       }
+}
+
 RegExp * Scanner::invToRE(SubStr s) const
 {
        s.len--;
        s.str++;
        
-       RegExp * any = ranToRE(SubStr(wFlag ? "[\\X0000-\\XFFFF]" : "[\\000-\\377]"));
+       RegExp * any = getAnyRE();
 
        if (s.len <= 2)
        {
@@ -877,7 +889,7 @@ RegExp * Scanner::invToRE(SubStr s) const
 
 RegExp * Scanner::mkDot() const
 {
-       RegExp * any = ranToRE(SubStr(wFlag ? "[\\X0000-\\XFFFF]" : "[\\000-\\377]"));
+       RegExp * any = getAnyRE();
        RegExp * ran = matchChar(xlat('\n'));
        RegExp * inv = mkDiff(any, ran);
        

diff --git a/re2c/scanner.h b/re2c/scanner.h
index f03604f18c8ace67554b9694ce7647ef098bd211..9a646e223ac2996ce183b80148e7b6f0e427e1fa 100644 (file)
--- a/re2c/scanner.h
+++ b/re2c/scanner.h
@@ -66,6 +66,7 @@ public:
        RegExp * strToRE(SubStr s) const;
        RegExp * strToCaseInsensitiveRE(SubStr s) const;
        RegExp * ranToRE(SubStr s) const;
+       RegExp * getAnyRE() const;
        RegExp * invToRE(SubStr s) const;
        RegExp * mkDot() const;
 };