[e-cvs] cvs commit: e/src/jsrc/org/erights/e/elang/syntax EParser.java e.y
markm@eros.cs.jhu.edu
markm@eros.cs.jhu.edu
Mon, 13 Aug 2001 16:38:11 -0400
markm 01/08/13 16:38:11
Modified: src Makefile
src/bin/resources/org/erights/e/elang/syntax
ParserTables.data
src/esrc/scripts updoc.e
src/jsrc/org/erights/e/elang/syntax EParser.java e.y
Log:
the 0.8.9z release
Revision Changes Path
1.103 +2 -2 e/src/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/e/src/Makefile,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- Makefile 2001/08/08 05:39:16 1.102
+++ Makefile 2001/08/13 20:38:10 1.103
@@ -7,8 +7,8 @@
# Prefix tagging this release's attributes
PREFIX=tl-E
-DOTVER=0.8.9y
-TAGVER=0_8_9y
+DOTVER=0.8.9z
+TAGVER=0_8_9z
RELEASE=working
TOP=..
1.13 +13 -13 e/src/bin/resources/org/erights/e/elang/syntax/ParserTables.data
Index: ParserTables.data
===================================================================
RCS file: /cvs/e/src/bin/resources/org/erights/e/elang/syntax/ParserTables.data,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
Binary files /tmp/cvsRpvEa0 and /tmp/cvs2yVoZR differ
1.10 +5 -2 e/src/esrc/scripts/updoc.e
Index: updoc.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/updoc.e,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- updoc.e 2001/08/13 01:47:02 1.9
+++ updoc.e 2001/08/13 20:38:10 1.10
@@ -11,6 +11,8 @@
def html2txt := <import:org.erights.e.tools.html.html2txt>
def integerMaker := <import:java.math.BigInteger>
+def foldLines(lines) :any { trimLines(lines) replaceAll("\\\n", "") }
+
# Prints an output record
def printBlock(keyword, str, out) {
@@ -136,10 +138,10 @@
value := exprTree eval(pov)
succeeded := true
} catch problem {
- answers["problem"] := trimLines(""+problem+"\n")
+ answers["problem"] := foldLines(""+problem+"\n")
}
if (succeeded && value != null) {
- answers["value"] := trimLines(E toQuote(value)+"\n")
+ answers["value"] := foldLines(E toQuote(value)+"\n")
}
# XXX Doesn't capture stdout or stderr
newAnswers := answers snapshot()
@@ -306,6 +308,7 @@
answer += nextLine + "\n"
index += 1
}
+ answer := answer replaceAll("\\\n", "")
return([keyword bare(), answer])
} else {
return(null)
1.79 +214 -214 e/src/jsrc/org/erights/e/elang/syntax/EParser.java
Index: EParser.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/syntax/EParser.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- EParser.java 2001/04/15 05:04:27 1.78
+++ EParser.java 2001/08/13 20:38:10 1.79
@@ -367,9 +367,9 @@
1, 4, 4, 4, 4, 4, 1, 4, 4, 1,
4, 4, 1, 1, 1, 4, 4, 1, 1, 1,
4, 4, 4, 4, 4, 1, 1, 1, 4, 1,
- 1, 1, 3, 3, 3, 3, 1, 1, 4, 6,
- 5, 2, 3, 6, 3, 4, 5, 5, 6, 2,
- 3, 1, 4, 5, 6, 1, 1, 1, 1, 1,
+ 1, 1, 3, 3, 3, 3, 1, 1, 4, 7,
+ 6, 2, 3, 6, 4, 4, 5, 6, 7, 2,
+ 4, 1, 4, 5, 6, 1, 1, 1, 1, 1,
1, 1, 3, 2, 1, 3, 3, 1, 3, 3,
5, 3, 4, 2, 3, 3, 4, 4, 1, 1,
4, 2, 2, 4, 2, 3, 2, 3, 2, 1,
@@ -437,61 +437,61 @@
154, 0, 0, 157, 0, 10, 145, 0, 0, 0,
0, 0, 180, 178, 181, 0, 177, 0, 103, 0,
0, 0, 266, 0, 264, 265, 202, 198, 0, 0,
- 0, 115, 0, 109, 0, 0, 0, 0, 239, 0,
- 0, 266, 116, 0, 274, 0, 0, 0, 110, 126,
- 0, 266, 0, 0, 76, 75, 73, 74, 130, 244,
- 0, 106, 107, 0, 0, 0, 0, 0, 0, 155,
- 0, 0, 0, 221, 128, 0, 0, 0, 0, 0,
- 112, 0, 9, 0, 16, 0, 0, 0, 0, 0,
+ 0, 115, 0, 109, 0, 0, 0, 239, 0, 0,
+ 266, 116, 0, 274, 0, 0, 0, 110, 126, 0,
+ 266, 0, 0, 76, 75, 73, 74, 130, 244, 0,
+ 106, 107, 0, 0, 0, 0, 0, 0, 155, 0,
+ 0, 0, 221, 128, 0, 0, 0, 0, 0, 112,
+ 0, 9, 0, 16, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 148, 0, 147, 0, 131, 166, 0,
- 0, 163, 0, 0, 0, 0, 0, 7, 0, 190,
- 191, 185, 0, 0, 0, 0, 179, 165, 0, 135,
- 0, 224, 0, 0, 136, 0, 0, 0, 0, 0,
- 0, 0, 0, 86, 0, 0, 0, 0, 117, 275,
- 0, 0, 0, 229, 118, 0, 0, 0, 0, 0,
- 289, 280, 243, 0, 242, 240, 121, 0, 0, 124,
- 0, 0, 0, 0, 0, 0, 113, 0, 0, 21,
- 23, 0, 18, 22, 19, 25, 29, 31, 32, 40,
- 39, 36, 37, 38, 33, 34, 35, 43, 44, 45,
- 42, 46, 0, 0, 54, 0, 51, 0, 59, 0,
- 56, 57, 67, 66, 63, 65, 61, 62, 64, 71,
- 70, 69, 0, 0, 79, 0, 0, 0, 93, 149,
- 192, 194, 162, 0, 156, 0, 0, 159, 11, 152,
- 150, 152, 183, 182, 0, 0, 223, 236, 199, 200,
- 0, 209, 0, 111, 134, 133, 88, 0, 87, 236,
- 0, 278, 0, 0, 228, 0, 0, 0, 292, 0,
- 294, 0, 0, 0, 0, 267, 260, 219, 0, 226,
- 0, 0, 24, 203, 0, 81, 0, 0, 94, 0,
- 169, 171, 0, 0, 0, 0, 268, 0, 222, 0,
- 89, 272, 0, 276, 0, 0, 230, 297, 296, 0,
- 293, 291, 0, 0, 0, 281, 267, 0, 0, 299,
- 0, 220, 0, 80, 84, 95, 151, 184, 142, 0,
- 0, 0, 0, 0, 0, 267, 0, 0, 0, 0,
- 231, 0, 282, 285, 287, 0, 283, 0, 290, 261,
- 0, 141, 0, 0, 0, 0, 0, 0, 269, 0,
- 0, 210, 273, 262, 0, 295, 279, 0, 0, 0,
- 204, 0, 215, 0, 0, 0, 218, 211, 213, 271,
- 263, 0, 284, 286, 288, 214, 0, 212, 0, 227,
- 216, 0, 217,
+ 0, 148, 0, 147, 0, 131, 166, 0, 0, 163,
+ 0, 0, 0, 0, 0, 7, 0, 190, 191, 185,
+ 0, 0, 0, 0, 179, 165, 0, 135, 0, 224,
+ 0, 0, 136, 0, 0, 0, 0, 0, 0, 0,
+ 0, 86, 0, 0, 0, 0, 117, 275, 0, 0,
+ 0, 229, 118, 0, 0, 0, 0, 0, 289, 280,
+ 243, 0, 242, 240, 121, 0, 0, 124, 0, 0,
+ 0, 0, 0, 0, 113, 0, 0, 21, 23, 0,
+ 18, 22, 19, 25, 29, 31, 32, 40, 39, 36,
+ 37, 38, 33, 34, 35, 43, 44, 45, 42, 46,
+ 0, 0, 54, 0, 51, 0, 59, 0, 56, 57,
+ 67, 66, 63, 65, 61, 62, 64, 71, 70, 69,
+ 0, 0, 79, 0, 0, 0, 93, 149, 192, 194,
+ 162, 0, 156, 0, 0, 159, 11, 152, 150, 152,
+ 183, 182, 0, 0, 223, 236, 199, 200, 0, 209,
+ 0, 111, 134, 133, 0, 0, 87, 236, 0, 278,
+ 0, 0, 228, 0, 0, 0, 292, 0, 294, 0,
+ 0, 0, 0, 267, 260, 219, 0, 226, 0, 0,
+ 24, 203, 0, 0, 0, 0, 94, 0, 169, 171,
+ 0, 0, 0, 0, 268, 0, 222, 0, 88, 0,
+ 272, 0, 276, 0, 0, 230, 297, 296, 0, 293,
+ 291, 0, 0, 0, 281, 267, 0, 0, 299, 0,
+ 220, 0, 81, 0, 84, 95, 151, 184, 142, 0,
+ 0, 0, 0, 0, 0, 267, 0, 89, 0, 0,
+ 0, 231, 0, 282, 285, 287, 0, 283, 0, 290,
+ 261, 0, 80, 141, 0, 0, 0, 0, 0, 0,
+ 269, 0, 0, 210, 273, 262, 0, 295, 279, 0,
+ 0, 0, 204, 0, 215, 0, 0, 0, 218, 211,
+ 213, 271, 263, 0, 284, 286, 288, 214, 0, 212,
+ 0, 227, 216, 0, 217,
};
final static short yydgoto[] = { 3,
- 188, 5, 400, 198, 146, 369, 335, 147, 6, 148,
- 149, 150, 151, 534, 563, 152, 283, 105, 154, 155,
- 156, 542, 157, 158, 159, 557, 160, 561, 161, 565,
- 162, 572, 163, 164, 165, 166, 241, 383, 167, 168,
- 318, 169, 242, 170, 218, 264, 354, 256, 213, 373,
- 374, 499, 230, 500, 171, 172, 234, 202, 480, 481,
- 319, 343, 474, 183, 243, 184, 185, 186, 187, 107,
+ 188, 5, 399, 198, 146, 368, 335, 147, 6, 148,
+ 149, 150, 151, 532, 561, 152, 283, 105, 154, 155,
+ 156, 540, 157, 158, 159, 555, 160, 559, 161, 563,
+ 162, 570, 163, 164, 165, 166, 241, 382, 167, 168,
+ 318, 169, 242, 170, 218, 264, 354, 256, 213, 372,
+ 373, 497, 230, 498, 171, 172, 234, 202, 478, 479,
+ 319, 343, 472, 183, 243, 184, 185, 186, 187, 107,
108, 109, 110, 195, 196, 344, 345, 214, 215, 244,
- 603, 684, 706, 727, 355, 356, 503, 504, 245, 111,
- 250, 519, 653, 648, 686, 667, 384, 668, 511, 507,
- 620, 621,
+ 601, 684, 708, 729, 355, 356, 501, 502, 245, 111,
+ 250, 517, 652, 646, 686, 666, 383, 667, 509, 505,
+ 618, 619,
};
-final static short yysindex[] = { -334,
- 0,10079, 0,11955, 0, -299, 0,16652, 47,16652,
+final static short yysindex[] = { -307,
+ 0,10032, 0,11908, 0, -327, 0,16723, 48,16723,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -500,75 +500,75 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, -285, -285, 6722, -285, 46,
- 53, 0, 0, 84, 0, -11, 0, 121, 0, 0,
- 0, 0, 0, 0, 0, 0, 0,12425,10197,10197,
-13479, 0,10079, 6841, 47, 8348, 47, 63, 63,13359,
- 47, 0, 47,13479, -285, -285, -285, -285, -327, -285,
- 4, 0, -82,15201, 9151, -285, 0, 0, 135, 0,
- 0, 431, -195, -172, 0, -8, 43, 59, 13, -13,
- 0, -170, 8682, 0, 183, 0, 0, 8, 0, 0,
- 0, 0, 0, 169, -285, -174, 185,13015,16652, -285,
- 0, -171, 157, -30, 164, -7, 0,11955, 223, 11,
- 17, -285, 98, 0, 0, 69, -285,13479, 49, 0,
- 0, 63, -79, 0, 0,16652,16652, 203, 205, 0,
- 0, 274, 63, -96, 0, 63, -171, 54, 0, 63,
-15437, -285, 0, 290, 218, 0, 0, -285, 313, 63,
- 63, 218,15319, 0,16652,13015,13015,13015,16652, -56,
- 294, 22, 0, 314, 0, 342, 0, 0, 137, -285,
- 0, 140, 9613, 88, 0, 63,16652,16652, 267, 277,
- 0, 16, 84,14403, 0, 8806,11955, -285, -285, 0,
- 0, 0, 0, 0, -285, 0, 0, 0, 0, 0,
- 0, 0, -285, -285, -285, -285, -285, -285, -285, -285,
- -285, -285, -285, -285, -285, -285, -285, -285, -285, -285,
- -285, -285, -285, -285, -285, -285, -285, -285, -285, -285,
-15555, -285,16652, 64, -285, 378, 0, 0, 76, -285,
- 379,10079, -285, 0, 0,13941, 0, -285, 381, -285,
- 0, 303, -285, 0, -285, 0, 0, 308, 310,12425,
- 317, 318, 0, 0, 0, 98, 0,12425, 0, 167,
- 63,10079, 0, 167, 0, 0, 0, 0, 198, 199,
- 9613, 0, -285, 0,11955, 166, -285, 417, 0, 423,
- -285, 0, 0, -224, 0, 127, -285, 194, 0, 0,
- -285, 0, 101, 90, 0, 0, 0, 0, 0, 0,
- -285, 0, 0, -327, -285, 0, 343,11955, 352, 0,
- 438, 9613, -285, 0, 0, 169, 185, 224, 226, -285,
- 0, 63, 0, 9151, 0,12425,11955,11955,12078,11955,
-12425,12425,12425,12548,10079,10079,12548,12548,12548,12425,
-12425,12425,12425,12425,12425,12425,12548,12425,12548,12548,
-12548,12548,12548,12548,12548,12548, -285, 440, 399, 454,
- -285, 455, 458, 0, 378, 0,12425, 0, 0,12425,
- 84, 0,10079, -285,10079, -285, 6841, 0, 8806, 0,
- 0, 0, -285,16652,10079,15959, 0, 0,10197, 0,
- 228, 0, 63, -285, 0, 376, 377, 462,16652, 63,
- -59, 466, -285, 0, 467, -285,10079, 63, 0, 0,
- 103, 104, 139, 0, 0,16248, 471, -285, -285, -285,
- 0, 0, 0, -56, 0, 0, 0, -285, 395, 0,
- 463, 485,12425, 402, 406,11955, 0, 84, -172, 0,
- 0, -37, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 26, 26, 0, 13, 0, 13, 0, -13,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 491, -285, 0, -285, 492, -285, 0, 0,
- 0, 0, 0,10541, 0,10541, -171, 0, 0, 0,
- 0, 0, 0, 0, -79,10197, 0, 0, 0, 0,
- 463, 0, 498, 0, 0, 0, 0, 506, 0, 0,
- 63, 0, -285, -285, 0, -285, 490, 490, 0, -6,
- 0, 490, -135, 510,16652, 0, 0, 0, 463, 0,
- 0, 0, 0, 0, 147, 0, 511, 514, 0, 516,
- 0, 0, 434, 435, 167, 63, 0, -119, 0, -285,
- 0, 0, 281, 0,13479,10079, 0, 0, 0, -285,
- 0, 0, -285,15673,15673, 0, 0, -285, 490, 0,
- 439, 0, -285, 0, 0, 0, 0, 0, 0, 167,
- 47,15791,15791, -285, -110, 0,16652, -285, 442, 525,
- 0,16248, 0, 0, 0, 443, 0, -210, 0, 0,
- 191, 0, -92, 9613, -25, 63, 108, 63, 0, -285,
- 444, 0, 0, 0,10079, 0, 0, -285,15673,15673,
- 0, 47, 0, 531,11955, 9613, 0, 0, 0, 0,
- 0, 196, 0, 0, 0, 0, 463, 0, 538, 0,
- 0, 463, 0,
+ 0, 0, 0, 0, 0, -313, -313, 6675, -313, -28,
+ 54, 0, 0, 99, 0, -160, 0, 120, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0,12378,10150,10150,
+13432, 0,10032, 6794, 48, 8301, 48, 65, 65,13312,
+ 48, 0, 48,13432, -313, -313, -313, -313, -316, -313,
+ 10, 0, -51,15154, 9104, -313, 0, 0, 53, 0,
+ 0, 362, -204, -185, 0, -16, 49, 34, 119, 2,
+ 0, -182, 8635, 0, 188, 0, 0, -115, 0, 0,
+ 0, 0, 0, 174, -313, -165, 201,12968,16723, -313,
+ 0, -140, 233, -8, 240, -2, 0,11908, 296, 82,
+ 135, -313, 46, 0, 0, -22, -313,13432, 122, 0,
+ 0, 65, -71, 0, 0,16723,16723, 254, 271, 0,
+ 0, 359, 65, 29, 0, 65, -140, 131, 0, 65,
+ -313, -313, 0, 375, 278, 0, 0, -313, 389, 65,
+ 65, 278,15272, 0,16723,12968,12968,12968,16723, 37,
+ 354, 31, 0, 409, 0, 416, 0, 0, 202, -313,
+ 0, 204, 9566, 118, 0, 65,16723,16723, 348, 353,
+ 0, 91, 99,14356, 0, 8759,11908, -313, -313, 0,
+ 0, 0, 0, 0, -313, 0, 0, 0, 0, 0,
+ 0, 0, -313, -313, -313, -313, -313, -313, -313, -313,
+ -313, -313, -313, -313, -313, -313, -313, -313, -313, -313,
+ -313, -313, -313, -313, -313, -313, -313, -313, -313, -313,
+ -313, -313,16723, 90, -313, 455, 0, 0, -11, -313,
+ 451,10032, -313, 0, 0,13894, 0, -313, 453, -313,
+ 0, 373, -313, 0, -313, 0, 0, 376, 378,12378,
+ 381, 383, 0, 0, 0, 46, 0,12378, 0, 242,
+ 65,10032, 0, 242, 0, 0, 0, 0, 257, 258,
+ 9566, 0, -313, 0,11908, 243,15390, 0, 479, -313,
+ 0, 0, -60, 0, 164, -313, 249, 0, 0, -313,
+ 0, 163, 146, 0, 0, 0, 0, 0, 0, -313,
+ 0, 0, -316, -313, 0, 410,11908, 411, 0, 503,
+ 9566, -313, 0, 0, 174, 201, 288, 289, -313, 0,
+ 65, 0, 9104, 0,12378,11908,11908,12031,11908,12378,
+12378,12378,12501,10032,10032,12501,12501,12501,12378,12378,
+12378,12378,12378,12378,12378,12501,12378,12501,12501,12501,
+12501,12501,12501,12501,12501,15508, 458, 508, -313, 514,
+ 515, 0, 455, 0,12378, 0, 0,12378, 99, 0,
+10032, -313,10032, -313, 6794, 0, 8759, 0, 0, 0,
+ -313,16723,10032,16030, 0, 0,10150, 0, 287, 0,
+ 65, -313, 0, 432, 433, 519,16723, 65, -94, -313,
+ 531, 0, 535, -313,10032, 65, 0, 0, 161, 167,
+ 279, 0, 0,16319, 538, -313, -313, -313, 0, 0,
+ 0, 37, 0, 0, 0, -313, 459, 0, 527, 545,
+12378, 462, 464,11908, 0, 99, -185, 0, 0, -26,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ -76, -76, 0, 119, 0, 119, 0, 2, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ -313, 553, 0, -313, 554, -313, 0, 0, 0, 0,
+ 0,10494, 0,10494, -140, 0, 0, 0, 0, 0,
+ 0, 0, -71,10150, 0, 0, 0, 0, 527, 0,
+ 552, 0, 0, 0, 559, -313, 0, 0, 65, 0,
+ -313, -313, 0, -313, 543, 543, 0, 3, 0, 543,
+ -48, 561,16723, 0, 0, 0, 527, 0, 0, 0,
+ 0, 0, 305, 563, -313, 565, 0, 566, 0, 0,
+ 483, 485, 242, 65, 0, -46, 0, -313, 0, 570,
+ 0, 332, 0,13432,10032, 0, 0, 0, -313, 0,
+ 0, -313,15626,15626, 0, 0, -313, 543, 0, 491,
+ 0, -313, 0, 577, 0, 0, 0, 0, 0, 242,
+ 48,15744,15744, -313, -195, 0,16723, 0, -313, 495,
+ 581, 0,16319, 0, 0, 0, 498, 0, -209, 0,
+ 0, 309, 0, 0, -80, 9566, -10, 65, 175, 65,
+ 0, -313, 499, 0, 0, 0,10032, 0, 0, -313,
+15626,15626, 0, 48, 0, 584,11908, 9566, 0, 0,
+ 0, 0, 0, 346, 0, 0, 0, 0, 527, 0,
+ 585, 0, 0, 527, 0,
};
-final static short yyrindex[] = { 6260,
- 0, 83, 0, 19, 0, 5430, 0, 0, 0, 0,
+final static short yyrindex[] = { 6207,
+ 0, 154, 0, 19, 0, 5377, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -577,87 +577,87 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0,12892,16770, -57,11485, 0,
- 0, 0, 0, 5249, 0, 0, 0, 642, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 83, -64, 97,
- 0, 0, 83, 83, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,16770,12892,12892,12892,10668,11485,
- 0, 0, 0, 0, 83, 580, 0, 0, 27, 0,
- 968, 133, 0, 5967, 0, 4627, 5044, 4834, 4383, 4212,
- 0, 4173, 3795, 0, 2104, 0, 0, 0, 0, 0,
- 0, 0, 0, 5539,11485, 0, 5575, 83, 0,14285,
- 0, -31, 0, 9, 0, 488, 0, 83, 0, 0,
- 0,11608, 0, 0, 0, 0,11608, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0,14743, 0, 0, 302, 0, 0, 0,
- 0,11015, 0, 2519, 0, 0, 0,11485, 0, 0,
- 0, 0, 0, 0, 0, 83, 83, 83, 0, 28,
- 0, 0, 0, 29, 0, 0, 0, 0, 0,11138,
- 0, 0, 2, 461, 0, 0, 0, 0, 0, 0,
- 7303, 0, 826, 0, 0, 52, 530,11608,11485, 0,
- 0, 0, 0, 0,11485, 0, 0, 0, 0, 0,
- 0, 0,11485,11485,11608,11608,11608,11608, 9269, 9269,
-11608,11608,11608,11608,11608,11608,11608,11608,11608,11608,
-11608,11608,11608,11608,11608,11608,11608,11608,11608,11608,
- 0,10668, 0, 2672,11015, 0, 0, 0, 0,11608,
- 0, 83,11608, 0, 0, 0, 0, 9269, 5829, 9269,
- 0, 5865, 6378, 0, -19, 0, 0, 0, 0, 83,
-16888,16416, 0, 0, 0, 0, 0, 83, 0, 324,
- 0, 83, 0, 324, 0, 0, 0, 0, 0, 0,
- 2, 0,16770, 0, 83, 1536,11015, 3087, 0, 0,
-11015, 0, 0, 1951, 0, 0,11485, 0, 0, 0,
-16130, 0, -68, 0, 0, 0, 0, 0, 0, 0,
-11485, 0, 0,11485,11485, 1383, 0, -45, 0, 0,
- 0, 2,11608, 0, 0, 7643, 7765, 0, 0,11485,
- 0, 0, 0, 83, 0, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83,11015, 3240, 0, 3655,
-11015, 0, 0, 0, 0, 0, 83, 0, 0, 83,
- -32, 0, 83, 9735, 83, 9735, 83, 0, 138, 0,
- 0, 0,11485, 0, 83, 0, 0, 0, 97, 0,
- 0, 0, 0, -70, 0, 0, 0, 0, 0, 0,
- 0, 0,11015, 0, 0, -80, 83, 0, 0, 0,
- 0, 0, 0, 0, 0, 545, 0, -47,16130,16770,
- 0, 0, 0, 0, 0, 0, 0, 468, 0, 0,
- 461, 0, 83, 0, 0, 83, 0, 7181, 6000, 0,
- 0,11485, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 4870, 5005, 0, 4419, 0, 4798, 0, 4248,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0,11015, 0,11015, 0,11015, 0, 0,
- 0, 0, 0, 83, 0, 83, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, -64, 0, 0, 0, 0,
- 461, 0,14861, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,13823, 9269, 0,11485, -23, -23, 0, 553,
- 0, -68, 474, 0, 0, 0, 0, 0, 461, 0,
- 8105, 8227, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 324, 0, 0, -78, 0,16770,
- 0, 0, 475, 0, 0, 83, 0, 0, 0,16534,
- 0, 0, 468, 0, 0, 0, 0, 468, -68, 0,
- 0, 0,11485, 0, 0, 0, 0, 0, 0, 324,
- 0, 0, 0, -70, 476, 0, 0, -58, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 483, 0, 0,
- 0, 0, 0, 2, 461, 0, 461, 0, 0, 468,
- 0, 0, 0, 0, 83, 0, 0, 468, 0, 0,
- 0, 0, 0, 0, 83, 2, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 461, 0, 0, 0,
- 0, 461, 0,
+ 0, 0, 0, 0, 0,12845,16841, -39,11438, 0,
+ 0, 0, 0, 5196, 0, 0, 0, 5914, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 154, -95, 247,
+ 0, 0, 154, 154, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,16841,12845,12845,12845,10621,11438,
+ 0, 0, 0, 0, 154, 627, 0, 0, 27, 0,
+ 915, 539, 0, 5947, 0, 4574, 4991, 4781, 4330, 4159,
+ 0, 4120, 3742, 0, 2051, 0, 0, 0, 0, 0,
+ 0, 0, 0, 5486,11438, 0, 5522, 154, 0,14238,
+ 0, -19, 0, 35, 0, 537, 0, 154, 0, 0,
+ 0,11561, 0, 0, 0, 0,11561, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0,14696, 0, 0, 347, 0, 0, 0,
+15862,10968, 0, 2466, 0, 0, 0,11438, 0, 0,
+ 0, 0, 0, 0, 0, 154, 154, 154, 0, 70,
+ 0, 0, 0, 38, 0, 0, 0, 0, 0,11091,
+ 0, 0, -29, 510, 0, 0, 0, 0, 0, 0,
+ 7256, 0, 793, 0, 0, 50, 150,11561,11438, 0,
+ 0, 0, 0, 0,11438, 0, 0, 0, 0, 0,
+ 0, 0,11438,11438,11561,11561,11561,11561, 9222, 9222,
+11561,11561,11561,11561,11561,11561,11561,11561,11561,11561,
+11561,11561,11561,11561,11561,11561,11561,11561,11561,11561,
+15862,10621, 0, 2619,10968, 0, 0, 0, 0,11561,
+ 0, 154,11561, 0, 0, 0, 0, 9222, 5776, 9222,
+ 0, 5812, 6331, 0, -3, 0, 0, 0, 0, 154,
+16959,16487, 0, 0, 0, 0, 0, 154, 0, 363,
+ 0, 154, 0, 363, 0, 0, 0, 0, 0, 0,
+ -29, 0,16841, 0, 154, 1483, 0, 0, 0,10968,
+ 0, 0, 1898, 0, 0,11438, 0, 0, 0,16201,
+ 0, -109, 0, 0, 0, 0, 0, 0, 0,11438,
+ 0, 0,11438,11438, 1330, 0, -63, 0, 0, 0,
+ -29,11561, 0, 0, 7596, 7718, 0, 0,11438, 0,
+ 0, 0, 154, 0, 154, 154, 154, 154, 154, 154,
+ 154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
+ 154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
+ 154, 154, 154, 154, 154, 0, 0, 3034,10968, 0,
+ 0, 0, 0, 0, 154, 0, 0, 154, -23, 0,
+ 154, 9688, 154, 9688, 154, 0, -7, 0, 0, 0,
+11438, 0, 154, 0, 0, 0, 247, 0, 0, 0,
+ 0, -66, 0, 0, 0, 0, 0, 0, 0,10968,
+ 3187, 0, 0, -68, 154, 0, 0, 0, 0, 0,
+ 0, 0, 0, 594, 0, -56,16201,16841, 0, 0,
+ 0, 0, 0, 0, 0, 511, 0, 0, 510, 0,
+ 154, 0, 0, 154, 0, 7134, 5982, 0, 0,11438,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 4817, 4952, 0, 4366, 0, 4745, 0, 4195, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+10968, 3602, 0,10968, 0,10968, 0, 0, 0, 0,
+ 0, 154, 0, 154, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, -95, 0, 0, 0, 0, 510, 0,
+14814, 0, 0, 0, 0,10968, 0, 0, 0, 0,
+13776, 9222, 0,11438, -24, -24, 0, 596, 0, -109,
+ 513, 0, 0, 0, 0, 0, 510, 0, 8058, 8180,
+ 0, 0, 0, 0,10968, 0, 0, 0, 0, 0,
+ 0, 0, 363, 0, 0, -93, 0,16841, 0, 0,
+ 0, 516, 0, 0, 154, 0, 0, 0,16605, 0,
+ 0, 511, 0, 0, 0, 0, 511, -109, 0, 0,
+ 0,11438, 0, 0, 0, 0, 0, 0, 0, 363,
+ 0, 0, 0, -66, 517, 0, 0, 0, -85, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 518, 0,
+ 0, 0, 0, 0, 0, -29, 510, 0, 510, 0,
+ 0, 511, 0, 0, 0, 0, 154, 0, 0, 511,
+ 0, 0, 0, 0, 0, 0, 154, -29, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 510, 0,
+ 0, 0, 0, 510, 0,
};
final static short yygindex[] = { 0,
- 1, 0, 110, 56, 0, -26, 211, 330, -140, -156,
- 0, -264, 265, 0, 208, 0, 0, 71, 197, 189,
- 355, -181, -153, -69, -83, 0, -17, 172, 215, 161,
- 170, 0, 0, -129, 0, 0, 231, -121, -229, 91,
- 0, -1, 0, 409, 0, -114, -236, 354, 0, 387,
- 0, 0, 0, 242, 142, 0, 0, -109, -328, 0,
- 0, -277, -265, -244, -164, -91, 0, 0, -122, 304,
- -423, 0, 0, 0, 0, 282, 0, 0, 0, -228,
- 0, 0, -52, -203, -562, -51, 0, 25, 244, 0,
- -222, -557, -5, 0, 0, 0, -575, 0, -534, 141,
- 0, -48,
+ 1, 0, 404, 14, 0, -5, 250, 374, -136, -137,
+ 0, -263, 221, 0, 114, 0, 0, 51, 224, 228,
+ -248, -149, -167, -14, -62, 0, 13, 205, 126, -1,
+ 206, 0, 0, -77, 0, 0, 23, -118, -232, 21,
+ 0, -4, 0, 361, 0, -121, -233, 386, 0, 420,
+ 0, 0, 0, 276, 165, 0, 0, -114, -321, 0,
+ 0, -258, -340, -229, -146, -61, 0, 0, -113, 329,
+ -257, 0, 0, 0, 0, 311, 0, 0, 0, -214,
+ 0, 0, -18, -251, -559, -15, 0, 45, 268, 0,
+ -264, -561, 20, 0, 0, 0, -579, 0, -555, 162,
+ 0, -21,
};
-final static int YYTABLESIZE=17267;
+final static int YYTABLESIZE=17338;
//These two tables are not statically initialized, but rather
//initialized on first use, so that a failure to initialize them
@@ -679,7 +679,7 @@
yytable = (short[])obInp.readObject();
yycheck = (short[])obInp.readObject();
long hash = EYaccFixer.checkhash(yytable, yycheck);
- if (hash != -1178886645508635805L) {
+ if (hash != -6617099290233459027L) {
throw new RuntimeException(rName + " bad checkhash: " +
hash);
}
@@ -810,18 +810,18 @@
"postfix : call",
"postfix : metaExpr",
"postfix : postfix '[' argList ']'",
-"postfix : postfix Send verb '(' argList ')'",
-"postfix : postfix Send '(' argList ')'",
+"postfix : postfix Send br verb '(' argList ')'",
+"postfix : postfix Send br '(' argList ')'",
"postfix : postfix verb",
"postfix : postfix '.' ident",
"postfix : postfix '.' ident '(' argList ')'",
-"postfix : postfix Send verb",
+"postfix : postfix Send br verb",
"metaExpr : META '(' argList ')'",
"metaExpr : META verb '(' argList ')'",
-"metaExpr : META Send '(' argList ')'",
-"metaExpr : META Send verb '(' argList ')'",
+"metaExpr : META Send br '(' argList ')'",
+"metaExpr : META Send br verb '(' argList ')'",
"metaExpr : META verb",
-"metaExpr : META Send verb",
+"metaExpr : META Send br verb",
"call : prim",
"call : call '(' argList ')'",
"call : postfix verb '(' argList ')'",
@@ -1549,7 +1549,7 @@
*/
static public final IntTable TheTokenTable = tokenTable(TheTokens);
-//#line 4928 "EParser.java"
+//#line 4942 "EParser.java"
//###############################################################
// method: yylexdebug : check lexer state
//###############################################################
@@ -1915,31 +1915,31 @@
break;
case 80:
//#line 385 "e.y"
-{ yyval = send(val_peek(5), val_peek(3), val_peek(1)); }
+{ yyval = send(val_peek(6), val_peek(3), val_peek(1)); }
break;
case 81:
//#line 386 "e.y"
-{ yyval = send(val_peek(4), "run", val_peek(1)); }
+{ yyval = send(val_peek(5), "run", val_peek(1)); }
break;
case 82:
//#line 388 "e.y"
{ pocket("no-paren-call");
- yyval = call(val_peek(1), val_peek(0), list()); }
+ yyval = call(val_peek(1), val_peek(0), list()); }
break;
case 83:
//#line 390 "e.y"
{ pocket("dot-props");
- yyval = property(val_peek(2), val_peek(0), list()); }
+ yyval = property(val_peek(2), val_peek(0), list()); }
break;
case 84:
//#line 392 "e.y"
{ pocket("dot-props");
- yyval = property(val_peek(5), val_peek(3), val_peek(1)); }
+ yyval = property(val_peek(5), val_peek(3), val_peek(1)); }
break;
case 85:
//#line 394 "e.y"
{ pocket("no-paren-call");
- yyval = send(val_peek(2), val_peek(0), list()); }
+ yyval = send(val_peek(3), val_peek(0), list()); }
break;
case 86:
//#line 402 "e.y"
@@ -1960,12 +1960,12 @@
case 90:
//#line 407 "e.y"
{ pocket("no-paren-call");
- yyval = doMeta(val_peek(0), list()); }
+ yyval = doMeta(val_peek(0), list()); }
break;
case 91:
//#line 409 "e.y"
{ pocket("no-paren-call");
- yyval = doMetaSend(val_peek(0), list()); }
+ yyval = doMetaSend(val_peek(0), list()); }
break;
case 93:
//#line 423 "e.y"
@@ -2680,7 +2680,7 @@
//#line 1044 "e.y"
{ yyval = val_peek(0); }
break;
-//#line 6056 "EParser.java"
+//#line 6070 "EParser.java"
//########## END OF USER-SUPPLIED ACTIONS ##########
}//switch
//#### Now let's reduce... ####
1.74 +19 -19 e/src/jsrc/org/erights/e/elang/syntax/e.y
Index: e.y
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/syntax/e.y,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- e.y 2001/04/28 10:00:05 1.73
+++ e.y 2001/08/13 20:38:11 1.74
@@ -381,33 +381,33 @@
postfix:
call
| metaExpr
- | postfix '[' argList ']' { $$ = call($1, "get", $3); }
- | postfix Send verb '(' argList ')' { $$ = send($1, $3, $5); }
- | postfix Send '(' argList ')' { $$ = send($1, "run", $4); }
+ | postfix '[' argList ']' { $$ = call($1, "get", $3); }
+ | postfix Send br verb '(' argList ')' { $$ = send($1, $4, $6); }
+ | postfix Send br '(' argList ')' { $$ = send($1, "run", $5); }
- | postfix verb { pocket("no-paren-call");
- $$ = call($1, $2, list()); }
- | postfix '.' ident { pocket("dot-props");
- $$ = property($1, $3, list()); }
- | postfix '.' ident '(' argList ')' { pocket("dot-props");
- $$ = property($1, $3, $5); }
- | postfix Send verb { pocket("no-paren-call");
- $$ = send($1, $3, list()); }
+ | postfix verb { pocket("no-paren-call");
+ $$ = call($1, $2, list()); }
+ | postfix '.' ident { pocket("dot-props");
+ $$ = property($1, $3, list()); }
+ | postfix '.' ident '(' argList ')' { pocket("dot-props");
+ $$ = property($1, $3, $5); }
+ | postfix Send br verb { pocket("no-paren-call");
+ $$ = send($1, $4, list()); }
;
/**
*
*/
metaExpr:
- META '(' argList ')' { $$ = doMeta("run", $3); }
- | META verb '(' argList ')' { $$ = doMeta($2, $4); }
- | META Send '(' argList ')' { $$ = doMetaSend("run", $4); }
- | META Send verb '(' argList ')' { $$ = doMetaSend($3, $5); }
+ META '(' argList ')' { $$ = doMeta("run", $3); }
+ | META verb '(' argList ')' { $$ = doMeta($2, $4); }
+ | META Send br '(' argList ')' { $$ = doMetaSend("run", $5); }
+ | META Send br verb '(' argList ')' { $$ = doMetaSend($4, $6); }
- | META verb { pocket("no-paren-call");
- $$ = doMeta($2, list()); }
- | META Send verb { pocket("no-paren-call");
- $$ = doMetaSend($3, list()); }
+ | META verb { pocket("no-paren-call");
+ $$ = doMeta($2, list()); }
+ | META Send br verb { pocket("no-paren-call");
+ $$ = doMetaSend($4, list()); }
;