Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/formatting/EbnfFormatter.xtend =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/formatting/EbnfFormatter.xtend (revision 62) +++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/formatting/EbnfFormatter.xtend (revision 63) @@ -33,4 +33,5 @@ c.setLinewrap.before(f.ruleRule); c.setLinewrap.before(f.importRule); + c.setNoSpace.after(f.ruleAccess.rulenumberINTTerminalRuleCall_0_0_0) // //c.setLinewrap.after(f.); // for (Keyword bar : f.findKeywords("|")) { Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/EbnfGenerator.xtend =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/EbnfGenerator.xtend (revision 62) +++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/EbnfGenerator.xtend (revision 63) @@ -26,5 +26,5 @@ */ class EbnfGenerator implements IGenerator { - //generation of the file blaaa + //generation of the xsl-file override void doGenerate(Resource resource, IFileSystemAccess fsa) { for (e : resource.allContents.toIterable.filter(EtsiBnf)) { @@ -39,5 +39,5 @@ ''' - + @@ -63,5 +63,5 @@ ''' - def compile(Rule rule)'''«rule.name» ::= «rule.definitionList.compile»''' + def compile(Rule rule)'''«IF rule.rulenumber!=0»«rule.rulenumber».\t«ENDIF»«rule.name» ::= «rule.definitionList.compile»''' def compile(DefinitionList dList)'''«FOR sDef:dList.singleDefinition»«sDef.compile»«IF !sDef.equals(dList.singleDefinition.last)» | «ENDIF»«ENDFOR»''' Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/validation/EbnfValidator.xtend =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/validation/EbnfValidator.xtend (revision 62) +++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/validation/EbnfValidator.xtend (revision 63) @@ -26,12 +26,12 @@ class EbnfValidator extends AbstractEbnfValidator { - static final String ruleReferencedOneDescription = "The rule is only referenced by one other rule"; - static final String passthroughRuleDescription = "The rule is a passthrough rule"; - static final String unreferencedPassthroughRuleDescription = "The rule is an unreferenced passthrough rule"; - static final String unusedRuleDescription = "The rule is not referenced anywhere"; - static final String equalAlternativeDescription = "The rule contains equal alternatives"; - static final String duplicateRulesDescription = "The rule is a duplicate"; - // static final String duplicateSubRulesDescription = "A part the of rule is a duplicate"; - static final String nonUniqueNameDescription = "The rule has the same Name as the Rule in Line "; + public static final String ruleReferencedOneDescription = "The rule is only referenced by one other rule"; + public static final String passthroughRuleDescription = "The rule is a passthrough rule"; + public static final String unreferencedPassthroughRuleDescription = "The rule is an unreferenced passthrough rule"; + public static final String unusedRuleDescription = "The rule is not referenced anywhere"; + public static final String equalAlternativeDescription = "The rule contains equal alternatives"; + public static final String duplicateRulesDescription = "The rule is a duplicate"; + //public static final String duplicateSubRulesDescription = "A part the of rule is a duplicate"; + public static final String nonUniqueNameDescription = "The rule has the same Name as the Rule in Line "; // ---------------------------------------------------------------------------------------------------- @@ -49,5 +49,5 @@ if (references.size() == 1 && rule.rulenumber != 1) { - warning(ruleReferencedOneDescription, EbnfPackage$Literals::RULE__NAME); + warning(ruleReferencedOneDescription, EbnfPackage$Literals::RULE__NAME,ruleReferencedOneDescription,rule.name); } } @@ -122,5 +122,5 @@ if ((references.size() == 0) && (rule.getRulenumber() != 1)) - warning(unusedRuleDescription, EbnfPackage$Literals::RULE__NAME); + warning(unusedRuleDescription, EbnfPackage$Literals::RULE__NAME,unusedRuleDescription,rule.name); } Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/formatting/EbnfFormatter.java =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/formatting/EbnfFormatter.java (revision 62) +++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/formatting/EbnfFormatter.java (revision 63) @@ -8,4 +8,5 @@ import org.eclipse.xtext.IGrammarAccess; import org.eclipse.xtext.ParserRule; +import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.TerminalRule; import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter; @@ -45,4 +46,8 @@ ParserRule _importRule = f.getImportRule(); _setLinewrap_4.before(_importRule); + FormattingConfig.NoSpaceLocator _setNoSpace = c.setNoSpace(); + EbnfGrammarAccess.RuleElements _ruleAccess = f.getRuleAccess(); + RuleCall _rulenumberINTTerminalRuleCall_0_0_0 = _ruleAccess.getRulenumberINTTerminalRuleCall_0_0_0(); + _setNoSpace.after(_rulenumberINTTerminalRuleCall_0_0_0); } } Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/generator/EbnfGenerator.java =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/generator/EbnfGenerator.java (revision 62) +++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/generator/EbnfGenerator.java (revision 63) @@ -56,6 +56,12 @@ _builder.append(""); _builder.newLine(); - _builder.append(""); - _builder.newLine(); + _builder.append(""); + _builder.newLineIfNotEmpty(); _builder.append(""); _builder.newLine(); @@ -123,4 +129,13 @@ _builder.append(_name, ""); _builder.append("\"\tcolor=\"purple\">"); + { + int _rulenumber = rule.getRulenumber(); + boolean _notEquals = (_rulenumber != 0); + if (_notEquals) { + int _rulenumber_1 = rule.getRulenumber(); + _builder.append(_rulenumber_1, ""); + _builder.append(".\\t"); + } + } String _name_1 = rule.getName(); _builder.append(_name_1, ""); Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/scoping/EbnfScopeProvider.java =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/scoping/EbnfScopeProvider.java (revision 62) +++ (revision ) @@ -1,16 +1,0 @@ -/** - * generated by Xtext - */ -package de.ugoe.cs.swe.bnftools.scoping; - -import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider; - -/** - * This class contains custom scoping description. - * - * see : http://www.eclipse.org/Xtext/documentation.html#scoping - * on how and when to use it - */ -@SuppressWarnings("all") -public class EbnfScopeProvider extends AbstractDeclarativeScopeProvider { -} Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/validation/EbnfValidator.java =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/validation/EbnfValidator.java (revision 62) +++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/validation/EbnfValidator.java (revision 63) @@ -26,17 +26,17 @@ @SuppressWarnings("all") public class EbnfValidator extends AbstractEbnfValidator { - private final static String ruleReferencedOneDescription = "The rule is only referenced by one other rule"; - - private final static String passthroughRuleDescription = "The rule is a passthrough rule"; - - private final static String unreferencedPassthroughRuleDescription = "The rule is an unreferenced passthrough rule"; - - private final static String unusedRuleDescription = "The rule is not referenced anywhere"; - - private final static String equalAlternativeDescription = "The rule contains equal alternatives"; - - private final static String duplicateRulesDescription = "The rule is a duplicate"; - - private final static String nonUniqueNameDescription = "The rule has the same Name as the Rule in Line "; + public final static String ruleReferencedOneDescription = "The rule is only referenced by one other rule"; + + public final static String passthroughRuleDescription = "The rule is a passthrough rule"; + + public final static String unreferencedPassthroughRuleDescription = "The rule is an unreferenced passthrough rule"; + + public final static String unusedRuleDescription = "The rule is not referenced anywhere"; + + public final static String equalAlternativeDescription = "The rule contains equal alternatives"; + + public final static String duplicateRulesDescription = "The rule is a duplicate"; + + public final static String nonUniqueNameDescription = "The rule has the same Name as the Rule in Line "; /** @@ -63,5 +63,6 @@ } if (_and) { - this.warning(EbnfValidator.ruleReferencedOneDescription, EbnfPackage.Literals.RULE__NAME); + String _name = rule.getName(); + this.warning(EbnfValidator.ruleReferencedOneDescription, EbnfPackage.Literals.RULE__NAME, EbnfValidator.ruleReferencedOneDescription, _name); } } @@ -158,5 +159,6 @@ } if (_and) { - this.warning(EbnfValidator.unusedRuleDescription, EbnfPackage.Literals.RULE__NAME); + String _name = rule.getName(); + this.warning(EbnfValidator.unusedRuleDescription, EbnfPackage.Literals.RULE__NAME, EbnfValidator.unusedRuleDescription, _name); } }