Skip to content

Commit 376b4e3

Browse files
grammarwaregrammarware
committedMar 5, 2009
massage does not use fixed point computations anymore, JLS case works
git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@513 ab42f6e0-554d-0410-b580-99e487e6eeb2
1 parent 6eb6385 commit 376b4e3

File tree

5 files changed

+264
-19
lines changed

5 files changed

+264
-19
lines changed
 

‎shared/prolog/xbgf1.pro

+4-4
Original file line numberDiff line numberDiff line change
@@ -658,10 +658,10 @@ massage_rules(','([X,?(','([Y,X]))]),','([?(','([X,Y])),X])).
658658
massage_rules(','([X,+(','([Y,X]))]),','([+(','([X,Y])),X])).
659659
massage_rules(','([X,*(','([Y,X]))]),','([*(','([X,Y])),X])).
660660
%% Binary distributivity of optionality
661-
massage_rules(?(','([?(X),Y])),','([?(X),?(Y)])).
662-
massage_rules(?(','([X,?(Y)])),','([?(X),?(Y)])).
663-
massage_rules(?(','([*(X),Y])),','([*(X),?(Y)])).
664-
massage_rules(?(','([X,*(Y)])),','([?(X),*(Y)])).
661+
%massage_rules(?(','([?(X),?(Y)])),','([?(X),?(Y)])).
662+
%%massage_rules(?(','([*(X),?(Y)])),','([*(X),?(Y)])).
663+
%massage_rules(?(','([?(X),*(Y)])),','([?(X),*(Y)])).
664+
%massage_rules(?(','([*(X),*(Y)])),','([*(X),*(Y)])).
665665
massage_rules(?(';'([X,Y])),';'([?(X),?(Y)])).
666666

667667
%

‎topics/java/lci/java-lci.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
<None Include="..\..\..\shared\xsd\lcf.xsd">
4949
<Link>lcf.xsd</Link>
5050
</None>
51+
<None Include="..\..\..\shared\xsd\ldf.xsd">
52+
<Link>ldf.xsd</Link>
53+
</None>
5154
<None Include="..\..\..\shared\xsd\xbgf.xsd">
5255
<Link>xbgf.xsd</Link>
5356
</None>

‎topics/java/lci/snapshot/architecture_large.pdf

2.18 KB
Binary file not shown.

‎topics/java/lci/xbgf/edit-doc2.xbgf

+128-6
Original file line numberDiff line numberDiff line change
@@ -1337,23 +1337,145 @@
13371337
</xbgf:extract>
13381338
<xbgf:massage>
13391339
<bgf:expression>
1340-
<sequence>
1340+
<optional>
1341+
<bgf:expression>
1342+
<nonterminal>TMP</nonterminal>
1343+
</bgf:expression>
1344+
</optional>
1345+
</bgf:expression>
1346+
<bgf:expression>
1347+
<choice>
1348+
<bgf:expression>
1349+
<nonterminal>TMP</nonterminal>
1350+
</bgf:expression>
1351+
<bgf:expression>
1352+
<epsilon/>
1353+
</bgf:expression>
1354+
</choice>
1355+
</bgf:expression>
1356+
</xbgf:massage>
1357+
<xbgf:distribute>
1358+
<nonterminal>ArrayInitializer</nonterminal>
1359+
</xbgf:distribute>
1360+
<xbgf:vertical>
1361+
<nonterminal>ArrayInitializer</nonterminal>
1362+
</xbgf:vertical>
1363+
<xbgf:disappear>
1364+
<bgf:production>
1365+
<nonterminal>ArrayInitializer</nonterminal>
1366+
<bgf:expression>
1367+
<sequence>
1368+
<bgf:expression>
1369+
<terminal>{</terminal>
1370+
</bgf:expression>
1371+
<bgf:expression>
1372+
<marked>
1373+
<bgf:expression>
1374+
<optional>
1375+
<bgf:expression>
1376+
<terminal>,</terminal>
1377+
</bgf:expression>
1378+
</optional>
1379+
</bgf:expression>
1380+
</marked>
1381+
</bgf:expression>
1382+
<bgf:expression>
1383+
<terminal>}</terminal>
1384+
</bgf:expression>
1385+
</sequence>
1386+
</bgf:expression>
1387+
</bgf:production>
1388+
</xbgf:disappear>
1389+
<xbgf:horizontal>ArrayInitializer</xbgf:horizontal>
1390+
<xbgf:factor>
1391+
<bgf:expression>
1392+
<choice>
13411393
<bgf:expression>
1342-
<optional>
1394+
<sequence>
1395+
<bgf:expression>
1396+
<terminal>{</terminal>
1397+
</bgf:expression>
13431398
<bgf:expression>
13441399
<nonterminal>TMP</nonterminal>
13451400
</bgf:expression>
1346-
</optional>
1401+
<bgf:expression>
1402+
<optional>
1403+
<bgf:expression>
1404+
<terminal>,</terminal>
1405+
</bgf:expression>
1406+
</optional>
1407+
</bgf:expression>
1408+
<bgf:expression>
1409+
<terminal>}</terminal>
1410+
</bgf:expression>
1411+
</sequence>
1412+
</bgf:expression>
1413+
<bgf:expression>
1414+
<sequence>
1415+
<bgf:expression>
1416+
<terminal>{</terminal>
1417+
</bgf:expression>
1418+
<bgf:expression>
1419+
<terminal>}</terminal>
1420+
</bgf:expression>
1421+
</sequence>
1422+
</bgf:expression>
1423+
</choice>
1424+
</bgf:expression>
1425+
<bgf:expression>
1426+
<sequence>
1427+
<bgf:expression>
1428+
<terminal>{</terminal>
13471429
</bgf:expression>
13481430
<bgf:expression>
1349-
<optional>
1431+
<choice>
1432+
<bgf:expression>
1433+
<sequence>
1434+
<bgf:expression>
1435+
<nonterminal>TMP</nonterminal>
1436+
</bgf:expression>
1437+
<bgf:expression>
1438+
<optional>
1439+
<bgf:expression>
1440+
<terminal>,</terminal>
1441+
</bgf:expression>
1442+
</optional>
1443+
</bgf:expression>
1444+
</sequence>
1445+
</bgf:expression>
13501446
<bgf:expression>
1351-
<terminal>,</terminal>
1447+
<epsilon/>
13521448
</bgf:expression>
1353-
</optional>
1449+
</choice>
1450+
</bgf:expression>
1451+
<bgf:expression>
1452+
<terminal>}</terminal>
13541453
</bgf:expression>
13551454
</sequence>
13561455
</bgf:expression>
1456+
</xbgf:factor>
1457+
<xbgf:massage>
1458+
<bgf:expression>
1459+
<choice>
1460+
<bgf:expression>
1461+
<sequence>
1462+
<bgf:expression>
1463+
<nonterminal>TMP</nonterminal>
1464+
</bgf:expression>
1465+
<bgf:expression>
1466+
<optional>
1467+
<bgf:expression>
1468+
<terminal>,</terminal>
1469+
</bgf:expression>
1470+
</optional>
1471+
</bgf:expression>
1472+
</sequence>
1473+
</bgf:expression>
1474+
<bgf:expression>
1475+
<epsilon/>
1476+
</bgf:expression>
1477+
</choice>
1478+
</bgf:expression>
13571479
<bgf:expression>
13581480
<optional>
13591481
<bgf:expression>

‎topics/java/lci/xbgf/editDeclarations.xbgf

+129-9
Original file line numberDiff line numberDiff line change
@@ -1379,9 +1379,7 @@
13791379
</in>
13801380
</xbgf:fold>
13811381

1382-
<!--
1383-
Fixing brutally
1384-
1382+
<!-- ISSUE CORRECT
13851383
- Fail: ArrayInitializer.
13861384
- [], ,([t({), ?(,([n(VariableInitializer), *(,([t((,)), n(VariableInitializer)]))])), ?(t((,))), t(})])
13871385
vs.
@@ -1415,23 +1413,145 @@
14151413
</xbgf:extract>
14161414
<xbgf:massage>
14171415
<bgf:expression>
1418-
<sequence>
1416+
<optional>
14191417
<bgf:expression>
1420-
<optional>
1418+
<nonterminal>TMP</nonterminal>
1419+
</bgf:expression>
1420+
</optional>
1421+
</bgf:expression>
1422+
<bgf:expression>
1423+
<choice>
1424+
<bgf:expression>
1425+
<nonterminal>TMP</nonterminal>
1426+
</bgf:expression>
1427+
<bgf:expression>
1428+
<epsilon/>
1429+
</bgf:expression>
1430+
</choice>
1431+
</bgf:expression>
1432+
</xbgf:massage>
1433+
<xbgf:distribute>
1434+
<nonterminal>ArrayInitializer</nonterminal>
1435+
</xbgf:distribute>
1436+
<xbgf:vertical>
1437+
<nonterminal>ArrayInitializer</nonterminal>
1438+
</xbgf:vertical>
1439+
<xbgf:disappear>
1440+
<bgf:production>
1441+
<nonterminal>ArrayInitializer</nonterminal>
1442+
<bgf:expression>
1443+
<sequence>
1444+
<bgf:expression>
1445+
<terminal>{</terminal>
1446+
</bgf:expression>
1447+
<bgf:expression>
1448+
<marked>
1449+
<bgf:expression>
1450+
<optional>
1451+
<bgf:expression>
1452+
<terminal>,</terminal>
1453+
</bgf:expression>
1454+
</optional>
1455+
</bgf:expression>
1456+
</marked>
1457+
</bgf:expression>
1458+
<bgf:expression>
1459+
<terminal>}</terminal>
1460+
</bgf:expression>
1461+
</sequence>
1462+
</bgf:expression>
1463+
</bgf:production>
1464+
</xbgf:disappear>
1465+
<xbgf:horizontal>ArrayInitializer</xbgf:horizontal>
1466+
<xbgf:factor>
1467+
<bgf:expression>
1468+
<choice>
1469+
<bgf:expression>
1470+
<sequence>
1471+
<bgf:expression>
1472+
<terminal>{</terminal>
1473+
</bgf:expression>
14211474
<bgf:expression>
14221475
<nonterminal>TMP</nonterminal>
14231476
</bgf:expression>
1424-
</optional>
1477+
<bgf:expression>
1478+
<optional>
1479+
<bgf:expression>
1480+
<terminal>,</terminal>
1481+
</bgf:expression>
1482+
</optional>
1483+
</bgf:expression>
1484+
<bgf:expression>
1485+
<terminal>}</terminal>
1486+
</bgf:expression>
1487+
</sequence>
14251488
</bgf:expression>
14261489
<bgf:expression>
1427-
<optional>
1490+
<sequence>
1491+
<bgf:expression>
1492+
<terminal>{</terminal>
1493+
</bgf:expression>
1494+
<bgf:expression>
1495+
<terminal>}</terminal>
1496+
</bgf:expression>
1497+
</sequence>
1498+
</bgf:expression>
1499+
</choice>
1500+
</bgf:expression>
1501+
<bgf:expression>
1502+
<sequence>
1503+
<bgf:expression>
1504+
<terminal>{</terminal>
1505+
</bgf:expression>
1506+
<bgf:expression>
1507+
<choice>
1508+
<bgf:expression>
1509+
<sequence>
1510+
<bgf:expression>
1511+
<nonterminal>TMP</nonterminal>
1512+
</bgf:expression>
1513+
<bgf:expression>
1514+
<optional>
1515+
<bgf:expression>
1516+
<terminal>,</terminal>
1517+
</bgf:expression>
1518+
</optional>
1519+
</bgf:expression>
1520+
</sequence>
1521+
</bgf:expression>
14281522
<bgf:expression>
1429-
<terminal>,</terminal>
1523+
<epsilon/>
14301524
</bgf:expression>
1431-
</optional>
1525+
</choice>
1526+
</bgf:expression>
1527+
<bgf:expression>
1528+
<terminal>}</terminal>
14321529
</bgf:expression>
14331530
</sequence>
14341531
</bgf:expression>
1532+
</xbgf:factor>
1533+
<xbgf:massage>
1534+
<bgf:expression>
1535+
<choice>
1536+
<bgf:expression>
1537+
<sequence>
1538+
<bgf:expression>
1539+
<nonterminal>TMP</nonterminal>
1540+
</bgf:expression>
1541+
<bgf:expression>
1542+
<optional>
1543+
<bgf:expression>
1544+
<terminal>,</terminal>
1545+
</bgf:expression>
1546+
</optional>
1547+
</bgf:expression>
1548+
</sequence>
1549+
</bgf:expression>
1550+
<bgf:expression>
1551+
<epsilon/>
1552+
</bgf:expression>
1553+
</choice>
1554+
</bgf:expression>
14351555
<bgf:expression>
14361556
<optional>
14371557
<bgf:expression>

0 commit comments

Comments
 (0)
Please sign in to comment.