diff --git a/topics/extraction/html2bgf/getpre.py b/topics/extraction/html2bgf/getpre.py
index 9881d62a..5e737ddc 100755
--- a/topics/extraction/html2bgf/getpre.py
+++ b/topics/extraction/html2bgf/getpre.py
@@ -65,7 +65,7 @@ def processSection(text,tagN,cx,p):
yes.append(pair[0])
if pair[1]=='*':
counter[pair[0]]=1000
- if pair[1].find('+')>-1:
+ elif pair[1].find('+')>-1:
counter[pair[0]]=len(pair[1])
pattern[pair[0]]=pair[1]
else:
diff --git a/topics/java/lci/Makefile b/topics/java/lci/Makefile
index ca80992e..0b80b2c5 100644
--- a/topics/java/lci/Makefile
+++ b/topics/java/lci/Makefile
@@ -2,13 +2,8 @@ validator = ../../../shared/tools/checkxml
build:
-diff2: test
- gdt bgf/jls1app.prepare1.refactorStatements.refactorTypes.structure1.addFeatures1to2.cropFeatures1.bgf bgf/jls2.prepare2.bgf
-
diff:
- ../../../shared/tools/xbgf xbgf/refactorClassDeclarations3.xbgf bgf/jls3doc.fixErrors3doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes3.deyaccifyExpressions3.inlineStatements2doc.inlineExpressions2doc.bgf bgf/jls3doc.fixErrors3doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes3.deyaccifyExpressions3.inlineStatements2doc.inlineExpressions2doc.refactorClassDeclarations3.bgf
- ../../../shared/tools/gdt bgf/jls3syntax.fixErrors3.prepare3.bgf bgf/jls3doc.fixErrors3doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes3.deyaccifyExpressions3.inlineStatements2doc.inlineExpressions2doc.refactorClassDeclarations3.bgf
-
+ gdt bgf/jls3app.fixErrors3.prepare3.bgf bgf/jls3doc.fixErrors3doc.unifyModifiers.unifyNames.deyaccify2doc.refactorTypes3.deyaccifyExpressions3.inlineStatements2doc.inlineExpressions2doc.refactorClassDeclarations3.refactorEnumDeclarations.refactorInterfaceDeclarations3.breakSemantics3doc.bgf
test:
python ../../convergence/lci/lci.py java.lcf architecture
@@ -20,12 +15,12 @@ check:
ls -1 bgf/*.bgf | xargs -n1 ${validator} bgf
debug:
- ../../../shared/tools/html2bgf ../jls1/syntax.kw ../jls1/syntax.html 1.bnf -bnf >/dev/null
- ../../../shared/tools/html2bgf ../jls1/collect.kw ../jls1/collected.html q.bnf -bnf >/dev/null
- ../../../shared/tools/html2bgf ../jls2/syntax.html 2.bnf -bnf >/dev/null
- ../../../shared/tools/html2bgf ../jls2/collect.kw ../jls2/collected.html w.bnf -bnf >/dev/null
- ../../../shared/tools/html2bgf ../jls3/syntax.html 3.bnf -bnf >/dev/null
- ../../../shared/tools/html2bgf ../jls3/collect.kw ../jls3/collected.html e.bnf -bnf >/dev/null
+ ../../../shared/tools/html2bgf ../jls1/syntax.kw ../jls1/app.html 1.bnf -bnf >/dev/null
+ ../../../shared/tools/html2bgf ../jls1/collect.kw ../jls1/doc.html q.bnf -bnf >/dev/null
+ ../../../shared/tools/html2bgf ../jls2/app.html 2.bnf -bnf >/dev/null
+ ../../../shared/tools/html2bgf ../jls2/collect.kw ../jls2/doc.html w.bnf -bnf >/dev/null
+ ../../../shared/tools/html2bgf ../jls3/app.html 3.bnf -bnf >/dev/null
+ ../../../shared/tools/html2bgf ../jls3/collect.kw ../jls3/doc.html e.bnf -bnf >/dev/null
clean:
rm -f *~
rm -f bgf/*
diff --git a/topics/java/lci/java-lci.csproj b/topics/java/lci/java-lci.csproj
index e4472ab6..73a6cdb3 100644
--- a/topics/java/lci/java-lci.csproj
+++ b/topics/java/lci/java-lci.csproj
@@ -48,12 +48,6 @@
lcf.xsd
-
- ldf.xsd
-
-
- ldx.xsd
-
xbgf.xsd
@@ -65,7 +59,10 @@
+
+
+
@@ -77,10 +74,13 @@
-
+
+
+
+
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/deyaccifyExpressions3.xbgf b/topics/java/lci/xbgf/deyaccifyExpressions3.xbgf
index 2e7618a4..bfa823dc 100644
--- a/topics/java/lci/xbgf/deyaccifyExpressions3.xbgf
+++ b/topics/java/lci/xbgf/deyaccifyExpressions3.xbgf
@@ -113,6 +113,79 @@
"(" ReferenceType ")" UnaryExpressionNotPlusMinus
-->
+
+
+
+
+ B
+
+
+
+ [
+
+
+ ]
+
+
+
+
+
+ Dims
+
+
+ BracketsOpt
+
+
+
+ Dims
+
+
+
+
+
+
+ Dims
+
+ BracketsOpt
+
+
+ B
+
+
+
+
+
+
+
+
+ [
+
+
+ ]
+
+
+
+
+
+
+
+
+
+
+
+
+ [
+
+
+ ]
+
+
+
+
+
+
+
+
+
+ TypeName
+ QualifiedIdentifier
+
+
+
+ BracketsOpt
+
+
+
+
+
+ [
+
+
+ ]
+
+
+
+
+
+
+
diff --git a/topics/java/lci/xbgf/refactorClassDeclarations3.xbgf b/topics/java/lci/xbgf/refactorClassDeclarations3.xbgf
index a38d645d..afc45a2c 100644
--- a/topics/java/lci/xbgf/refactorClassDeclarations3.xbgf
+++ b/topics/java/lci/xbgf/refactorClassDeclarations3.xbgf
@@ -121,7 +121,7 @@
-
+
@@ -394,7 +394,7 @@
-
+
+
+ BracketsOpt
+
MethodDeclaratorRest
@@ -474,18 +477,7 @@
FormalParameters
-
-
-
-
- [
-
-
- ]
-
-
-
-
+ BracketsOpt
@@ -632,7 +624,7 @@
-
+
@@ -670,14 +662,14 @@
GenericMethodOrConstructorDecl
-
+
ResultType
-
+
ClassBodyDeclaration
-
+
VariableDeclaratorId
-
+
@@ -821,18 +813,7 @@
-
-
-
-
- [
-
-
- ]
-
-
-
-
+ BracketsOpt
@@ -871,7 +852,7 @@
ClassBodyDeclaration
-
+
ModifiersOpt
-
+
TypeParameterList
TypeParameterList
-
+
ConstantDeclaration
AbstractMethodDeclaration
-
+
InterfaceBodyDeclaration
@@ -242,7 +242,335 @@
+
+
+
+ ElementValuePairs
+
+
+
+ ElementValuePairs
+
+
+
+ ElementValuePairs
+
+
+ ,
+
+
+ ElementValuePair
+
+
+
+
+
+ ElementValuePairs
+
+ NormalAnnotation
+ MarkerAnnotation
+ SingleElementAnnotation
+ ElementValuePair
+
+
+
+
+
+
+
+
+ Identifier
+
+
+ =
+
+
+ ElementValue
+
+
+
+
+
+
+
+
+
+
+ Identifier
+
+
+ =
+
+
+ ElementValue
+
+
+
+
+
+
+
+
+
+
+ Annotation
+
+
+ Annotation
+
+
+
+ Annotation
+
+
+
+ @
+
+
+ QualifiedIdentifier
+
+
+ (
+
+
+ )
+
+
+
+
+
+ Annotation
+
+
+
+
+
+
+ @
+
+
+ QualifiedIdentifier
+
+
+ (
+
+
+ Identifier
+
+
+ =
+
+
+ ElementValue
+
+
+ )
+
+
+
+
+
+
+ @
+
+
+ QualifiedIdentifier
+
+
+
+
+
+
+ @
+
+
+ QualifiedIdentifier
+
+
+ (
+
+
+ ElementValue
+
+
+ )
+
+
+
+
+
+
+
+
+ @
+
+
+ QualifiedIdentifier
+
+
+
+
+
+
+ (
+
+
+
+
+
+
+ Identifier
+
+
+ =
+
+
+
+
+
+
+
+
+
+ ElementValue
+
+
+ )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Identifier
+
+
+ =
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Identifier
+
+
+ =
+
+
+
+
+
+
+
+
+
+
+
+
+ (
+
+
+
+
+
+
+ Identifier
+
+
+ =
+
+
+
+
+
+
+ ElementValue
+
+
+ )
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (
+
+
+
+
+
+
+ Identifier
+
+
+ =
+
+
+
+
+
+
+ ElementValue
+
+
+ )
+
+
+
+
+
+
Throws
diff --git a/topics/java/lci/xbgf/refactorTypes3.xbgf b/topics/java/lci/xbgf/refactorTypes3.xbgf
index 55217ff4..3481e257 100644
--- a/topics/java/lci/xbgf/refactorTypes3.xbgf
+++ b/topics/java/lci/xbgf/refactorTypes3.xbgf
@@ -147,7 +147,7 @@
-
+
ReferenceType