Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
separate "semantic recovery cont'd" from real corrections (also usefu…
…l for pretty-printing)

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@407 ab42f6e0-554d-0410-b580-99e487e6eeb2
  • Loading branch information
grammarware committed Nov 7, 2008
1 parent 3825c37 commit b0254b0
Show file tree
Hide file tree
Showing 9 changed files with 435 additions and 409 deletions.
3 changes: 3 additions & 0 deletions topics/java/lci/java-lci.csproj
Expand Up @@ -81,6 +81,9 @@
<None Include="xbgf\generalizeStatements.xbgf" />
<None Include="xbgf\inline-jls2.xbgf" />
<None Include="xbgf\inlineStatements.xbgf" />
<None Include="xbgf\recover-app3.xbgf" />
<None Include="xbgf\recover-doc2.xbgf" />
<None Include="xbgf\recover-doc3.xbgf" />
<None Include="xbgf\refactor-app1.xbgf" />
<None Include="xbgf\refactor-app2.xbgf" />
<None Include="xbgf\refactor-app3.xbgf" />
Expand Down
5 changes: 5 additions & 0 deletions topics/java/lci/java.lcf
Expand Up @@ -113,6 +113,7 @@
</branch>
<branch>
<input>doc2</input>
<perform>recover-doc2</perform>
<perform>correct-doc2</perform>
<perform>generalizeModifiers</perform>
<perform>generalizeNames</perform>
Expand All @@ -135,6 +136,7 @@
<name>jls3</name>
<branch>
<input>app3</input>
<perform>recover-app3</perform>
<perform>correct-app3</perform>
<perform>refactor-app3</perform>
<perform>generalizeLabels</perform>
Expand All @@ -143,6 +145,7 @@
</branch>
<branch>
<input>doc3</input>
<perform>recover-doc3</perform>
<perform>correct-doc3</perform>
<perform>generalizeModifiers</perform>
<perform>generalizeNames</perform>
Expand Down Expand Up @@ -201,6 +204,7 @@
</branch>
<branch>
<input>doc2</input>
<perform>recover-doc2</perform>
<perform>correct-doc2</perform>
</branch>
</target>
Expand All @@ -214,6 +218,7 @@
</branch>
<branch>
<input>doc3</input>
<perform>recover-doc3</perform>
<perform>correct-doc3</perform>
</branch>
</target>
Expand Down
62 changes: 0 additions & 62 deletions topics/java/lci/xbgf/correct-app3.xbgf
Expand Up @@ -18,68 +18,6 @@ Annotation:
<to>QualifiedIdentifier</to>
</xbgf:unite>

<!-- ISSUE EXTRACTERROR
The extractor can't tell if {} are terminals or BNF

- Fail: Block.
- [], *(n(BlockStatements))
vs.
- [], ,([t({), n(BlockStatements), t(})])
-->
<!-- BREFACTOR -->
<xbgf:undefine>Block</xbgf:undefine>
<!-- REVISE -->
<xbgf:define>
<bgf:production>
<nonterminal>Block</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>{</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>BlockStatements</nonterminal>
</bgf:expression>
<bgf:expression>
<terminal>}</terminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:define>

<!-- ISSUE EXTRACTERROR
- Fail: AnnotationTypeBody.
- [], *(?(n(AnnotationTypeElementDeclarations)))
vs.
- [], ,([t({), ?(n(AnnotationTypeElementDeclarations)), t(})])
-->
<!-- BREFACTOR -->
<xbgf:undefine>AnnotationTypeBody</xbgf:undefine>
<!-- REVISE -->
<xbgf:define>
<bgf:production>
<nonterminal>AnnotationTypeBody</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>{</terminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>AnnotationTypeElementDeclarations</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>}</terminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:define>

<!-- ISSUE CORRECT SPECERROR
Real error in JLS3:
- Fail: Expression2Rest.
Expand Down
227 changes: 0 additions & 227 deletions topics/java/lci/xbgf/correct-doc2.xbgf
Expand Up @@ -26,221 +26,6 @@
<add>Identifer</add>
<to>Identifier</to>
</xbgf:unite>

<!-- ISSUE EXTRACTERROR
Error in markup of JLS2
- Fail: InterfaceBody.
- [], ,([t({), ?(n(InterfaceMemberDeclarations)), t(})])
vs.
- [], *(?(n(InterfaceMemberDeclarations)))
-->
<!-- BREFACTOR -->
<xbgf:undefine>InterfaceBody</xbgf:undefine>
<!-- GENERALITY -->
<xbgf:define>
<bgf:production>
<nonterminal>InterfaceBody</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>{</terminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>InterfaceMemberDeclarations</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>}</terminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:define>

<!-- ISSUE EXTRACTERROR
Error in markup of JLS2
- Fail: ClassBody.
- [], ,([t({), ?(n(ClassBodyDeclarations)), t(})])
vs.
- [], *(?(n(ClassBodyDeclarations)))
-->
<!-- BREFACTOR -->
<xbgf:undefine>ClassBody</xbgf:undefine>
<!-- GENERALITY -->
<xbgf:define>
<bgf:production>
<nonterminal>ClassBody</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>{</terminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>ClassBodyDeclarations</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>}</terminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:define>

<!-- ISSUE EXTRACTERROR
Error in markup in JLS2

- Fail: ConstructorBody.
- [], ,([t({), ?(n(ExplicitConstructorInvocation)), ?(n(BlockStatements)), t(})])
vs.
- [], *(,([?(n(ExplicitConstructorInvocation)), ?(n(BlockStatements))]))
-->
<!-- BREFACTOR -->
<xbgf:undefine>ConstructorBody</xbgf:undefine>
<!-- GENERALITY -->
<xbgf:define>
<bgf:production>
<nonterminal>ConstructorBody</nonterminal>
<bgf:expression>
<star>
<bgf:expression>
<sequence>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>ExplicitConstructorInvocation</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>BlockStatements</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
</sequence>
</bgf:expression>
</star>
</bgf:expression>
</bgf:production>
</xbgf:define>

<!-- ISSUE EXTRACTERROR
- Fail: Block.
- [], ,([t({), ?(n(BlockStatements)), t(})])
vs.
- [], *(?(n(BlockStatements)))
-->
<!-- BREFACTOR -->
<xbgf:undefine>Block</xbgf:undefine>
<!-- GENERALITY -->
<xbgf:define>
<bgf:production>
<nonterminal>Block</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>{</terminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>BlockStatements</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>}</terminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:define>

<!-- ISSUE EXTRACTERROR
- Fail: SwitchBlock.
- [], ,([t({), ?(n(SwitchBlockStatementGroups)), ?(n(SwitchLabels)), t(})])
vs.
- [], *(,([?(n(SwitchBlockStatementGroups)), ?(n(SwitchLabels))]))
-->
<!-- BREFACTOR -->
<xbgf:undefine>SwitchBlock</xbgf:undefine>
<!-- GENERALITY -->
<xbgf:define>
<bgf:production>
<nonterminal>SwitchBlock</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>{</terminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>SwitchBlockStatementGroups</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>SwitchLabels</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>}</terminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:define>

<!-- ISSUE EXTRACTERROR
- Fail: ConstructorBody.
- [], ,([t({), ?(n(ExplicitConstructorInvocation)), ?(n(BlockStatements)), t(})])
vs.
- [], *(,([?(n(ExplicitConstructorInvocation)), ?(n(BlockStatements))]))
-->
<!-- BREFACTOR -->
<xbgf:undefine>ConstructorBody</xbgf:undefine>
<!-- GENERALITY -->
<xbgf:define>
<bgf:production>
<nonterminal>ConstructorBody</nonterminal>
<bgf:expression>
<sequence>
<bgf:expression>
<terminal>{</terminal>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>ExplicitConstructorInvocation</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<optional>
<bgf:expression>
<nonterminal>BlockStatements</nonterminal>
</bgf:expression>
</optional>
</bgf:expression>
<bgf:expression>
<terminal>}</terminal>
</bgf:expression>
</sequence>
</bgf:expression>
</bgf:production>
</xbgf:define>

<!-- ISSUE CORRECT SPECERROR
Left forgotten and undefined -->
Expand Down Expand Up @@ -271,18 +56,6 @@
</bgf:production>
</xbgf:define>

<!-- ISSUE EXTRACTERROR
Error in PrimaryNoNewArray undetected by the extractor due to lacking definition -->
<!-- REVISE -->
<xbgf:replace>
<bgf:expression>
<terminal>ClassName</terminal>
</bgf:expression>
<bgf:expression>
<nonterminal>ClassName</nonterminal>
</bgf:expression>
</xbgf:replace>

<!-- ISSUE CORRECT SPECERROR
- Fail: ConstructorDeclarator.
- [], ,([n(Identifier), t((), ?(n(FormalParameterList)), t())])
Expand Down

0 comments on commit b0254b0

Please sign in to comment.