Changeset 561 for trunk/src/gui/text/qcssscanner.cpp
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/gui/text/qcssscanner.cpp (modified) (45 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/gui/text/qcssscanner.cpp
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the QtGui module of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 47 47 48 48 inline QChar next() { 49 return (pos < input.length()) ? input.at(pos++) .toLower(): QChar();49 return (pos < input.length()) ? input.at(pos++) : QChar(); 50 50 } 51 51 int handleCommentStart(); … … 74 74 int token = -1; 75 75 QChar ch; 76 76 77 77 // initial state 78 78 ch = next(); … … 147 147 if (ch.unicode() == 95) 148 148 goto state_24; 149 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)149 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 150 150 goto state_24; 151 151 if (ch.unicode() == 123) … … 197 197 if (ch.unicode() >= 93 && ch.unicode() <= 96) 198 198 goto state_30; 199 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)199 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 200 200 goto state_30; 201 201 if (ch.unicode() >= 123) … … 212 212 if (ch.unicode() == 95) 213 213 goto state_33; 214 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)214 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 215 215 goto state_33; 216 216 goto out; … … 233 233 if (ch.unicode() >= 93 && ch.unicode() <= 96) 234 234 goto state_35; 235 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)235 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 236 236 goto state_35; 237 237 if (ch.unicode() >= 123) … … 256 256 if (ch.unicode() == 95) 257 257 goto state_24; 258 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)258 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 259 259 goto state_24; 260 260 goto out; … … 291 291 if (ch.unicode() == 95) 292 292 goto state_46; 293 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)293 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 294 294 goto state_46; 295 295 goto out; … … 311 311 if (ch.unicode() == 95) 312 312 goto state_50; 313 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)313 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 314 314 goto state_50; 315 315 goto out; … … 341 341 if (ch.unicode() == 95) 342 342 goto state_53; 343 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)343 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 344 344 goto state_53; 345 345 goto out; … … 401 401 if (ch.unicode() >= 93 && ch.unicode() <= 96) 402 402 goto state_30; 403 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)403 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 404 404 goto state_30; 405 405 if (ch.unicode() >= 123) … … 441 441 if (ch.unicode() == 95) 442 442 goto state_61; 443 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)443 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 444 444 goto state_61; 445 445 goto out; … … 475 475 if (ch.unicode() >= 93 && ch.unicode() <= 96) 476 476 goto state_35; 477 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)477 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 478 478 goto state_35; 479 479 if (ch.unicode() >= 123) … … 524 524 if (ch.unicode() == 95) 525 525 goto state_46; 526 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)526 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 527 527 goto state_46; 528 528 goto out; … … 537 537 if (ch.unicode() == 95) 538 538 goto state_46; 539 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)539 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 540 540 goto state_46; 541 541 goto out; … … 561 561 if (ch.unicode() == 95) 562 562 goto state_46; 563 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)563 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 564 564 goto state_46; 565 565 goto out; … … 589 589 if (ch.unicode() == 95) 590 590 goto state_71; 591 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)591 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 592 592 goto state_71; 593 593 goto out; … … 603 603 if (ch.unicode() == 95) 604 604 goto state_50; 605 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)605 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 606 606 goto state_50; 607 607 goto out; … … 631 631 if (ch.unicode() == 95) 632 632 goto state_75; 633 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)633 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 634 634 goto state_75; 635 635 goto out; … … 648 648 if (ch.unicode() == 95) 649 649 goto state_53; 650 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)650 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 651 651 goto state_53; 652 652 goto out; … … 669 669 if (ch.unicode() == 95) 670 670 goto state_53; 671 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)671 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 672 672 goto state_53; 673 673 goto out; … … 703 703 if (ch.unicode() >= 93 && ch.unicode() <= 96) 704 704 goto state_30; 705 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)705 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 706 706 goto state_30; 707 707 if (ch.unicode() >= 123) … … 726 726 if (ch.unicode() >= 93 && ch.unicode() <= 96) 727 727 goto state_30; 728 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)728 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 729 729 goto state_30; 730 730 if (ch.unicode() >= 123) … … 749 749 if (ch.unicode() >= 93 && ch.unicode() <= 96) 750 750 goto state_30; 751 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)751 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 752 752 goto state_30; 753 753 if (ch.unicode() >= 123) … … 774 774 if (ch.unicode() >= 93 && ch.unicode() <= 96) 775 775 goto state_30; 776 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)776 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 777 777 goto state_30; 778 778 if (ch.unicode() >= 123) … … 791 791 if (ch.unicode() == 95) 792 792 goto state_61; 793 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)793 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 794 794 goto state_61; 795 795 goto out; … … 819 819 if (ch.unicode() == 95) 820 820 goto state_61; 821 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)821 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 822 822 goto state_61; 823 823 goto out; … … 840 840 if (ch.unicode() >= 93 && ch.unicode() <= 96) 841 841 goto state_35; 842 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)842 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 843 843 goto state_35; 844 844 if (ch.unicode() >= 123) … … 863 863 if (ch.unicode() >= 93 && ch.unicode() <= 96) 864 864 goto state_35; 865 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)865 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 866 866 goto state_35; 867 867 if (ch.unicode() >= 123) … … 886 886 if (ch.unicode() >= 93 && ch.unicode() <= 96) 887 887 goto state_35; 888 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)888 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 889 889 goto state_35; 890 890 if (ch.unicode() >= 123) … … 911 911 if (ch.unicode() >= 93 && ch.unicode() <= 96) 912 912 goto state_35; 913 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)913 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 914 914 goto state_35; 915 915 if (ch.unicode() >= 123) … … 930 930 if (ch.unicode() == 95) 931 931 goto state_46; 932 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)932 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 933 933 goto state_46; 934 934 goto out; … … 945 945 if (ch.unicode() == 95) 946 946 goto state_71; 947 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)947 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 948 948 goto state_71; 949 949 goto out; … … 960 960 if (ch.unicode() == 95) 961 961 goto state_71; 962 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)962 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 963 963 goto state_71; 964 964 goto out; … … 995 995 if (ch.unicode() == 95) 996 996 goto state_75; 997 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)997 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 998 998 goto state_75; 999 999 goto out; … … 1010 1010 if (ch.unicode() == 95) 1011 1011 goto state_75; 1012 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)1012 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 1013 1013 goto state_75; 1014 1014 goto out; … … 1040 1040 if (ch.unicode() == 95) 1041 1041 goto state_53; 1042 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)1042 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 1043 1043 goto state_53; 1044 1044 goto out; … … 1061 1061 if (ch.unicode() >= 93 && ch.unicode() <= 96) 1062 1062 goto state_30; 1063 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)1063 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 1064 1064 goto state_30; 1065 1065 if (ch.unicode() >= 123) … … 1078 1078 if (ch.unicode() == 95) 1079 1079 goto state_61; 1080 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)1080 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 1081 1081 goto state_61; 1082 1082 goto out; … … 1099 1099 if (ch.unicode() >= 93 && ch.unicode() <= 96) 1100 1100 goto state_35; 1101 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)1101 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 1102 1102 goto state_35; 1103 1103 if (ch.unicode() >= 123) … … 1116 1116 if (ch.unicode() == 95) 1117 1117 goto state_71; 1118 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)1118 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 1119 1119 goto state_71; 1120 1120 goto out; … … 1131 1131 if (ch.unicode() == 95) 1132 1132 goto state_75; 1133 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || ch.unicode() >= 256)1133 if ((ch.unicode() >= 'a' && ch.unicode() <= 'z') || (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || ch.unicode() >= 256) 1134 1134 goto state_75; 1135 1135 goto out; 1136 1136 found: 1137 1137 lastAcceptingPos = pos; 1138 1138 1139 1139 out: 1140 1140 if (lastAcceptingPos != -1) {
Note:
See TracChangeset
for help on using the changeset viewer.
