Skip to content

Commit

Permalink
refactoring FL case study after TXL branch added
Browse files Browse the repository at this point in the history 
git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@663 ab42f6e0-554d-0410-b580-99e487e6eeb2
  • Loading branch information
@grammarware
grammarware committed Jul 23, 2009
1 parent 881caaf commit ea443f4
Show file tree
Hide file tree
Showing 10 changed files with 222 additions and 37 deletions.
2 changes: 0 additions & 2 deletions topics/extraction/txl2bgf/fl.bgf
View file

This file was deleted.

7 changes: 6 additions & 1 deletion topics/fl/lci/fl-lci.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,15 @@
</None>
<None Include="fl.lcf" />
<None Include="xbgf\defineLex.xbgf" />
<None Include="xbgf\designateOps.xbgf" />
<None Include="xbgf\extractOps.xbgf" />
<None Include="xbgf\makeSignature.xbgf" />
<None Include="xbgf\massage-model.xbgf" />
<None Include="xbgf\multipleNewlines.xbgf" />
<None Include="xbgf\permuteArgs.xbgf" />
<None Include="xbgf\preferDcg.xbgf" />
<None Include="xbgf\preferJaxb.xbgf" />
<None Include="xbgf\preferSdf.xbgf" />
<None Include="xbgf\removeLayers.xbgf" />
<None Include="xbgf\rename-antlr.xbgf" />
<None Include="xbgf\rename-ecore.xbgf" />
Expand All @@ -70,7 +73,9 @@
<None Include="xbgf\rename-model.xbgf" />
<None Include="xbgf\rename-om.xbgf" />
<None Include="xbgf\rename-sdf.xbgf" />
<None Include="xbgf\reroot.xbgf" />
<None Include="xbgf\rename-txl.xbgf" />
<None Include="xbgf\reroot-lower.xbgf" />
<None Include="xbgf\reroot-upper.xbgf" />
<None Include="xbgf\resolveAggregation.xbgf" />
<None Include="xbgf\stripNewline.xbgf" />
<None Include="xbgf\stripSelectors.xbgf" />
Expand Down
44 changes: 37 additions & 7 deletions topics/fl/lci/fl.lcf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,15 @@
</testing>
</source>

<source>
<name>txl</name>
<grammar>
<extraction>
<expand>tools</expand>/txl2bgf <expand>fl</expand>/txl/FL.Txl
</extraction>
</grammar>
</source>

<source>
<name>ecore</name>
<grammar>
Expand Down Expand Up @@ -246,18 +255,13 @@
</nominal-matching>
<structural-matching>
<perform>preferDcg</perform>
<perform>designateOps</perform>
</structural-matching>
</branch>
</target>

<target>
<name>concrete</name>
<branch>
<input>topdown</input>
<structural-matching>
<perform>removeLayers</perform>
</structural-matching>
</branch>
<name>xframeworks</name>
<branch>
<input>sdf</input>
<nominal-matching>
Expand All @@ -267,6 +271,32 @@
</automated>
</nominal-matching>
</branch>
<branch>
<input>txl</input>
<nominal-matching>
<perform>rename-txl</perform>
</nominal-matching>
<structural-matching>
<perform>preferSdf</perform>
<perform>designateOps</perform>
</structural-matching>
<relaxation>
<perform>multipleNewlines</perform>
</relaxation>
</branch>
</target>

<target>
<name>concrete</name>
<branch>
<input>topdown</input>
<structural-matching>
<perform>removeLayers</perform>
</structural-matching>
</branch>
<branch>
<input>xframeworks</input>
</branch>
</target>

<target>
Expand Down
Binary file modified topics/fl/lci/snapshot/architecture_large.pdf
View file
Binary file not shown.
Binary file modified topics/fl/lci/snapshot/architecture_small.pdf
View file
Binary file not shown.
31 changes: 31 additions & 0 deletions topics/fl/lci/xbgf/designateOps.xbgf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<xbgf:sequence
xmlns:bgf="http://planet-sl.org/bgf"
xmlns:xbgf="http://planet-sl.org/xbgf">
<xbgf:designate>
<bgf:production>
<label>equal</label>
<nonterminal>ops</nonterminal>
<bgf:expression>
<terminal>==</terminal>
</bgf:expression>
</bgf:production>
</xbgf:designate>
<xbgf:designate>
<bgf:production>
<label>plus</label>
<nonterminal>ops</nonterminal>
<bgf:expression>
<terminal>+</terminal>
</bgf:expression>
</bgf:production>
</xbgf:designate>
<xbgf:designate>
<bgf:production>
<label>minus</label>
<nonterminal>ops</nonterminal>
<bgf:expression>
<terminal>-</terminal>
</bgf:expression>
</bgf:production>
</xbgf:designate>
</xbgf:sequence>
19 changes: 19 additions & 0 deletions topics/fl/lci/xbgf/multipleNewlines.xbgf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<xbgf:sequence
xmlns:bgf="http://planet-sl.org/bgf"
xmlns:xbgf="http://planet-sl.org/xbgf">
<xbgf:widen>
<bgf:expression>
<nonterminal>newline</nonterminal>
</bgf:expression>
<bgf:expression>
<plus>
<bgf:expression>
<nonterminal>newline</nonterminal>
</bgf:expression>
</plus>
</bgf:expression>
<in>
<nonterminal>function</nonterminal>
</in>
</xbgf:widen>
</xbgf:sequence>
27 changes: 0 additions & 27 deletions topics/fl/lci/xbgf/preferDcg.xbgf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,31 +52,4 @@
<xbgf:vertical>
<nonterminal>ops</nonterminal>
</xbgf:vertical>
<xbgf:designate>
<bgf:production>
<label>equal</label>
<nonterminal>ops</nonterminal>
<bgf:expression>
<terminal>==</terminal>
</bgf:expression>
</bgf:production>
</xbgf:designate>
<xbgf:designate>
<bgf:production>
<label>plus</label>
<nonterminal>ops</nonterminal>
<bgf:expression>
<terminal>+</terminal>
</bgf:expression>
</bgf:production>
</xbgf:designate>
<xbgf:designate>
<bgf:production>
<label>minus</label>
<nonterminal>ops</nonterminal>
<bgf:expression>
<terminal>-</terminal>
</bgf:expression>
</bgf:production>
</xbgf:designate>
</xbgf:sequence>
95 changes: 95 additions & 0 deletions topics/fl/lci/xbgf/preferSdf.xbgf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<xbgf:sequence
xmlns:bgf="http://planet-sl.org/bgf"
xmlns:xbgf="http://planet-sl.org/xbgf">
<xbgf:vertical>
<nonterminal>expr</nonterminal>
</xbgf:vertical>
<xbgf:vertical>
<nonterminal>ops</nonterminal>
</xbgf:vertical>
<xbgf:designate>
<bgf:production>
<label>literal</label>
<nonterminal>expr</nonterminal>
<bgf:expression>
<nonterminal>int</nonterminal>
</bgf:expression>
</bgf:production>
</xbgf:designate>
<xbgf:designate>
<bgf:production>
<label>argument</label>
<nonterminal>expr</nonterminal>
<bgf:expression>
<nonterminal>name</nonterminal>
</bgf:expression>
</bgf:production>
</xbgf:designate>
<xbgf:designate>
<bgf:production>
<label>ifThenElse</label>
<nonterminal>expr</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>if</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>expr</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>then</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>expr</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>else</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>expr</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:designate>
<xbgf:designate>
<bgf:production>
<label>apply</label>
<nonterminal>expr</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>name</nonterminal>
</bgf:expression>
<bgf:expression>
<plus>
<bgf:expression>
<nonterminal>expr</nonterminal>
</bgf:expression>
</plus>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:designate>
<xbgf:designate>
<bgf:production>
<label>binary</label>
<nonterminal>expr</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<nonterminal>expr</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>ops</nonterminal>
</bgf:expression>
<bgf:expression>
<nonterminal>expr</nonterminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:designate>
</xbgf:sequence>
34 changes: 34 additions & 0 deletions topics/fl/lci/xbgf/rename-txl.xbgf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>

<bgf:sequence xmlns:bgf="http://planet-sl.org/xbgf">
<bgf:rename>
<nonterminal>
<from>fun</from>
<to>function</to>
</nonterminal>
</bgf:rename>
<bgf:rename>
<nonterminal>
<from>expression</from>
<to>expr</to>
</nonterminal>
</bgf:rename>
<bgf:rename>
<nonterminal>
<from>op</from>
<to>ops</to>
</nonterminal>
</bgf:rename>
<bgf:rename>
<nonterminal>
<from>id</from>
<to>name</to>
</nonterminal>
</bgf:rename>
<bgf:rename>
<nonterminal>
<from>number</from>
<to>int</to>
</nonterminal>
</bgf:rename>
</bgf:sequence>

0 comments on commit ea443f4

Please sign in to comment.