[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [analitza/frameworks] analitza: Re-generate the parser with a newer version of qlalr
From: Aleix Pol <aleixpol () kde ! org>
Date: 2014-08-01 1:29:12
Message-ID: E1XD1ei-0001Z5-Mo () scm ! kde ! org
[Download RAW message or body]
Git commit 3c9eba865dacaef9824fc62ef8f68044307f9df0 by Aleix Pol.
Committed on 01/08/2014 at 00:44.
Pushed by apol into branch 'frameworks'.
Re-generate the parser with a newer version of qlalr
M +106 -116 analitza/expressiontable.cpp
M +2 -2 analitza/expressiontable_p.h
http://commits.kde.org/analitza/3c9eba865dacaef9824fc62ef8f68044307f9df0
diff --git a/analitza/expressiontable.cpp b/analitza/expressiontable.cpp
index 200153f..5b3c321 100644
--- a/analitza/expressiontable.cpp
+++ b/analitza/expressiontable.cpp
@@ -119,137 +119,127 @@ const short ExpressionTable::goto_default [] = {
54, 0};
const short ExpressionTable::action_index [] = {
- 125, -32, -3, -32, -32, 310, -32, 33, 204, -32,
- 42, -32, -32, -13, 4, -32, -32, -32, -32, 126,
- 126, -32, 126, -32, 126, 310, 81, 96, 56, 96,
- 96, 126, 126, 218, 218, 169, 17, 164, 218, 97,
- 66, 21, 111, 188, 157, 157, 188, 20, 85, -32,
- 1, -32, 138, -4, 2, 403, 193, 10, -32, -32,
- 10, -32, -32, -32, 217, 310, 6, -32, 218, -32,
- 310, -17, 279, 66, -14, -32, -32, 248, -2, 11,
- -32, -32, 8, -1, 10, 126, 36, 269, -10, 0,
- -32, 37, 126, 28, 126, -7, 372, -32, 341, 48,
- -6, 126, 310, -8, -32, 310, 16,
+ 170, -32, 3, -32, -32, 262, -32, 24, 167, -32,
+ 42, -32, -32, -5, 10, -32, -32, -32, -32, 109,
+ 109, -32, 109, -32, 109, 262, 81, 109, 109, 170,
+ 170, 170, 170, 170, 170, 170, 14, 170, 170, 121,
+ 79, 7, 100, 140, 140, 140, 140, 50, 140, -32,
+ 25, -32, 170, -4, 22, 355, 145, 0, -32, -32,
+ -3, -32, -32, -32, 158, 221, 8, -32, 170, -32,
+ 262, -17, 231, 34, 2, -32, -32, 200, -11, 4,
+ -32, -32, 9, 11, 1, 65, 37, 262, -6, 15,
+ -32, 23, 109, 51, 109, -16, 293, -32, 324, 36,
+ -8, 109, 262, -12, -32, 262, 6,
- 38, -22, -22, -22, -22, -22, -22, 25, -22, -22,
- 53, -22, -22, -22, -22, -22, -22, -22, -22, 32,
- 12, -22, 10, -22, 11, -22, -22, 14, 17, 13,
- 8, 7, 6, 16, 15, 18, 21, -2, 3, 0,
+ 21, -22, -22, -22, -22, -22, -22, 26, -22, -22,
+ 40, -22, -22, -22, -22, -22, -22, -22, -22, 25,
+ 16, -22, 6, -22, 12, -22, -22, 9, 8, -2,
+ 10, 11, 13, 15, 17, 5, 34, 3, 2, -1,
-22, -22, -22, -22, -22, -22, -22, -22, -22, -22,
- -22, -22, 58, -22, -22, -22, -22, 23, -22, -22,
- 19, -22, -22, -22, -22, -22, -22, -22, 5, -22,
- -22, -22, -22, -22, -22, -22, -22, -5, -22, -22,
- -22, -22, 26, -22, 20, 4, 42, -22, -22, -22,
- -22, -22, -1, 43, 1, -22, -22, -22, -22, -22,
- -22, 2, -22, -22, -22, -22, -22};
+ -22, -22, 32, -22, -22, -22, -22, 37, -22, -22,
+ 22, -22, -22, -22, -22, -22, -22, -22, 7, -22,
+ -22, -22, -22, -22, -22, -22, -22, 14, -22, -22,
+ -22, -22, 19, -22, 23, 4, 50, -22, -22, -22,
+ -22, -22, 1, 56, 0, -22, -22, -22, -22, -22,
+ -22, 18, -22, -22, -22, -22, -22};
const short ExpressionTable::action_info [] = {
- 64, 36, 77, 94, 104, 57, 24, 57, 94, 94,
- -54, 81, -20, 60, 64, 61, 18, 68, 18, 86,
- 84, 69, 68, 37, 0, 18, 85, 37, 37, 52,
- 0, 0, 0, 0, 36, 0, 18, 82, 36, 36,
- 92, 18, 93, 0, 18, 77, 0, 23, 92, 0,
- 18, 0, 23, 94, 92, 23, -19, 21, 22, 0,
- -19, 23, 21, 0, 18, 21, 20, -19, 19, 34,
- 0, 21, 28, 37, 0, 23, 0, -19, 0, 0,
- 0, 0, 0, 0, 36, 21, 27, 39, 34, -20,
- -54, 28, 37, -20, 0, 64, 0, 0, 22, 22,
- -20, 0, 0, 36, 18, 18, 20, 20, 19, 19,
- -20, 0, 27, 39, 34, 23, 23, 28, 37, 0,
- 0, 0, 0, 0, 0, 21, 21, 22, 22, 36,
- 0, 0, 0, 18, 18, 20, 20, 19, 19, 0,
- 22, 0, 0, 0, 23, 23, 18, 0, 20, 0,
- 19, 0, 0, 0, 21, 21, 0, 23, 27, 39,
- 34, 0, 0, 28, 37, 0, 22, 21, 0, 0,
- 0, 22, 18, 0, 20, 36, 19, 18, 0, 20,
- 0, 19, 0, 23, 0, 0, 0, 0, 23, 27,
- 39, 34, 0, 21, 28, 37, 0, 0, 21, 0,
- 0, -20, -54, 0, -54, -20, 36, 64, 101, 0,
- 0, 0, -20, -54, 0, 0, -20, 0, 64, 22,
- 22, 0, -20, -20, 0, 18, 18, 20, 20, 19,
- 19, 0, 67, -20, 0, 0, 23, 23, 0, 0,
- 0, 0, 0, 0, 0, 0, 21, 21, 0, 0,
- 22, 0, 0, 0, 0, 0, 18, 0, 20, 0,
- 19, 80, 0, 0, 0, 0, 0, 23, 0, 0,
- 27, 39, 34, 0, 0, 28, 37, 21, 0, 38,
- 27, 39, 34, 0, 0, 28, 37, 36, 0, 29,
- 33, 31, 32, 30, 35, 0, 0, 36, 0, 29,
- 33, 31, 32, 30, 35, 0, 0, 0, 0, 0,
- 0, 27, 39, 34, 0, 0, 28, 37, 0, 0,
- 38, 0, 0, 0, 0, 0, 0, 0, 36, 0,
- 29, 33, 31, 32, 30, 35, 0, 0, 0, 0,
- 0, 0, 27, 39, 34, 0, 0, 28, 37, 0,
- 0, 38, 0, 0, 99, 0, 0, 0, 0, 36,
+ 94, 36, 81, 57, 94, 18, 77, 57, 18, 18,
+ 104, 94, 24, 37, 37, 68, 64, 18, 0, 68,
+ 0, 84, 18, 69, 36, 36, 52, -20, 93, 64,
+ 82, 86, 18, 60, -54, 61, 77, 34, 85, 94,
+ 28, 37, 0, 23, -19, 18, 0, 0, -19, 92,
+ 18, 0, 36, 21, 92, -19, 23, 37, 0, 18,
+ 0, 23, 0, 92, 0, -19, 21, 22, 36, 0,
+ 23, 21, 0, 18, 0, 20, 0, 19, 0, 0,
+ 21, 0, 34, 0, 23, 28, 37, 0, 0, -20,
+ -54, 0, 0, -20, 21, 64, 0, 36, 0, 0,
+ -20, 27, 39, 34, 0, 0, 28, 37, 0, 0,
+ -20, 22, 0, 0, 0, 0, 0, 18, 36, 20,
+ 0, 19, 0, 22, 0, 0, 0, 0, 23, 18,
+ 0, 20, 0, 19, 0, 0, 0, 0, 21, 0,
+ 23, 27, 39, 34, 0, 0, 28, 37, 0, 0,
+ 21, 0, 0, -20, -54, 0, -54, -20, 36, 64,
+ 22, 0, 0, 0, -20, 0, 18, 0, 20, 0,
+ 19, 101, 22, 67, -20, -20, -54, 23, 18, -20,
+ 20, 64, 19, 0, 0, 0, -20, 21, 0, 23,
+ 0, 0, 0, 0, 0, 0, -20, 0, 0, 21,
+ 0, 0, 22, 0, 0, 0, 0, 0, 18, 0,
+ 20, 0, 19, 80, 0, 0, 0, 0, 0, 23,
+ 0, 0, 27, 39, 34, 0, 0, 28, 37, 21,
+ 0, 38, 27, 39, 34, 0, 0, 28, 37, 36,
+ 0, 29, 33, 31, 32, 30, 35, 0, 0, 36,
0, 29, 33, 31, 32, 30, 35, 0, 0, 0,
0, 0, 0, 27, 39, 34, 0, 0, 28, 37,
- 0, 0, 38, 0, 0, 0, 0, 0, 0, 97,
+ 0, 0, 38, 0, 0, 0, 0, 0, 0, 0,
36, 0, 29, 33, 31, 32, 30, 35, 0, 0,
0, 0, 0, 0, 27, 39, 34, 0, 0, 28,
- 37, 0, 0, 38, 0, 0, 63, 0, 0, 0,
- 0, 36, 0, 29, 33, 31, 32, 30, 35, 0,
- 0, 0, 0, 0, 0,
+ 37, 0, 0, 38, 0, 0, 0, 0, 0, 0,
+ 97, 36, 0, 29, 33, 31, 32, 30, 35, 0,
+ 0, 0, 0, 0, 0, 27, 39, 34, 0, 0,
+ 28, 37, 0, 0, 38, 0, 0, 99, 0, 0,
+ 0, 0, 36, 0, 29, 33, 31, 32, 30, 35,
+ 0, 0, 0, 0, 0, 0, 27, 39, 34, 0,
+ 0, 28, 37, 0, 0, 38, 0, 0, 63, 0,
+ 0, 0, 0, 36, 0, 29, 33, 31, 32, 30,
+ 35, 0, 0, 0, 0, 0, 0,
- 71, 98, 73, 96, 102, 72, 87, 70, 45, 44,
- 43, 79, 106, 25, 105, 42, 40, 47, 46, 41,
- 48, 0, 59, 59, 50, 0, 59, 0, 74, 59,
- 75, 0, 76, 49, 98, 56, 51, 0, 62, 100,
- 5, 8, 58, 83, 0, 89, 89, 75, 75, 0,
- 0, 53, 91, 95, 88, 88, 89, 0, 75, 0,
- 55, 56, 0, 103, 0, 88, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 53, 0, 0};
+ 42, 73, 96, 98, 72, 71, 87, 48, 106, 70,
+ 41, 40, 43, 44, 25, 45, 0, 46, 105, 47,
+ 102, 0, 59, 5, 8, 59, 59, 98, 56, 74,
+ 79, 75, 0, 76, 55, 56, 83, 50, 0, 0,
+ 59, 62, 100, 89, 53, 75, 49, 0, 0, 51,
+ 103, 53, 88, 89, 0, 75, 58, 0, 0, 89,
+ 91, 75, 88, 0, 0, 0, 95, 0, 88, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0};
const short ExpressionTable::action_check [] = {
- 14, 18, 12, 16, 0, 11, 9, 11, 16, 16,
- 9, 13, 12, 11, 14, 13, 8, 11, 8, 20,
- 12, 15, 11, 7, -1, 8, 27, 7, 7, 12,
- -1, -1, -1, -1, 18, -1, 8, 26, 18, 18,
- 12, 8, 5, -1, 8, 12, -1, 19, 12, -1,
- 8, -1, 19, 16, 12, 19, 8, 29, 2, -1,
- 12, 19, 29, -1, 8, 29, 10, 19, 12, 3,
- -1, 29, 6, 7, -1, 19, -1, 29, -1, -1,
- -1, -1, -1, -1, 18, 29, 1, 2, 3, 8,
- 9, 6, 7, 12, -1, 14, -1, -1, 2, 2,
- 19, -1, -1, 18, 8, 8, 10, 10, 12, 12,
- 29, -1, 1, 2, 3, 19, 19, 6, 7, -1,
- -1, -1, -1, -1, -1, 29, 29, 2, 2, 18,
- -1, -1, -1, 8, 8, 10, 10, 12, 12, -1,
- 2, -1, -1, -1, 19, 19, 8, -1, 10, -1,
- 12, -1, -1, -1, 29, 29, -1, 19, 1, 2,
- 3, -1, -1, 6, 7, -1, 2, 29, -1, -1,
- -1, 2, 8, -1, 10, 18, 12, 8, -1, 10,
- -1, 12, -1, 19, -1, -1, -1, -1, 19, 1,
- 2, 3, -1, 29, 6, 7, -1, -1, 29, -1,
- -1, 8, 9, -1, 11, 12, 18, 14, 4, -1,
- -1, -1, 8, 9, -1, -1, 12, -1, 14, 2,
- 2, -1, 29, 19, -1, 8, 8, 10, 10, 12,
- 12, -1, 15, 29, -1, -1, 19, 19, -1, -1,
- -1, -1, -1, -1, -1, -1, 29, 29, -1, -1,
- 2, -1, -1, -1, -1, -1, 8, -1, 10, -1,
- 12, 13, -1, -1, -1, -1, -1, 19, -1, -1,
- 1, 2, 3, -1, -1, 6, 7, 29, -1, 10,
- 1, 2, 3, -1, -1, 6, 7, 18, -1, 20,
- 21, 22, 23, 24, 25, -1, -1, 18, -1, 20,
- 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
- -1, 1, 2, 3, -1, -1, 6, 7, -1, -1,
- 10, -1, -1, -1, -1, -1, -1, -1, 18, -1,
- 20, 21, 22, 23, 24, 25, -1, -1, -1, -1,
- -1, -1, 1, 2, 3, -1, -1, 6, 7, -1,
- -1, 10, -1, -1, 13, -1, -1, -1, -1, 18,
+ 16, 18, 13, 11, 16, 8, 12, 11, 8, 8,
+ 0, 16, 9, 7, 7, 11, 14, 8, -1, 11,
+ -1, 12, 8, 15, 18, 18, 12, 12, 5, 14,
+ 26, 20, 8, 11, 9, 13, 12, 3, 27, 16,
+ 6, 7, -1, 19, 8, 8, -1, -1, 12, 12,
+ 8, -1, 18, 29, 12, 19, 19, 7, -1, 8,
+ -1, 19, -1, 12, -1, 29, 29, 2, 18, -1,
+ 19, 29, -1, 8, -1, 10, -1, 12, -1, -1,
+ 29, -1, 3, -1, 19, 6, 7, -1, -1, 8,
+ 9, -1, -1, 12, 29, 14, -1, 18, -1, -1,
+ 19, 1, 2, 3, -1, -1, 6, 7, -1, -1,
+ 29, 2, -1, -1, -1, -1, -1, 8, 18, 10,
+ -1, 12, -1, 2, -1, -1, -1, -1, 19, 8,
+ -1, 10, -1, 12, -1, -1, -1, -1, 29, -1,
+ 19, 1, 2, 3, -1, -1, 6, 7, -1, -1,
+ 29, -1, -1, 8, 9, -1, 11, 12, 18, 14,
+ 2, -1, -1, -1, 19, -1, 8, -1, 10, -1,
+ 12, 4, 2, 15, 29, 8, 9, 19, 8, 12,
+ 10, 14, 12, -1, -1, -1, 19, 29, -1, 19,
+ -1, -1, -1, -1, -1, -1, 29, -1, -1, 29,
+ -1, -1, 2, -1, -1, -1, -1, -1, 8, -1,
+ 10, -1, 12, 13, -1, -1, -1, -1, -1, 19,
+ -1, -1, 1, 2, 3, -1, -1, 6, 7, 29,
+ -1, 10, 1, 2, 3, -1, -1, 6, 7, 18,
+ -1, 20, 21, 22, 23, 24, 25, -1, -1, 18,
-1, 20, 21, 22, 23, 24, 25, -1, -1, -1,
-1, -1, -1, 1, 2, 3, -1, -1, 6, 7,
- -1, -1, 10, -1, -1, -1, -1, -1, -1, 17,
+ -1, -1, 10, -1, -1, -1, -1, -1, -1, -1,
18, -1, 20, 21, 22, 23, 24, 25, -1, -1,
-1, -1, -1, -1, 1, 2, 3, -1, -1, 6,
- 7, -1, -1, 10, -1, -1, 13, -1, -1, -1,
- -1, 18, -1, 20, 21, 22, 23, 24, 25, -1,
- -1, -1, -1, -1, -1,
+ 7, -1, -1, 10, -1, -1, -1, -1, -1, -1,
+ 17, 18, -1, 20, 21, 22, 23, 24, 25, -1,
+ -1, -1, -1, -1, -1, 1, 2, 3, -1, -1,
+ 6, 7, -1, -1, 10, -1, -1, 13, -1, -1,
+ -1, -1, 18, -1, 20, 21, 22, 23, 24, 25,
+ -1, -1, -1, -1, -1, -1, 1, 2, 3, -1,
+ -1, 6, 7, -1, -1, 10, -1, -1, 13, -1,
+ -1, -1, -1, 18, -1, 20, 21, 22, 23, 24,
+ 25, -1, -1, -1, -1, -1, -1,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 16, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, -1, 3, 3, 3, -1, 3, -1, 3, 3,
- 5, -1, 7, 12, 2, 3, 15, -1, 19, 19,
- 2, 3, 19, 17, -1, 3, 3, 5, 5, -1,
- -1, 19, 10, 10, 12, 12, 3, -1, 5, -1,
- 2, 3, -1, 10, -1, 12, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 19, -1, -1};
+ 2, 2, 2, 2, 2, 2, -1, 2, 2, 2,
+ 2, -1, 3, 2, 3, 3, 3, 2, 3, 3,
+ 16, 5, -1, 7, 2, 3, 17, 3, -1, -1,
+ 3, 19, 19, 3, 19, 5, 12, -1, -1, 15,
+ 10, 19, 12, 3, -1, 5, 19, -1, -1, 3,
+ 10, 5, 12, -1, -1, -1, 10, -1, 12, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1};
diff --git a/analitza/expressiontable_p.h b/analitza/expressiontable_p.h
index 0411729..e23f0ad 100644
--- a/analitza/expressiontable_p.h
+++ b/analitza/expressiontable_p.h
@@ -46,8 +46,8 @@ public:
NON_TERMINAL_COUNT = 22,
GOTO_INDEX_OFFSET = 107,
- GOTO_INFO_OFFSET = 435,
- GOTO_CHECK_OFFSET = 435
+ GOTO_INFO_OFFSET = 387,
+ GOTO_CHECK_OFFSET = 387
};
static const char *const spell [];
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic