[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeutils/kregexpeditor
From:       Jesper Pedersen <blackie () blackie ! dk>
Date:       2003-10-30 12:51:16
[Download RAW message or body]

CVS commit by blackie: 

fixed bug #66857 - error when using hexidecimal regeps


  M +4 -3      gen_qregexplexer.cpp   1.17
  M +1 -1      limitedcharlineedit.cpp   1.6
  M +3 -2      qregexpparser.l   1.8


--- kdeutils/kregexpeditor/gen_qregexplexer.cpp  #1.16:1.17
@@ -324,10 +324,10 @@ static yyconst int yy_ec[256] =
         6,    7,    8,    9,    1,   10,    1,   11,   12,   12,
        12,   12,   12,   12,   12,   13,   13,   14,    1,    1,
-       15,    1,   16,    1,   17,   18,   17,   19,   17,    1,
+       15,    1,   16,    1,   17,   18,   17,   19,   17,   17,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,   20,    1,    1,    1,   21,    1,    1,    1,
        22,   23,   24,   25,    1,    1,   26,   27,   17,   28,
 
-       17,   29,    1,    1,    1,    1,    1,    1,    1,   29,
+       17,   26,    1,    1,    1,    1,    1,    1,    1,   29,
         1,    1,    1,   29,   30,   29,    1,   29,   31,   32,
         1,    1,   33,   34,   35,    1,    1,    1,    1,    1,
@@ -1913,4 +1913,5 @@ RegExp* parseCharClass( char* match )
           ch = txt.at(i++);
             if ( ch == 'a' || ch == 'A' || ch == 'b' || ch == 'B' || ch == 'c' || ch \
== 'C' || ch == 'd' || ch == 'D' || +                 ch == 'e' || ch == 'E' || ch == \
                'f' || ch == 'F' ||
                  ch == '0' || ch == '1' || ch == '2' || ch == '3' || ch == '4' || ch \
== '5' || ch == '6' || ch == '7' ||   ch == '8' || ch == '9' )

--- kdeutils/kregexpeditor/limitedcharlineedit.cpp  #1.5:1.6
@@ -35,5 +35,5 @@ public:
     if ( _mode == LimitedCharLineEdit::NORMAL ||
          (_mode == LimitedCharLineEdit::HEX &&
-          QRegExp(QString::fromLocal8Bit("^[0-9A-Ea-e]*$")).search( txt ) != -1) ||
+          QRegExp(QString::fromLocal8Bit("^[0-9A-Fa-f]*$")).search( txt ) != -1) ||
          (_mode == LimitedCharLineEdit::OCT &&
           QRegExp(QString::fromLocal8Bit("^[0-7]*$")).search( txt ) != -1 ) ) {

--- kdeutils/kregexpeditor/qregexpparser.l  #1.7:1.8
@@ -33,5 +33,5 @@ BackRef  \\[1-9][0-9]*
 CharClass \[^?\]?[^]]*\]
 Range \{[0-9]*(,[0-9]*)?\}
-HexChar \\x[0-9a-eA-E]{1,4}
+HexChar \\x[0-9a-fA-F]{1,4}
 OctChar \\0[0-7]{1,4}
 SpecialEsc \\[afnrtv]
@@ -251,4 +251,5 @@ RegExp* parseCharClass( char* match )
           ch = txt.at(i++);
             if ( ch == 'a' || ch == 'A' || ch == 'b' || ch == 'B' || ch == 'c' || ch \
== 'C' || ch == 'd' || ch == 'D' || +                 ch == 'e' || ch == 'E' || ch == \
                'f' || ch == 'F' ||
                  ch == '0' || ch == '1' || ch == '2' || ch == '3' || ch == '4' || ch \
== '5' || ch == '6' || ch == '7' ||   ch == '8' || ch == '9' )


[prev in list] [next in list] [prev in thread] [next in thread]