[jboss-svn-commits] JBL Code SVN: r10953 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/apache/commons/jci/problems and 35 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Apr 12 19:13:15 EDT 2007


Author: mark.proctor at jboss.com
Date: 2007-04-12 19:13:13 -0400 (Thu, 12 Apr 2007)
New Revision: 10953

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/AbstractJavaCompiler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/CompilationResult.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseCompilationProblem.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettings.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompiler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompilerSettings.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/problems/CompilationProblem.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/problems/CompilationProblemHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/readers/MemoryResourceReader.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/readers/ResourceReader.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/stores/ResourceStore.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/utils/ClassUtils.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertFact.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertLogicalFact.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionFieldList.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionFieldValue.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionModifyField.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionRetractFact.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionSetField.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/CompositeFactPattern.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ConnectiveConstraint.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/Constraint.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/DSLSentence.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/FactPattern.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/IAction.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/IConstraint.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/IPattern.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/RuleAttribute.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/RuleModel.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/converter/BRXMLToDescrConverter.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/rules/SuggestionCompletionLoader.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRLPersistence.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/SuggestionCompletionEngineBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DialectRegistry.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/FactTemplateError.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/FieldTemplateError.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ParserError.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/RuleBaseLoader.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/RuleError.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/SwitchingCommonTokenStream.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/Expander.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/ExpanderException.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/GeneralParseException.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AccessorDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AccumulateDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AttributeDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/BaseDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/CollectDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ColumnDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/DeclarativeInvokerDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/EvalDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ExistsDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FactTemplateDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldAccessDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldBindingDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldConstraintDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldTemplateDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ForallDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FromDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionCallDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionImportDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/GlobalDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ImportDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/LiteralRestrictionDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/MethodAccessDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/NotDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/OrDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/Restriction.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RestrictionConnectiveDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapping.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMappingEntry.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMappingFile.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMappingParseException.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultDSLMapping.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultDSLMappingEntry.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpander.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpanderResolver.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/resource/util/ByteArrayClassLoader.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/BuildContext.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/CollectBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ColumnBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ConditionalElementBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/Dialect.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ForallBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/GroupElementBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/BuildUtils.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/DeclarationTypeFixer.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaExprAnalyzer.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaReturnValueBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaRuleClassBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixer.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaParserLexer.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaParserParser.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/util/ArrayUtils.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/util/StringUtils.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/AndHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ColumnHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/EvalHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExistsHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FieldBindingHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FieldConstraintHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FunctionHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/LhsHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/LiteralRestrictionHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/NotHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/OrHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PackageHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PredicateHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/QueryHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/RestrictionConnectiveHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/RuleHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/VariableRestrictionsHandler.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlPackageReader.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Approve.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Driver.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Policy.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Rejection.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Alarm.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Approach.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/AssertedObject.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cell.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheese.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/CheeseEqual.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheesery.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Child.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Close.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/EmergencyTeam.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FactA.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FactB.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FactC.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FromTestClass.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Func.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/GrandParent.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Guess.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/IndexedNumber.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Order.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/OrderItem.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Parent.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Person.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Precondition.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Primitives.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Process.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/RandomNumber.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Sensor.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/StaticMethods.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/StaticMethods2.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Target.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/TestParam.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/client/modeldriven/SuggestionCompletionTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionFieldValueTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionSetFieldTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/CompositeFactPatternTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ConnectiveConstraintTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ConstraintTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/DSLSentenceTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/FactPatternTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/RuleModelTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/converter/BRXMLToDescrConverterTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/SuggestionCompletionEngineBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/Java5Test.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/RuleBaseLoaderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ReteTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/helloworld/Message.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Edge.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Junction.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Line.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Stage.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/WaltzUtil.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/MockExpander.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/MockExpanderResolver.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DSLMappingFileTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultDSLMappingEntryTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultExpanderResolverTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultExpanderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/ReteooBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/AccumulateTemplateTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/DumperTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/XmlPackageReaderTest.java
Log:
core/compiler core reformat and tidy

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/AbstractJavaCompiler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/AbstractJavaCompiler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/AbstractJavaCompiler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -4,23 +4,30 @@
 import org.apache.commons.jci.readers.ResourceReader;
 import org.apache.commons.jci.stores.ResourceStore;
 
-public abstract class AbstractJavaCompiler implements JavaCompiler {
+public abstract class AbstractJavaCompiler
+    implements
+    JavaCompiler {
 
-	protected CompilationProblemHandler problemHandler;
+    protected CompilationProblemHandler problemHandler;
 
-	public void setCompilationProblemHandler( final CompilationProblemHandler pHandler ) {
-		problemHandler = pHandler;
-	}
+    public void setCompilationProblemHandler(final CompilationProblemHandler pHandler) {
+        this.problemHandler = pHandler;
+    }
 
-	public CompilationResult compile( final String[] pClazzNames, final ResourceReader pReader, final ResourceStore pStore ) {
+    public CompilationResult compile(final String[] pClazzNames,
+                                     final ResourceReader pReader,
+                                     final ResourceStore pStore) {
 
-		ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
 
-		if (classLoader == null) {
-			classLoader = this.getClass().getClassLoader();
-		}
+        if ( classLoader == null ) {
+            classLoader = this.getClass().getClassLoader();
+        }
 
-		return compile(pClazzNames, pReader, pStore, classLoader);
-	}
+        return compile( pClazzNames,
+                        pReader,
+                        pStore,
+                        classLoader );
+    }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/CompilationResult.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/CompilationResult.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/CompilationResult.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -4,37 +4,36 @@
 import java.util.Collection;
 import org.apache.commons.jci.problems.CompilationProblem;
 
-
 public final class CompilationResult {
-    
+
     private final CompilationProblem[] errors;
     private final CompilationProblem[] warnings;
-        
-    public CompilationResult( final CompilationProblem[] pProblems ) {
-    	final Collection errorsColl = new ArrayList();
+
+    public CompilationResult(final CompilationProblem[] pProblems) {
+        final Collection errorsColl = new ArrayList();
         final Collection warningsColl = new ArrayList();
-    	
-    	for (int i = 0; i < pProblems.length; i++) {
-    		final CompilationProblem problem = pProblems[i];
-            if (problem.isError()) {
-                errorsColl.add(problem);
+
+        for ( int i = 0; i < pProblems.length; i++ ) {
+            final CompilationProblem problem = pProblems[i];
+            if ( problem.isError() ) {
+                errorsColl.add( problem );
             } else {
-                warningsColl.add(problem);
-            }			
-		}
-        
-    	errors = new CompilationProblem[errorsColl.size()];
-        errorsColl.toArray(errors);
+                warningsColl.add( problem );
+            }
+        }
 
-        warnings = new CompilationProblem[warningsColl.size()];
-        warningsColl.toArray(warnings);
+        this.errors = new CompilationProblem[errorsColl.size()];
+        errorsColl.toArray( this.errors );
+
+        this.warnings = new CompilationProblem[warningsColl.size()];
+        warningsColl.toArray( this.warnings );
     }
-    
+
     public CompilationProblem[] getErrors() {
-        return errors;
+        return this.errors;
     }
 
     public CompilationProblem[] getWarnings() {
-    	return warnings;
+        return this.warnings;
     }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseCompilationProblem.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseCompilationProblem.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseCompilationProblem.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -19,28 +19,30 @@
 import org.apache.commons.jci.problems.CompilationProblem;
 import org.eclipse.jdt.core.compiler.IProblem;
 
-public class EclipseCompilationProblem implements CompilationProblem {
+public class EclipseCompilationProblem
+    implements
+    CompilationProblem {
 
     private final IProblem problem;
 
     public EclipseCompilationProblem(final IProblem pProblem) {
-        problem = pProblem;
+        this.problem = pProblem;
     }
 
     public boolean isError() {
-        return problem.isError();
+        return this.problem.isError();
     }
 
     public String getFileName() {
-        return new String(problem.getOriginatingFileName());
+        return new String( this.problem.getOriginatingFileName() );
     }
 
     public int getStartLine() {
-        return problem.getSourceLineNumber();
+        return this.problem.getSourceLineNumber();
     }
 
     public int getStartColumn() {
-        return problem.getSourceStart();
+        return this.problem.getSourceStart();
     }
 
     public int getEndLine() {
@@ -48,26 +50,26 @@
     }
 
     public int getEndColumn() {
-        return problem.getSourceEnd();
+        return this.problem.getSourceEnd();
     }
 
     public String getMessage() {
-        return problem.getMessage();
+        return this.problem.getMessage();
     }
 
     public String toString() {
         final StringBuffer sb = new StringBuffer();
-        sb.append(getFileName()).append(" (");
-        sb.append(getStartLine());
-        sb.append(":");
-        sb.append(getStartColumn());
-        sb.append(") : ");
-        sb.append(getMessage());
+        sb.append( getFileName() ).append( " (" );
+        sb.append( getStartLine() );
+        sb.append( ":" );
+        sb.append( getStartColumn() );
+        sb.append( ") : " );
+        sb.append( getMessage() );
         return sb.toString();
     }
 
     public int getId() {
-        return problem.getID();
+        return this.problem.getID();
     }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -50,266 +50,289 @@
     private final Map settings;
 
     public EclipseJavaCompiler() {
-        this(new EclipseJavaCompilerSettings());
+        this( new EclipseJavaCompilerSettings() );
     }
 
     public EclipseJavaCompiler(final Map pSettings) {
-        settings = pSettings;
+        this.settings = pSettings;
     }
 
     public EclipseJavaCompiler(final EclipseJavaCompilerSettings pSettings) {
-        settings = pSettings.getMap();
+        this.settings = pSettings.getMap();
     }
 
-    final class CompilationUnit implements ICompilationUnit {
+    final class CompilationUnit
+        implements
+        ICompilationUnit {
 
-        final private String clazzName;
-        final private String fileName;
-        final private char[] typeName;
-        final private char[][] packageName;
+        final private String         clazzName;
+        final private String         fileName;
+        final private char[]         typeName;
+        final private char[][]       packageName;
         final private ResourceReader reader;
 
-        CompilationUnit( final ResourceReader pReader, final String pSourceFile ) {
-            reader = pReader;
-            clazzName = ClassUtils.convertResourceToClassName(pSourceFile);
-            fileName = pSourceFile;
-            int dot = clazzName.lastIndexOf('.');
-            if (dot > 0) {
-                typeName = clazzName.substring(dot + 1).toCharArray();
+        CompilationUnit(final ResourceReader pReader,
+                        final String pSourceFile) {
+            this.reader = pReader;
+            this.clazzName = ClassUtils.convertResourceToClassName( pSourceFile );
+            this.fileName = pSourceFile;
+            final int dot = this.clazzName.lastIndexOf( '.' );
+            if ( dot > 0 ) {
+                this.typeName = this.clazzName.substring( dot + 1 ).toCharArray();
             } else {
-                typeName = clazzName.toCharArray();
+                this.typeName = this.clazzName.toCharArray();
             }
-            
-//            log.debug("className=" + clazzName);
-//            log.debug("fileName=" + fileName);
-//            log.debug("typeName=" + new String(typeName)); 
-            
-            final StringTokenizer izer = new StringTokenizer(clazzName, ".");
-            packageName = new char[izer.countTokens() - 1][];
-            for (int i = 0; i < packageName.length; i++) {
-                packageName[i] = izer.nextToken().toCharArray();
-//                log.debug("package[" + i + "]=" + new String(packageName[i]));
+
+            //            log.debug("className=" + clazzName);
+            //            log.debug("fileName=" + fileName);
+            //            log.debug("typeName=" + new String(typeName)); 
+
+            final StringTokenizer izer = new StringTokenizer( this.clazzName,
+                                                              "." );
+            this.packageName = new char[izer.countTokens() - 1][];
+            for ( int i = 0; i < this.packageName.length; i++ ) {
+                this.packageName[i] = izer.nextToken().toCharArray();
+                //                log.debug("package[" + i + "]=" + new String(packageName[i]));
             }
         }
 
         public char[] getFileName() {
-            return fileName.toCharArray();
+            return this.fileName.toCharArray();
         }
 
         public char[] getContents() {
-            return new String(reader.getBytes(fileName)).toCharArray();
+            return new String( this.reader.getBytes( this.fileName ) ).toCharArray();
         }
 
         public char[] getMainTypeName() {
-            return typeName;
+            return this.typeName;
         }
 
         public char[][] getPackageName() {
-            return packageName;
+            return this.packageName;
         }
     }
 
-    public org.apache.commons.jci.compilers.CompilationResult compile(
-            final String[] pSourceFiles,
-            final ResourceReader pReader,
-            final ResourceStore pStore,
-            final ClassLoader pClassLoader
-            ) {
+    public org.apache.commons.jci.compilers.CompilationResult compile(final String[] pSourceFiles,
+                                                                      final ResourceReader pReader,
+                                                                      final ResourceStore pStore,
+                                                                      final ClassLoader pClassLoader) {
 
-        final Map settingsMap = settings;
-//        final Set sourceFileIndex = new HashSet();
+        final Map settingsMap = this.settings;
+        //        final Set sourceFileIndex = new HashSet();
         final ICompilationUnit[] compilationUnits = new ICompilationUnit[pSourceFiles.length];
-        for (int i = 0; i < compilationUnits.length; i++) {
+        for ( int i = 0; i < compilationUnits.length; i++ ) {
             final String sourceFile = pSourceFiles[i];
-            compilationUnits[i] = new CompilationUnit(pReader, sourceFile);
-//            sourceFileIndex.add(sourceFile);
-//            log.debug("compiling " + sourceFile);
+            compilationUnits[i] = new CompilationUnit( pReader,
+                                                       sourceFile );
+            //            sourceFileIndex.add(sourceFile);
+            //            log.debug("compiling " + sourceFile);
         }
 
         final IErrorHandlingPolicy policy = DefaultErrorHandlingPolicies.proceedWithAllProblems();
-        final IProblemFactory problemFactory = new DefaultProblemFactory(Locale.getDefault());
+        final IProblemFactory problemFactory = new DefaultProblemFactory( Locale.getDefault() );
         final INameEnvironment nameEnvironment = new INameEnvironment() {
 
-            public NameEnvironmentAnswer findType( final char[][] pCompoundTypeName ) {
+            public NameEnvironmentAnswer findType(final char[][] pCompoundTypeName) {
                 final StringBuffer result = new StringBuffer();
-                for (int i = 0; i < pCompoundTypeName.length; i++) {
-                    if (i != 0) {
-                        result.append('.');
+                for ( int i = 0; i < pCompoundTypeName.length; i++ ) {
+                    if ( i != 0 ) {
+                        result.append( '.' );
                     }
-                    result.append(pCompoundTypeName[i]);
+                    result.append( pCompoundTypeName[i] );
                 }
 
                 //log.debug("finding compoundTypeName=" + result.toString());
 
-            	return findType(result.toString());
+                return findType( result.toString() );
             }
 
-            public NameEnvironmentAnswer findType( final char[] pTypeName, final char[][] pPackageName ) {
+            public NameEnvironmentAnswer findType(final char[] pTypeName,
+                                                  final char[][] pPackageName) {
                 final StringBuffer result = new StringBuffer();
-                for (int i = 0; i < pPackageName.length; i++) {
-                    result.append(pPackageName[i]);
-                    result.append('.');
+                for ( int i = 0; i < pPackageName.length; i++ ) {
+                    result.append( pPackageName[i] );
+                    result.append( '.' );
                 }
-                
-//            	log.debug("finding typeName=" + new String(typeName) + " packageName=" + result.toString());
 
-            	result.append(pTypeName);
-                return findType(result.toString());
+                //            	log.debug("finding typeName=" + new String(typeName) + " packageName=" + result.toString());
+
+                result.append( pTypeName );
+                return findType( result.toString() );
             }
 
-            private NameEnvironmentAnswer findType( final String pClazzName ) {
-            	
-            	if (isPackage(pClazzName)) {
-            		return null;
-            	}
-            	
-//            	log.debug("finding " + pClazzName);
-            	
-            	final String resourceName = ClassUtils.convertClassToResourcePath(pClazzName);
-            	
-                final byte[] clazzBytes = pStore.read(pClazzName);
-                if (clazzBytes != null) {
-//                    log.debug("loading from store " + pClazzName);
+            private NameEnvironmentAnswer findType(final String pClazzName) {
 
+                if ( isPackage( pClazzName ) ) {
+                    return null;
+                }
+
+                //            	log.debug("finding " + pClazzName);
+
+                final String resourceName = ClassUtils.convertClassToResourcePath( pClazzName );
+
+                final byte[] clazzBytes = pStore.read( pClazzName );
+                if ( clazzBytes != null ) {
+                    //                    log.debug("loading from store " + pClazzName);
+
                     final char[] fileName = pClazzName.toCharArray();
                     try {
-                        final ClassFileReader classFileReader = new ClassFileReader(clazzBytes, fileName, true);
-                        return new NameEnvironmentAnswer(classFileReader, null);
-                    } catch (final ClassFormatException e) {
-//                        log.error("wrong class format", e);
+                        final ClassFileReader classFileReader = new ClassFileReader( clazzBytes,
+                                                                                     fileName,
+                                                                                     true );
+                        return new NameEnvironmentAnswer( classFileReader,
+                                                          null );
+                    } catch ( final ClassFormatException e ) {
+                        //                        log.error("wrong class format", e);
                         return null;
                     }
                 }
-                
-//            	log.debug("not in store " + pClazzName);
-            	
-//                if (pReader.isAvailable(clazzName.replace('.', '/') + ".java")) {
-//                    log.debug("compile " + clazzName);
-//                    ICompilationUnit compilationUnit = new CompilationUnit(pReader, clazzName);
-//                    return new NameEnvironmentAnswer(compilationUnit, null);
-//                }
 
-                final InputStream is = pClassLoader.getResourceAsStream(resourceName);
-                if (is == null) {
-//                	log.debug("class " + pClazzName + " not found");
-                	return null;
+                //            	log.debug("not in store " + pClazzName);
+
+                //                if (pReader.isAvailable(clazzName.replace('.', '/') + ".java")) {
+                //                    log.debug("compile " + clazzName);
+                //                    ICompilationUnit compilationUnit = new CompilationUnit(pReader, clazzName);
+                //                    return new NameEnvironmentAnswer(compilationUnit, null);
+                //                }
+
+                final InputStream is = pClassLoader.getResourceAsStream( resourceName );
+                if ( is == null ) {
+                    //                	log.debug("class " + pClazzName + " not found");
+                    return null;
                 }
 
                 final byte[] buffer = new byte[8192];
-                final ByteArrayOutputStream baos = new ByteArrayOutputStream(buffer.length);
+                final ByteArrayOutputStream baos = new ByteArrayOutputStream( buffer.length );
                 int count;
                 try {
-                    while ((count = is.read(buffer, 0, buffer.length)) > 0) {
-                        baos.write(buffer, 0, count);
+                    while ( (count = is.read( buffer,
+                                              0,
+                                              buffer.length )) > 0 ) {
+                        baos.write( buffer,
+                                    0,
+                                    count );
                     }
                     baos.flush();
                     final char[] fileName = pClazzName.toCharArray();
-                    final ClassFileReader classFileReader = new ClassFileReader(baos.toByteArray(), fileName, true);
-                    return new NameEnvironmentAnswer(classFileReader, null);
-                } catch (final IOException e) {
+                    final ClassFileReader classFileReader = new ClassFileReader( baos.toByteArray(),
+                                                                                 fileName,
+                                                                                 true );
+                    return new NameEnvironmentAnswer( classFileReader,
+                                                      null );
+                } catch ( final IOException e ) {
                     e.printStackTrace();
-//                    log.error("could not read class", e);
+                    //                    log.error("could not read class", e);
                     return null;
-                } catch (final ClassFormatException e) {
+                } catch ( final ClassFormatException e ) {
                     e.printStackTrace();
-//                    log.error("wrong class format", e);
+                    //                    log.error("wrong class format", e);
                     return null;
                 } finally {
                     try {
                         baos.close();
-                    } catch (final IOException oe) {
+                    } catch ( final IOException oe ) {
                         oe.printStackTrace();
-//                        log.error("could not close output stream", oe);
+                        //                        log.error("could not close output stream", oe);
                     }
                     try {
                         is.close();
-                    } catch (final IOException ie) {
+                    } catch ( final IOException ie ) {
                         ie.printStackTrace();
-//                        log.error("could not close input stream", ie);
+                        //                        log.error("could not close input stream", ie);
                     }
                 }
             }
 
-            private boolean isPackage( final String pClazzName ) {
-            	
-            	final InputStream is = pClassLoader.getResourceAsStream(ClassUtils.convertClassToResourcePath(pClazzName));
-            	if (is != null) {                    
-//                	log.debug("found the class for " + pClazzName + "- no package");
-            		return false;
-            	}
-            	
-            	final String source = pClazzName.replace('.', '/') + ".java";
-            	if (pReader.isAvailable(source)) {
-//                	log.debug("found the source " + source + " for " + pClazzName + " - no package ");
-            		return false;
-            	}
-            	
-            	return true;
+            private boolean isPackage(final String pClazzName) {
+
+                final InputStream is = pClassLoader.getResourceAsStream( ClassUtils.convertClassToResourcePath( pClazzName ) );
+                if ( is != null ) {
+                    //                	log.debug("found the class for " + pClazzName + "- no package");
+                    return false;
+                }
+
+                final String source = pClazzName.replace( '.',
+                                                          '/' ) + ".java";
+                if ( pReader.isAvailable( source ) ) {
+                    //                	log.debug("found the source " + source + " for " + pClazzName + " - no package ");
+                    return false;
+                }
+
+                return true;
             }
 
-            public boolean isPackage( char[][] parentPackageName, char[] pPackageName ) {
+            public boolean isPackage(char[][] parentPackageName,
+                                     char[] pPackageName) {
                 final StringBuffer result = new StringBuffer();
-                if (parentPackageName != null) {
-                    for (int i = 0; i < parentPackageName.length; i++) {
-                        if (i != 0) {
-                            result.append('.');
+                if ( parentPackageName != null ) {
+                    for ( int i = 0; i < parentPackageName.length; i++ ) {
+                        if ( i != 0 ) {
+                            result.append( '.' );
                         }
-                        result.append(parentPackageName[i]);
+                        result.append( parentPackageName[i] );
                     }
                 }
-                
-//                log.debug("isPackage parentPackageName=" + result.toString() + " packageName=" + new String(packageName));
-                
-                if (parentPackageName != null && parentPackageName.length > 0) {
-                    result.append('.');
+
+                //                log.debug("isPackage parentPackageName=" + result.toString() + " packageName=" + new String(packageName));
+
+                if ( parentPackageName != null && parentPackageName.length > 0 ) {
+                    result.append( '.' );
                 }
-                result.append(pPackageName);
-                return isPackage(result.toString());
+                result.append( pPackageName );
+                return isPackage( result.toString() );
             }
 
             public void cleanup() {
-//            	log.debug("cleanup");
+                //            	log.debug("cleanup");
             }
         };
 
         final Collection problems = new ArrayList();
         final ICompilerRequestor compilerRequestor = new ICompilerRequestor() {
-            public void acceptResult( final CompilationResult pResult ) {
-                if (pResult.hasProblems()) {
+            public void acceptResult(final CompilationResult pResult) {
+                if ( pResult.hasProblems() ) {
                     final IProblem[] iproblems = pResult.getProblems();
-                    for (int i = 0; i < iproblems.length; i++) {
+                    for ( int i = 0; i < iproblems.length; i++ ) {
                         final IProblem iproblem = iproblems[i];
-                        final CompilationProblem problem = new EclipseCompilationProblem(iproblem); 
-                        if (problemHandler != null) {
-                            problemHandler.handle(problem);
+                        final CompilationProblem problem = new EclipseCompilationProblem( iproblem );
+                        if ( EclipseJavaCompiler.this.problemHandler != null ) {
+                            EclipseJavaCompiler.this.problemHandler.handle( problem );
                         }
-                        problems.add(problem);
+                        problems.add( problem );
                     }
                 }
-                if (!pResult.hasErrors()) {
+                if ( !pResult.hasErrors() ) {
                     final ClassFile[] clazzFiles = pResult.getClassFiles();
-                    for (int i = 0; i < clazzFiles.length; i++) {
+                    for ( int i = 0; i < clazzFiles.length; i++ ) {
                         final ClassFile clazzFile = clazzFiles[i];
                         final char[][] compoundName = clazzFile.getCompoundName();
                         final StringBuffer clazzName = new StringBuffer();
-                        for (int j = 0; j < compoundName.length; j++) {
-                            if (j != 0) {
-                                clazzName.append('.');
+                        for ( int j = 0; j < compoundName.length; j++ ) {
+                            if ( j != 0 ) {
+                                clazzName.append( '.' );
                             }
-                            clazzName.append(compoundName[j]);
+                            clazzName.append( compoundName[j] );
                         }
-                        pStore.write(clazzName.toString().replace('.', '/') + ".class", clazzFile.getBytes());
+                        pStore.write( clazzName.toString().replace( '.',
+                                                                    '/' ) + ".class",
+                                      clazzFile.getBytes() );
                     }
                 }
             }
         };
 
-        final Compiler compiler = new Compiler(nameEnvironment, policy, settingsMap, compilerRequestor, problemFactory, false);
+        final Compiler compiler = new Compiler( nameEnvironment,
+                                                policy,
+                                                settingsMap,
+                                                compilerRequestor,
+                                                problemFactory,
+                                                false );
 
-        compiler.compile(compilationUnits);
+        compiler.compile( compilationUnits );
 
         final CompilationProblem[] result = new CompilationProblem[problems.size()];
-        problems.toArray(result);
-        return new org.apache.commons.jci.compilers.CompilationResult(result);
+        problems.toArray( result );
+        return new org.apache.commons.jci.compilers.CompilationResult( result );
     }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettings.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettings.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettings.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -5,26 +5,33 @@
 import org.apache.commons.jci.compilers.JavaCompilerSettings;
 import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 
-
 public class EclipseJavaCompilerSettings extends JavaCompilerSettings {
 
     final private Map defaultEclipseSettings = new HashMap();
 
     public EclipseJavaCompilerSettings() {
-    	defaultEclipseSettings.put(CompilerOptions.OPTION_LineNumberAttribute, CompilerOptions.GENERATE);
-    	defaultEclipseSettings.put(CompilerOptions.OPTION_SourceFileAttribute, CompilerOptions.GENERATE);
-    	defaultEclipseSettings.put(CompilerOptions.OPTION_ReportUnusedImport, CompilerOptions.IGNORE);
-        defaultEclipseSettings.put(CompilerOptions.OPTION_LocalVariableAttribute, CompilerOptions.GENERATE);
+        this.defaultEclipseSettings.put( CompilerOptions.OPTION_LineNumberAttribute,
+                                    CompilerOptions.GENERATE );
+        this.defaultEclipseSettings.put( CompilerOptions.OPTION_SourceFileAttribute,
+                                    CompilerOptions.GENERATE );
+        this.defaultEclipseSettings.put( CompilerOptions.OPTION_ReportUnusedImport,
+                                    CompilerOptions.IGNORE );
+        this.defaultEclipseSettings.put( CompilerOptions.OPTION_LocalVariableAttribute,
+                                    CompilerOptions.GENERATE );
     }
-    
+
     public Map getMap() {
-        final Map map = new HashMap(defaultEclipseSettings);
-    	
-    	map.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.GENERATE);
-        map.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_4);
-        map.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4);
-        map.put(CompilerOptions.OPTION_Encoding, "UTF-8");
-    	
+        final Map map = new HashMap( this.defaultEclipseSettings );
+
+        map.put( CompilerOptions.OPTION_ReportDeprecation,
+                 CompilerOptions.GENERATE );
+        map.put( CompilerOptions.OPTION_TargetPlatform,
+                 CompilerOptions.VERSION_1_4 );
+        map.put( CompilerOptions.OPTION_Source,
+                 CompilerOptions.VERSION_1_4 );
+        map.put( CompilerOptions.OPTION_Encoding,
+                 "UTF-8" );
+
         return map;
     }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -20,52 +20,69 @@
 import org.codehaus.janino.Location;
 import org.codehaus.janino.Scanner.LocatedException;
 
-public class JaninoCompilationProblem implements CompilationProblem {
+public class JaninoCompilationProblem
+    implements
+    CompilationProblem {
 
     private final Location location;
-    private final String fileName;
-    private final String message;
-    private final boolean error;
+    private final String   fileName;
+    private final String   message;
+    private final boolean  error;
 
     public JaninoCompilationProblem(final LocatedException pLocatedException) {
-        this(pLocatedException.getLocation(), pLocatedException.getMessage(), true);
+        this( pLocatedException.getLocation(),
+              pLocatedException.getMessage(),
+              true );
     }
 
-    public JaninoCompilationProblem(final Location pLocation, final String pMessage, final boolean pError) {
-      this(pLocation.getFileName(), pLocation, pMessage, pError);
+    public JaninoCompilationProblem(final Location pLocation,
+                                    final String pMessage,
+                                    final boolean pError) {
+        this( pLocation.getFileName(),
+              pLocation,
+              pMessage,
+              pError );
     }
 
-    public JaninoCompilationProblem(final String pFilename, final String pMessage, final boolean pError) {
-        this(pFilename, null, pMessage, pError);
+    public JaninoCompilationProblem(final String pFilename,
+                                    final String pMessage,
+                                    final boolean pError) {
+        this( pFilename,
+              null,
+              pMessage,
+              pError );
     }
 
-    public JaninoCompilationProblem(final String pFilename, final Location pLocation, final String pMessage, final boolean pError) {
-        location = pLocation;
-        fileName = pFilename;
-        message = pMessage;
-        error = pError;
+    public JaninoCompilationProblem(final String pFilename,
+                                    final Location pLocation,
+                                    final String pMessage,
+                                    final boolean pError) {
+        this.location = pLocation;
+        this.fileName = pFilename;
+        this.message = pMessage;
+        this.error = pError;
     }
 
     public boolean isError() {
-        return error;
+        return this.error;
     }
 
     public String getFileName() {
-        return fileName;
+        return this.fileName;
     }
 
     public int getStartLine() {
-        if (location == null) {
+        if ( this.location == null ) {
             return 0;
         }
-        return location.getLineNumber();
+        return this.location.getLineNumber();
     }
 
     public int getStartColumn() {
-        if (location == null) {
+        if ( this.location == null ) {
             return 0;
         }
-        return location.getColumnNumber();
+        return this.location.getColumnNumber();
     }
 
     public int getEndLine() {
@@ -77,17 +94,17 @@
     }
 
     public String getMessage() {
-        return message;
+        return this.message;
     }
 
     public String toString() {
         final StringBuffer sb = new StringBuffer();
-        sb.append(getFileName()).append(" (");
-        sb.append(getStartLine());
-        sb.append(":");
-        sb.append(getStartColumn());
-        sb.append(") : ");
-        sb.append(getMessage());
+        sb.append( getFileName() ).append( " (" );
+        sb.append( getStartLine() );
+        sb.append( ":" );
+        sb.append( getStartColumn() );
+        sb.append( ") : " );
+        sb.append( getMessage() );
         return sb.toString();
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -51,84 +51,102 @@
  */
 public final class JaninoJavaCompiler extends AbstractJavaCompiler {
 
-//    private final Log log = LogFactory.getLog(JaninoJavaCompiler.class);
+    //    private final Log log = LogFactory.getLog(JaninoJavaCompiler.class);
 
     private class CompilingIClassLoader extends IClassLoader {
 
-        private final Map types = new HashMap();
+        private final Map            types    = new HashMap();
         private final ResourceReader resourceReader;
-        private final Map classes;
-        private final Collection problems = new ArrayList();
+        private final Map            classes;
+        private final Collection     problems = new ArrayList();
 
-        private CompilingIClassLoader(final ResourceReader pResourceReader, final Map pClasses, final ClassLoader classLoader) {
+        private CompilingIClassLoader(final ResourceReader pResourceReader,
+                                      final Map pClasses,
+                                      final ClassLoader classLoader) {
             super( new ClassLoaderIClassLoader( classLoader ) );
-            resourceReader = pResourceReader;
-            classes = pClasses;
+            this.resourceReader = pResourceReader;
+            this.classes = pClasses;
             super.postConstruct();
         }
 
         protected Collection getProblems() {
-            return problems;
+            return this.problems;
         }
-        
+
         protected IClass findIClass(final String pType) {
-            final String className = Descriptor.toClassName(pType);
-            if (types.containsKey(pType)) {
-                return (IClass) types.get(pType);
+            final String className = Descriptor.toClassName( pType );
+            if ( this.types.containsKey( pType ) ) {
+                return (IClass) this.types.get( pType );
             }
-            final String resourceNameFromClass = className.replace('.', '/') + ".java";
+            final String resourceNameFromClass = className.replace( '.',
+                                                                    '/' ) + ".java";
 
-            final byte[] content = resourceReader.getBytes(resourceNameFromClass);
-            if (content == null) {
+            final byte[] content = this.resourceReader.getBytes( resourceNameFromClass );
+            if ( content == null ) {
                 return null;
             }
-            final Reader reader = new BufferedReader(new StringReader(new String(content)));
+            final Reader reader = new BufferedReader( new StringReader( new String( content ) ) );
             Scanner scanner = null;
             try {
-                scanner = new Scanner(resourceNameFromClass, reader);
-                final Java.CompilationUnit unit = new Parser(scanner).parseCompilationUnit();
-                final UnitCompiler uc = new UnitCompiler(unit, this);
-                uc.setCompileErrorHandler(new ErrorHandler() {
-                    public void handleError(final String pMessage, final Location pOptionalLocation) throws CompileException {
-                        final CompilationProblem problem = new JaninoCompilationProblem(pOptionalLocation, pMessage, true);
-                        if (problemHandler != null) {
-                            problemHandler.handle(problem);
+                scanner = new Scanner( resourceNameFromClass,
+                                       reader );
+                final Java.CompilationUnit unit = new Parser( scanner ).parseCompilationUnit();
+                final UnitCompiler uc = new UnitCompiler( unit,
+                                                          this );
+                uc.setCompileErrorHandler( new ErrorHandler() {
+                    public void handleError(final String pMessage,
+                                            final Location pOptionalLocation) throws CompileException {
+                        final CompilationProblem problem = new JaninoCompilationProblem( pOptionalLocation,
+                                                                                         pMessage,
+                                                                                         true );
+                        if ( JaninoJavaCompiler.this.problemHandler != null ) {
+                            JaninoJavaCompiler.this.problemHandler.handle( problem );
                         }
-                        problems.add(problem);
+                        CompilingIClassLoader.this.problems.add( problem );
                     }
-                });
-                uc.setWarningHandler(new WarningHandler() {
-                    public void handleWarning(final String pHandle, final String pMessage, final Location pOptionalLocation) {
-                        final CompilationProblem problem = new JaninoCompilationProblem(pOptionalLocation, pMessage, false);
-                        if (problemHandler != null) {
-                            problemHandler.handle(problem);
+                } );
+                uc.setWarningHandler( new WarningHandler() {
+                    public void handleWarning(final String pHandle,
+                                              final String pMessage,
+                                              final Location pOptionalLocation) {
+                        final CompilationProblem problem = new JaninoCompilationProblem( pOptionalLocation,
+                                                                                         pMessage,
+                                                                                         false );
+                        if ( JaninoJavaCompiler.this.problemHandler != null ) {
+                            JaninoJavaCompiler.this.problemHandler.handle( problem );
                         }
-                        problems.add(problem);
+                        CompilingIClassLoader.this.problems.add( problem );
                     }
-                });
-//                log.debug("compile " + className);
-                final ClassFile[] classFiles = uc.compileUnit(DebuggingInformation.ALL);
-                for (int i = 0; i < classFiles.length; i++) {
-//                    log.debug("compiled " + classFiles[i].getThisClassName());
-                    classes.put(classFiles[i].getThisClassName(), classFiles[i].toByteArray());
+                } );
+                //                log.debug("compile " + className);
+                final ClassFile[] classFiles = uc.compileUnit( DebuggingInformation.ALL );
+                for ( int i = 0; i < classFiles.length; i++ ) {
+                    //                    log.debug("compiled " + classFiles[i].getThisClassName());
+                    this.classes.put( classFiles[i].getThisClassName(),
+                                 classFiles[i].toByteArray() );
                 }
-                final IClass ic = uc.findClass(className);
-                if (null != ic) {
-                    types.put(pType, ic);
+                final IClass ic = uc.findClass( className );
+                if ( null != ic ) {
+                    this.types.put( pType,
+                               ic );
                 }
                 return ic;
-            } catch (final LocatedException e) {
-                problems.add(new JaninoCompilationProblem(e));
-            } catch (final IOException e) {
-                problems.add(new JaninoCompilationProblem(resourceNameFromClass, "IOException:" + e.getMessage(), true));
-            } catch (final Exception e) {
-                problems.add(new JaninoCompilationProblem(resourceNameFromClass, "Exception:" + e.getMessage(), true));
+            } catch ( final LocatedException e ) {
+                this.problems.add( new JaninoCompilationProblem( e ) );
+            } catch ( final IOException e ) {
+                this.problems.add( new JaninoCompilationProblem( resourceNameFromClass,
+                                                            "IOException:" + e.getMessage(),
+                                                            true ) );
+            } catch ( final Exception e ) {
+                this.problems.add( new JaninoCompilationProblem( resourceNameFromClass,
+                                                            "Exception:" + e.getMessage(),
+                                                            true ) );
             } finally {
-                if (scanner != null) {
+                if ( scanner != null ) {
                     try {
                         scanner.close();
-                    } catch (IOException e) {
-//                        log.error("IOException occured while compiling " + className, e);
+                    } catch ( final IOException e ) {
+                        //                        log.error("IOException occured while compiling " + className, e);
                     }
                 }
             }
@@ -136,34 +154,35 @@
         }
     }
 
-    public CompilationResult compile(
-            final String[] pClasses,
-            final ResourceReader pResourceReader,
-            final ResourceStore pStore,
-            final ClassLoader classLoader
-            ) {
-        final Map classFilesByName = new HashMap();       
-        
-        final CompilingIClassLoader icl = new CompilingIClassLoader(pResourceReader, classFilesByName, classLoader);
-        for (int i = 0; i < pClasses.length; i++) {
+    public CompilationResult compile(final String[] pClasses,
+                                     final ResourceReader pResourceReader,
+                                     final ResourceStore pStore,
+                                     final ClassLoader classLoader) {
+        final Map classFilesByName = new HashMap();
+
+        final CompilingIClassLoader icl = new CompilingIClassLoader( pResourceReader,
+                                                                     classFilesByName,
+                                                                     classLoader );
+        for ( int i = 0; i < pClasses.length; i++ ) {
             try {
-				icl.loadIClass(Descriptor.fromClassName(ClassUtils.convertResourceToClassName(pClasses[i])));
-			} catch (ClassNotFoundException e) {
-				// @TODO: if an exception is thrown here, how do we handle it?
-				e.printStackTrace();
-			}
+                icl.loadIClass( Descriptor.fromClassName( ClassUtils.convertResourceToClassName( pClasses[i] ) ) );
+            } catch ( final ClassNotFoundException e ) {
+                // @TODO: if an exception is thrown here, how do we handle it?
+                e.printStackTrace();
+            }
         }
         // Store all fully compiled classes
-        for (Iterator i = classFilesByName.entrySet().iterator(); i.hasNext();) {
-            final Map.Entry entry = (Map.Entry)i.next();
-            final String clazzName = (String)entry.getKey(); 
-            pStore.write(ClassUtils.convertClassToResourcePath(clazzName), (byte[])entry.getValue());
+        for ( final Iterator i = classFilesByName.entrySet().iterator(); i.hasNext(); ) {
+            final Map.Entry entry = (Map.Entry) i.next();
+            final String clazzName = (String) entry.getKey();
+            pStore.write( ClassUtils.convertClassToResourcePath( clazzName ),
+                          (byte[]) entry.getValue() );
         }
-        
+
         final Collection problems = icl.getProblems();
         final CompilationProblem[] result = new CompilationProblem[problems.size()];
-        problems.toArray(result);
-        return new CompilationResult(result);
+        problems.toArray( result );
+        return new CompilationResult( result );
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompiler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompiler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompiler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -20,21 +20,20 @@
 import org.apache.commons.jci.readers.ResourceReader;
 import org.apache.commons.jci.stores.ResourceStore;
 
-
 /**
  * @author tcurdt
  */
 public interface JavaCompiler {
 
-	/**
-	 * Set the the handler that gets the notification of an error
-	 * or warning as soon as this information is available from
-	 * the compiler.
-	 * Note: Some compilers might not support this feature.
-	 * 
-	 * @param pHandler
-	 */
-    void setCompilationProblemHandler( final CompilationProblemHandler pHandler );
+    /**
+     * Set the the handler that gets the notification of an error
+     * or warning as soon as this information is available from
+     * the compiler.
+     * Note: Some compilers might not support this feature.
+     * 
+     * @param pHandler
+     */
+    void setCompilationProblemHandler(final CompilationProblemHandler pHandler);
 
     /**
      * Compiles the java resources "some/path/to/MyJava.java"
@@ -53,11 +52,16 @@
      * @param pStore
      * @return always a CompilationResult
      */
-    CompilationResult compile( final String[] pResourcePaths, final ResourceReader pReader, final ResourceStore pStore );
+    CompilationResult compile(final String[] pResourcePaths,
+                              final ResourceReader pReader,
+                              final ResourceStore pStore);
 
     /**
      * As the usual compiler but you can provide the classloader
      * and therefor the classpath you are compiling with.
      */
-    CompilationResult compile( final String[] pResourcePaths, final ResourceReader pReader, final ResourceStore pStore, final ClassLoader classLoader );
+    CompilationResult compile(final String[] pResourcePaths,
+                              final ResourceReader pReader,
+                              final ResourceStore pStore,
+                              final ClassLoader classLoader);
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -21,15 +21,13 @@
 
 import org.apache.commons.jci.utils.ClassUtils;
 
-
-
 public final class JavaCompilerFactory {
 
     /**
      * @deprecated
      */
-	private static final JavaCompilerFactory INSTANCE = new JavaCompilerFactory();
-    
+    private static final JavaCompilerFactory INSTANCE = new JavaCompilerFactory();
+
     /**
      * @deprecated
      */
@@ -38,7 +36,7 @@
     }
 
     private final Map classCache = new HashMap();
-    
+
     /**
      * Tries to guess the class name by convention. So for compilers
      * following the naming convention
@@ -55,35 +53,36 @@
      * TODO use META-INF discovery mechanism
      */
     public JavaCompiler createCompiler(final String pHint) {
-        
+
         final String className;
-        if (pHint.indexOf('.') < 0) {
-            className = "org.apache.commons.jci.compilers." + ClassUtils.toJavaCasing(pHint) + "JavaCompiler";
+        if ( pHint.indexOf( '.' ) < 0 ) {
+            className = "org.apache.commons.jci.compilers." + ClassUtils.toJavaCasing( pHint ) + "JavaCompiler";
         } else {
             className = pHint;
         }
-        
-        Class clazz = (Class) classCache.get(className);
-        
-        if (clazz == null) {
+
+        Class clazz = (Class) this.classCache.get( className );
+
+        if ( clazz == null ) {
             try {
-                clazz = Class.forName(className);
-                classCache.put(className, clazz);
-            } catch (ClassNotFoundException e) {
+                clazz = Class.forName( className );
+                this.classCache.put( className,
+                                clazz );
+            } catch ( final ClassNotFoundException e ) {
                 clazz = null;
             }
         }
 
-        if (clazz == null) {
+        if ( clazz == null ) {
             return null;
         }
-        
+
         try {
             return (JavaCompiler) clazz.newInstance();
-        } catch (Throwable t) {
+        } catch ( final Throwable t ) {
             t.printStackTrace();
             return null;
         }
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompilerSettings.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompilerSettings.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompilerSettings.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -16,32 +16,30 @@
  */
 package org.apache.commons.jci.compilers;
 
+public class JavaCompilerSettings {
 
+    public void setTargetVersion(final String pTargetVersion) {
 
-public class JavaCompilerSettings {
-	
-	public void setTargetVersion( final String pTargetVersion ) {
-		
-	}
-	
-	public void setSourceVersion( final String pSourceVersion ) {
-		
-	}
-	
-	public void setSourceEncoding( final String pSourceEncoding ) {
-		
-	}
-	
-	public void setWarnings( final boolean pWarnings ) {
-		
-	}
-	
-	public void setDeprecations( final boolean pDeprecations )  {
-		
-	}
-	
-	public void setVerbose( final boolean pVerbose ) {
-		
-	}
+    }
 
+    public void setSourceVersion(final String pSourceVersion) {
+
+    }
+
+    public void setSourceEncoding(final String pSourceEncoding) {
+
+    }
+
+    public void setWarnings(final boolean pWarnings) {
+
+    }
+
+    public void setDeprecations(final boolean pDeprecations) {
+
+    }
+
+    public void setVerbose(final boolean pVerbose) {
+
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/problems/CompilationProblem.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/problems/CompilationProblem.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/problems/CompilationProblem.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -18,16 +18,18 @@
 
 public interface CompilationProblem {
 
-  boolean isError();
+    boolean isError();
 
-  String getFileName();
+    String getFileName();
 
-  int getStartLine();
-  int getStartColumn();
+    int getStartLine();
 
-  int getEndLine();
-  int getEndColumn();
+    int getStartColumn();
 
-  String getMessage();
+    int getEndLine();
 
+    int getEndColumn();
+
+    String getMessage();
+
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/problems/CompilationProblemHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/problems/CompilationProblemHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/problems/CompilationProblemHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -16,7 +16,6 @@
  */
 package org.apache.commons.jci.problems;
 
-
 /**
  * A CompilationProblemHandler gets access to a problem
  * as soon as the problem is available while the
@@ -32,5 +31,5 @@
  * @author tcurdt
  */
 public interface CompilationProblemHandler {
-    boolean handle( final CompilationProblem pProblem );
+    boolean handle(final CompilationProblem pProblem);
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/readers/MemoryResourceReader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/readers/MemoryResourceReader.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/readers/MemoryResourceReader.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -3,44 +3,47 @@
 import java.util.Map;
 import java.util.HashMap;
 
-public class MemoryResourceReader implements ResourceReader {
-    
+public class MemoryResourceReader
+    implements
+    ResourceReader {
+
     private Map resources;
 
-    public boolean isAvailable( final String pResourceName ) {
-        if (resources == null) {
+    public boolean isAvailable(final String pResourceName) {
+        if ( this.resources == null ) {
             return false;
         }
 
-        return resources.containsKey(pResourceName);
+        return this.resources.containsKey( pResourceName );
     }
-    
-    public void add( final String pResourceName, final byte[] pContent ) {
-        if (resources == null) {
-            resources = new HashMap();
+
+    public void add(final String pResourceName,
+                    final byte[] pContent) {
+        if ( this.resources == null ) {
+            this.resources = new HashMap();
         }
-        
-        resources.put(pResourceName, pContent);
+
+        this.resources.put( pResourceName,
+                       pContent );
     }
-    
-    public void remove( final String pResourceName ) {
-        if (resources != null) {
-            resources.remove(pResourceName);
-        }    
-    }    
-    
 
-    public byte[] getBytes( final String pResourceName ) {
-        return (byte[]) resources.get(pResourceName);
+    public void remove(final String pResourceName) {
+        if ( this.resources != null ) {
+            this.resources.remove( pResourceName );
+        }
     }
 
+    public byte[] getBytes(final String pResourceName) {
+        return (byte[]) this.resources.get( pResourceName );
+    }
+
     /**
      * @deprecated
      */
     public String[] list() {
-        if (resources == null) {
+        if ( this.resources == null ) {
             return new String[0];
         }
-        return (String[]) resources.keySet().toArray(new String[resources.size()]);
+        return (String[]) this.resources.keySet().toArray( new String[this.resources.size()] );
     }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/readers/ResourceReader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/readers/ResourceReader.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/readers/ResourceReader.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -20,6 +20,7 @@
  * @author tcurdt
  */
 public interface ResourceReader {
-    boolean isAvailable( final String pResourceName );
-    byte[] getBytes( final String pResourceName );
+    boolean isAvailable(final String pResourceName);
+
+    byte[] getBytes(final String pResourceName);
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/stores/ResourceStore.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/stores/ResourceStore.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/stores/ResourceStore.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -21,9 +21,10 @@
  */
 public interface ResourceStore {
 
-    void write( final String pResourceName, final byte[] pResourceData );
-	
-	byte[] read( final String pResourceName );
-	
-	void remove( final String pResourceName );
+    void write(final String pResourceName,
+               final byte[] pResourceData);
+
+    byte[] read(final String pResourceName);
+
+    void remove(final String pResourceName);
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/utils/ClassUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/utils/ClassUtils.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/utils/ClassUtils.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -2,55 +2,61 @@
 
 import java.io.File;
 
-
 public final class ClassUtils {
 
-	/**
-	 * Please do not use - internal
-	 * org/my/Class.xxx -> org.my.Class
-	 */
-	public static String convertResourceToClassName( final String pResourceName ) {
-		return ClassUtils.stripExtension(pResourceName).replace('/', '.');
-	}
+    /**
+     * Please do not use - internal
+     * org/my/Class.xxx -> org.my.Class
+     */
+    public static String convertResourceToClassName(final String pResourceName) {
+        return ClassUtils.stripExtension( pResourceName ).replace( '/',
+                                                                   '.' );
+    }
 
-	/**
-	 * Please do not use - internal
-	 * org.my.Class -> org/my/Class.class
-	 */
-	public static String convertClassToResourcePath( final String pName ) {
-		return pName.replace('.', '/') + ".class";
-	}
+    /**
+     * Please do not use - internal
+     * org.my.Class -> org/my/Class.class
+     */
+    public static String convertClassToResourcePath(final String pName) {
+        return pName.replace( '.',
+                              '/' ) + ".class";
+    }
 
-	/**
-	 * Please do not use - internal
-	 * org/my/Class.xxx -> org/my/Class
-	 */
-	public static String stripExtension( final String pResourceName ) {
-		final int i = pResourceName.lastIndexOf('.');
-		final String withoutExtension = pResourceName.substring(0, i);
-		return withoutExtension;
-	}
+    /**
+     * Please do not use - internal
+     * org/my/Class.xxx -> org/my/Class
+     */
+    public static String stripExtension(final String pResourceName) {
+        final int i = pResourceName.lastIndexOf( '.' );
+        final String withoutExtension = pResourceName.substring( 0,
+                                                                 i );
+        return withoutExtension;
+    }
 
-	public static String toJavaCasing(final String pName) {
-	    final char[] name = pName.toLowerCase().toCharArray();
-	    name[0] = Character.toUpperCase(name[0]);
-	    return new String(name);
-	}
+    public static String toJavaCasing(final String pName) {
+        final char[] name = pName.toLowerCase().toCharArray();
+        name[0] = Character.toUpperCase( name[0] );
+        return new String( name );
+    }
 
-	public static String clazzName( final File base, final File file ) {
-	    final int rootLength = base.getAbsolutePath().length();
-	    final String absFileName = file.getAbsolutePath();
-	    final int p = absFileName.lastIndexOf('.');
-	    final String relFileName = absFileName.substring(rootLength + 1, p);
-	    final String clazzName = relFileName.replace(File.separatorChar, '.');
-	    return clazzName;
-	}
+    public static String clazzName(final File base,
+                                   final File file) {
+        final int rootLength = base.getAbsolutePath().length();
+        final String absFileName = file.getAbsolutePath();
+        final int p = absFileName.lastIndexOf( '.' );
+        final String relFileName = absFileName.substring( rootLength + 1,
+                                                          p );
+        final String clazzName = relFileName.replace( File.separatorChar,
+                                                      '.' );
+        return clazzName;
+    }
 
-	public static String relative( final File base, final File file ) {
-	    final int rootLength = base.getAbsolutePath().length();
-	    final String absFileName = file.getAbsolutePath();
-	    final String relFileName = absFileName.substring(rootLength + 1);
-		return relFileName;
-	}
-	
+    public static String relative(final File base,
+                                  final File file) {
+        final int rootLength = base.getAbsolutePath().length();
+        final String absFileName = file.getAbsolutePath();
+        final String relFileName = absFileName.substring( rootLength + 1 );
+        return relFileName;
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/SuggestionCompletionEngine.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -14,43 +14,44 @@
  *  
  * @author Michael Neale
  */
-public class SuggestionCompletionEngine implements PortableObject {
+public class SuggestionCompletionEngine
+    implements
+    PortableObject {
 
     /** These are the explicit types supported */
-    public static final String TYPE_COLLECTION = "Collection";
-    public static final String TYPE_COMPARABLE = "Comparable";
-    public static final String TYPE_STRING = "String";
-    public static final String TYPE_NUMERIC = "Numeric";
-    
+    public static final String    TYPE_COLLECTION        = "Collection";
+    public static final String    TYPE_COMPARABLE        = "Comparable";
+    public static final String    TYPE_STRING            = "String";
+    public static final String    TYPE_NUMERIC           = "Numeric";
+
     /**
      * The operators that are used at different times (based on type).
      */
-    private static final String[] STANDARD_CONNECTIVES = new String[] { "| ==", "| !=", "& !="};
-    private static final String[] STRING_CONNECTIVES = new String[] { "| ==", "| !=", "& !=", "& matches", "| matches"};
-    private static final String[] COMPARABLE_CONNECTIVES = new String[] {"| ==", "| !=", "& !=", "& >", "& <", "| >", "| <", "& >=", "& <=", "| <=", "| >="};
-    private static final String[] COLLECTION_CONNECTIVES = new String[] {"| ==", "| !=", "& !=", "| contains", "& contains", "| excludes", "& excludes"};
-    
-    private static final String[] STANDARD_OPERATORS = new String[] { "==", "!=" };
-    private static final String[] COMPARABLE_OPERATORS = new String[] { "==", "!=", "<", ">", "<=", ">="};
-    private static final String[] STRING_OPERATORS = new String[] {"==", "!=", "matches"};
-    private static final String[] COLLECTION_OPERATORS = new String[] {"contains", "excludes", "==", "!="};
-        
+    private static final String[] STANDARD_CONNECTIVES   = new String[]{"| ==", "| !=", "& !="};
+    private static final String[] STRING_CONNECTIVES     = new String[]{"| ==", "| !=", "& !=", "& matches", "| matches"};
+    private static final String[] COMPARABLE_CONNECTIVES = new String[]{"| ==", "| !=", "& !=", "& >", "& <", "| >", "| <", "& >=", "& <=", "| <=", "| >="};
+    private static final String[] COLLECTION_CONNECTIVES = new String[]{"| ==", "| !=", "& !=", "| contains", "& contains", "| excludes", "& excludes"};
+
+    private static final String[] STANDARD_OPERATORS     = new String[]{"==", "!="};
+    private static final String[] COMPARABLE_OPERATORS   = new String[]{"==", "!=", "<", ">", "<=", ">="};
+    private static final String[] STRING_OPERATORS       = new String[]{"==", "!=", "matches"};
+    private static final String[] COLLECTION_OPERATORS   = new String[]{"contains", "excludes", "==", "!="};
+
     /** The top level conditional elements (first order logic) */
-    private static final String[] CONDITIONAL_ELEMENTS = new String[] {"not", "exists", "or"};
-    
-    
+    private static final String[] CONDITIONAL_ELEMENTS   = new String[]{"not", "exists", "or"};
+
     /** 
      * A list of fact types (never fully qualified).
      */
-    public String[] factTypes;
-    
+    public String[]               factTypes;
+
     /**
      * A map of types to the fields. key is type, value is (String[] of fields)
      * 
      * @gwt.typeArgs <java.lang.String, java.lang.String[]>
      */
-    public Map fieldsForType;
-    
+    public Map                    fieldsForType;
+
     /**
      * A map of the Fields to their types, needed for operator completions,
      * as well as other things like rendering strings, dates etc.
@@ -59,171 +60,150 @@
      * 
      * @gwt.typeArgs <java.lang.String, java.lang.String>
      */
-    public Map fieldTypes;
-    
-    
-    
-    
+    public Map                    fieldTypes;
+
     /**
      * Contains a map of globals (name is key) and their type (value).
      * @gwt.typeArgs <java.lang.String, java.lang.String>
      */
-    public Map globalTypes = new HashMap();
-    
-    
+    public Map                    globalTypes            = new HashMap();
+
     /** Operators (from the grammar):
      *      op=(    '=='
-        |   '>'
-        |   '>='
-        |   '<'
-        |   '<='
-        |   '!='
-        |   'contains'
-        |   'matches'
-        |       'excludes'
-        )
+     |   '>'
+     |   '>='
+     |   '<'
+     |   '<='
+     |   '!='
+     |   'contains'
+     |   'matches'
+     |       'excludes'
+     )
      * Connectives add "&" and "|" to this.
      */
-    
 
-    
-
-
     /**
      * DSL language extensions, if needed, if provided by the package.
      */
-    public DSLSentence[] conditionDSLSentences = new DSLSentence[0];
-    public DSLSentence[] actionDSLSentences = new DSLSentence[0];
-    
-    
-//    /**
-//     * For bulk loading up the data (from a previous rule save)
-//     * 
-//     * @param factToFields A map of "FactType" (key - String) to String[] (value) 
-//     * @param factFieldToOperator A map of "FactType.field" (key - String) to String[] operators
-//     * @param factFieldToConnectiveOperator A map of "FactType.field" (key -String) to String[] operators 
-//     *                                  that are valid CONNECTIVE operators.
-//     *                                  
-//     * @param globals A map of global variable name to its fields (String[]).
-//     * @param boundFacts A map of bound facts to types.
-//     * @param conditionDSLs a list of DSLSentence suggestions for the LHS
-//     * @param actionDSLs a list of DSLSentence suggestions for the RHS                          
-//     *                                       
-//     */
-//    public void load( 
-//                      Map factToFields, 
-//                      Map factFieldToOperator, 
-//                      Map factFieldToConnectiveOperator,
-//                      Map globals,                      
-//                      List conditionDSLs,
-//                      List actionDSLs
-//                    ) {
-//        this.factToFields = factToFields;
-//        this.factFieldToOperator = factFieldToOperator;
-//        this.factFieldToConnectiveOperator = factFieldToConnectiveOperator;
-//        this.actionDSLSentences = actionDSLs;
-//        this.conditionDSLSentences = conditionDSLs;
-//        this.globals = globals;
-//
-//    }
-    
-    public SuggestionCompletionEngine() {  
+    public DSLSentence[]          conditionDSLSentences  = new DSLSentence[0];
+    public DSLSentence[]          actionDSLSentences     = new DSLSentence[0];
 
-        
-        
-    }
+    //    /**
+    //     * For bulk loading up the data (from a previous rule save)
+    //     * 
+    //     * @param factToFields A map of "FactType" (key - String) to String[] (value) 
+    //     * @param factFieldToOperator A map of "FactType.field" (key - String) to String[] operators
+    //     * @param factFieldToConnectiveOperator A map of "FactType.field" (key -String) to String[] operators 
+    //     *                                  that are valid CONNECTIVE operators.
+    //     *                                  
+    //     * @param globals A map of global variable name to its fields (String[]).
+    //     * @param boundFacts A map of bound facts to types.
+    //     * @param conditionDSLs a list of DSLSentence suggestions for the LHS
+    //     * @param actionDSLs a list of DSLSentence suggestions for the RHS                          
+    //     *                                       
+    //     */
+    //    public void load( 
+    //                      Map factToFields, 
+    //                      Map factFieldToOperator, 
+    //                      Map factFieldToConnectiveOperator,
+    //                      Map globals,                      
+    //                      List conditionDSLs,
+    //                      List actionDSLs
+    //                    ) {
+    //        this.factToFields = factToFields;
+    //        this.factFieldToOperator = factFieldToOperator;
+    //        this.factFieldToConnectiveOperator = factFieldToConnectiveOperator;
+    //        this.actionDSLSentences = actionDSLs;
+    //        this.conditionDSLSentences = conditionDSLs;
+    //        this.globals = globals;
+    //
+    //    }
 
-    
-    
+    public SuggestionCompletionEngine() {
 
-    public String[] getConditionalElements() {       
+    }
+
+    public String[] getConditionalElements() {
         return CONDITIONAL_ELEMENTS;
     }
-    
+
     public DSLSentence[] getDSLConditions() {
-        return conditionDSLSentences;
+        return this.conditionDSLSentences;
     }
-    
+
     public DSLSentence[] getDSLActions() {
-        return actionDSLSentences;
+        return this.actionDSLSentences;
     }
 
-    public String[] getConnectiveOperatorCompletions(String factType,
-                                                     String fieldName) {
-        String type = (String) this.fieldTypes.get( factType + "." + fieldName );
-        if (type == null) {
-          return STANDARD_CONNECTIVES;  
-        } else if (type.equals( TYPE_STRING )) {
-          return STRING_CONNECTIVES;  
-        } else if (type.equals( TYPE_COMPARABLE ) || type.equals( TYPE_NUMERIC )) {
-          return COMPARABLE_CONNECTIVES;
-        } else if (type.equals( TYPE_COLLECTION )){
+    public String[] getConnectiveOperatorCompletions(final String factType,
+                                                     final String fieldName) {
+        final String type = (String) this.fieldTypes.get( factType + "." + fieldName );
+        if ( type == null ) {
+            return STANDARD_CONNECTIVES;
+        } else if ( type.equals( TYPE_STRING ) ) {
+            return STRING_CONNECTIVES;
+        } else if ( type.equals( TYPE_COMPARABLE ) || type.equals( TYPE_NUMERIC ) ) {
+            return COMPARABLE_CONNECTIVES;
+        } else if ( type.equals( TYPE_COLLECTION ) ) {
             return COLLECTION_CONNECTIVES;
         } else {
             return STANDARD_CONNECTIVES;
         }
-        
+
     }
 
-
-
     public String[] getFactTypes() {
         return this.factTypes;
     }
 
-    public String[] getFieldCompletions(String factType) {
-       return (String[]) this.fieldsForType.get( factType );
-        
+    public String[] getFieldCompletions(final String factType) {
+        return (String[]) this.fieldsForType.get( factType );
+
     }
 
-    public String[] getOperatorCompletions(String factType,
-                                           String fieldName) {
-        String type = (String) this.fieldTypes.get( factType + "." + fieldName );
-        if (type == null) {
+    public String[] getOperatorCompletions(final String factType,
+                                           final String fieldName) {
+        final String type = (String) this.fieldTypes.get( factType + "." + fieldName );
+        if ( type == null ) {
             return STANDARD_OPERATORS;
-        } else if (type.equals( TYPE_STRING )) {
+        } else if ( type.equals( TYPE_STRING ) ) {
             return STRING_OPERATORS;
-        } else if (type.equals( TYPE_COMPARABLE ) || type.equals( TYPE_NUMERIC )) {
+        } else if ( type.equals( TYPE_COMPARABLE ) || type.equals( TYPE_NUMERIC ) ) {
             return COMPARABLE_OPERATORS;
-        } else if (type.equals( TYPE_COLLECTION )) {
+        } else if ( type.equals( TYPE_COLLECTION ) ) {
             return COLLECTION_OPERATORS;
-        } else {            
+        } else {
             return STANDARD_OPERATORS;
         }
-                
+
     }
-    
-    public String getFieldType( String factType,
-                                String fieldName ) {
+
+    public String getFieldType(final String factType,
+                               final String fieldName) {
         return (String) this.fieldTypes.get( factType + "." + fieldName );
     }
-    
-    public boolean isGlobalVariable(String variable) {
+
+    public boolean isGlobalVariable(final String variable) {
         return this.globalTypes.containsKey( variable );
     }
-    
-    public String[] getFieldCompletionsForGlobalVariable(String varName) {
-        String type = (String) this.globalTypes.get( varName );        
+
+    public String[] getFieldCompletionsForGlobalVariable(final String varName) {
+        final String type = (String) this.globalTypes.get( varName );
         return (String[]) this.fieldsForType.get( type );
     }
 
-
-    private String[] toStringArray(Set set) {
-        String[] f = new String[set.size()];
+    private String[] toStringArray(final Set set) {
+        final String[] f = new String[set.size()];
         int i = 0;
-        for ( Iterator iter = set.iterator(); iter.hasNext(); ) {
+        for ( final Iterator iter = set.iterator(); iter.hasNext(); ) {
             f[i] = (String) iter.next();
             i++;
         }
-        return f;                
+        return f;
     }
 
-    public String[] getGlobalVariables() {         
+    public String[] getGlobalVariables() {
         return toStringArray( this.globalTypes.keySet() );
     }
 
-
-    
-
-    
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertFact.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertFact.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertFact.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -5,9 +5,7 @@
  * @author Michael Neale
  *
  */
-public class ActionAssertFact
-    extends
-    ActionFieldList {
+public class ActionAssertFact extends ActionFieldList {
 
     /**
      * This is used mainly for display purposes. 
@@ -15,14 +13,14 @@
     public String getType() {
         return "assert";
     }
-    
+
     public String factType;
-    
-    public ActionAssertFact(String type) {
+
+    public ActionAssertFact(final String type) {
         this.factType = type;
     }
-    
-    public ActionAssertFact() {}
-    
 
+    public ActionAssertFact() {
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertLogicalFact.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertLogicalFact.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionAssertLogicalFact.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -7,19 +7,19 @@
  */
 public class ActionAssertLogicalFact extends ActionAssertFact {
 
-    public ActionAssertLogicalFact(String fact) {
-        super(fact);
+    public ActionAssertLogicalFact(final String fact) {
+        super( fact );
     }
-    
+
     public ActionAssertLogicalFact() {
         super();
     }
 
     /**
      * This is used mainly for display purposes. 
-     */    
+     */
     public String getType() {
         return "assertLogical";
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionFieldList.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionFieldList.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionFieldList.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -14,35 +14,35 @@
 
     public ActionFieldValue[] fieldValues = new ActionFieldValue[0];
 
-    public void removeField(int idx) {
+    public void removeField(final int idx) {
         //Unfortunately, this is kinda duplicate code with other methods, 
         //but with typed arrays, and GWT, its not really possible to do anything "better" 
         //at this point in time. 
-        ActionFieldValue[] newList = new ActionFieldValue[fieldValues.length - 1];
+        final ActionFieldValue[] newList = new ActionFieldValue[this.fieldValues.length - 1];
         int newIdx = 0;
-        for ( int i = 0; i < fieldValues.length; i++ ) {
-            
-            if (i != idx) {
-                newList[newIdx] = fieldValues[i];
+        for ( int i = 0; i < this.fieldValues.length; i++ ) {
+
+            if ( i != idx ) {
+                newList[newIdx] = this.fieldValues[i];
                 newIdx++;
             }
-            
+
         }
-        this.fieldValues = newList;        
+        this.fieldValues = newList;
     }
-    
-    public void addFieldValue(ActionFieldValue val) {
-        if (fieldValues == null) {
-            fieldValues = new ActionFieldValue[1];            
-            fieldValues[0] = val;            
+
+    public void addFieldValue(final ActionFieldValue val) {
+        if ( this.fieldValues == null ) {
+            this.fieldValues = new ActionFieldValue[1];
+            this.fieldValues[0] = val;
         } else {
-            ActionFieldValue[] newList = new ActionFieldValue[fieldValues.length + 1];
-            for ( int i = 0; i < fieldValues.length; i++ ) {            
-                newList[i] = fieldValues[i];
+            final ActionFieldValue[] newList = new ActionFieldValue[this.fieldValues.length + 1];
+            for ( int i = 0; i < this.fieldValues.length; i++ ) {
+                newList[i] = this.fieldValues[i];
             }
-            newList[fieldValues.length] = val;
-            fieldValues = newList;
-        }        
-    }    
-    
+            newList[this.fieldValues.length] = val;
+            this.fieldValues = newList;
+        }
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionFieldValue.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionFieldValue.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionFieldValue.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,6 +1,5 @@
 package org.drools.brms.client.modeldriven.brxml;
 
-
 /**
  * Holds field and value for "action" parts of the rule.
  * 
@@ -10,16 +9,18 @@
     implements
     PortableObject {
 
-    public ActionFieldValue(String field, String value) {
+    public ActionFieldValue(final String field,
+                            final String value) {
         this.field = field;
         this.value = value;
     }
-    
-    public ActionFieldValue() {}
-    
+
+    public ActionFieldValue() {
+    }
+
     public String field;
     public String value;
-    
+
     /**
      * This will return true if the value is really a "formula" - in 
      * the sense of like an excel spreadsheet.
@@ -29,12 +30,14 @@
      * 
      */
     public boolean isFormula() {
-        if (value == null) return false;
-        if (value.trim().startsWith( "=" )) {
+        if ( this.value == null ) {
+            return false;
+        }
+        if ( this.value.trim().startsWith( "=" ) ) {
             return true;
         } else {
             return false;
         }
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionModifyField.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionModifyField.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionModifyField.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -9,19 +9,19 @@
  */
 public class ActionModifyField extends ActionSetField {
 
-    public ActionModifyField(String itemText) {
-        super(itemText);        
+    public ActionModifyField(final String itemText) {
+        super( itemText );
     }
-    
+
     public ActionModifyField() {
         super();
     }
 
     /**
      * This is used mainly for display purposes. 
-     */    
+     */
     public String getType() {
         return "modify";
-    }    
-    
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionRetractFact.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionRetractFact.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionRetractFact.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -9,13 +9,14 @@
 public class ActionRetractFact
     implements
     IAction {
-    
-    public ActionRetractFact() {}
-    
-    public ActionRetractFact(String var) {
+
+    public ActionRetractFact() {
+    }
+
+    public ActionRetractFact(final String var) {
         this.variableName = var;
     }
-    
+
     public String variableName;
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionSetField.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionSetField.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionSetField.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -9,22 +9,20 @@
  */
 public class ActionSetField extends ActionFieldList {
 
-    
-    public ActionSetField(String var) {
+    public ActionSetField(final String var) {
         this.variable = var;
     }
-    
+
     /**
      * This is used mainly for display purposes. 
-     */    
+     */
     public String getType() {
         return "set";
     }
-    
-    public ActionSetField() {}
+
+    public ActionSetField() {
+    }
+
     public String variable;
 
-     
- 
-    
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/CompositeFactPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/CompositeFactPattern.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/CompositeFactPattern.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -18,18 +18,20 @@
     public String              type;
     public FactPattern[]       patterns;
 
-    public CompositeFactPattern(String type) {
+    public CompositeFactPattern(final String type) {
         this.type = type;
     }
 
     public CompositeFactPattern() {
     }
 
-    public void addFactPattern(FactPattern pat) {
-        if ( this.patterns == null ) this.patterns = new FactPattern[0];
+    public void addFactPattern(final FactPattern pat) {
+        if ( this.patterns == null ) {
+            this.patterns = new FactPattern[0];
+        }
 
-        FactPattern[] list = this.patterns;
-        FactPattern[] newList = new FactPattern[list.length + 1];
+        final FactPattern[] list = this.patterns;
+        final FactPattern[] newList = new FactPattern[list.length + 1];
 
         for ( int i = 0; i < list.length; i++ ) {
             newList[i] = list[i];

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ConnectiveConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ConnectiveConstraint.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ConnectiveConstraint.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,29 +1,28 @@
 package org.drools.brms.client.modeldriven.brxml;
 
-
 /**
  * This is for a connective constraint that adds more options to a field constraint. 
  * @author Michael Neale
  */
-public class ConnectiveConstraint
-    extends
-    IConstraint {
+public class ConnectiveConstraint extends IConstraint {
 
-    public ConnectiveConstraint() {}
-    
-    public ConnectiveConstraint(String opr,
-                                String val) {
+    public ConnectiveConstraint() {
+    }
+
+    public ConnectiveConstraint(final String opr,
+                                final String val) {
         this.operator = opr;
         this.value = val;
     }
+
     public String operator;
-    
+
     public boolean isORConnective() {
         return this.operator.startsWith( "|" );
     }
-    
+
     public boolean isANDConnective() {
         return this.operator.startsWith( "&" );
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/Constraint.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/Constraint.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/Constraint.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,26 +1,20 @@
 package org.drools.brms.client.modeldriven.brxml;
 
-
-
 /**
  * This represents a contraint on a fact.
  * Can also include optional "connective constraints" that extend the options for matches.
  * @author Michael Neale
  *
  */
-public class Constraint
-    extends
-    IConstraint  {
+public class Constraint extends IConstraint {
 
-
     public String                 fieldBinding;
     public String                 fieldName;
     public String                 operator;
 
-
     public ConnectiveConstraint[] connectives;
 
-    public Constraint(String field) {
+    public Constraint(final String field) {
         this.fieldName = field;
     }
 
@@ -32,15 +26,15 @@
      *
      */
     public void addNewConnective() {
-        if ( connectives == null ) {
-            connectives = new ConnectiveConstraint[]{new ConnectiveConstraint()};
+        if ( this.connectives == null ) {
+            this.connectives = new ConnectiveConstraint[]{new ConnectiveConstraint()};
         } else {
-            ConnectiveConstraint[] newList = new ConnectiveConstraint[connectives.length + 1];
-            for ( int i = 0; i < connectives.length; i++ ) {
-                newList[i] = connectives[i];
+            final ConnectiveConstraint[] newList = new ConnectiveConstraint[this.connectives.length + 1];
+            for ( int i = 0; i < this.connectives.length; i++ ) {
+                newList[i] = this.connectives[i];
             }
-            newList[connectives.length] = new ConnectiveConstraint();
-            connectives = newList;
+            newList[this.connectives.length] = new ConnectiveConstraint();
+            this.connectives = newList;
         }
     }
 
@@ -48,12 +42,11 @@
      * Returns true of there is a field binding.
      */
     public boolean isBound() {
-        if (fieldBinding != null && !"".equals( fieldBinding )) {
+        if ( this.fieldBinding != null && !"".equals( this.fieldBinding ) ) {
             return true;
         } else {
             return false;
         }
     }
 
-
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/DSLSentence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/DSLSentence.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/DSLSentence.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,6 +1,5 @@
 package org.drools.brms.client.modeldriven.brxml;
 
-
 /**
  * This represents a DSL sentence.
  * @author Michael Neale
@@ -11,24 +10,24 @@
     IAction {
 
     public String sentence;
-    
+
     /**
      * This will strip off any residual "{" stuff...
      */
     public String toString() {
-        char[] chars = sentence.toCharArray();
+        final char[] chars = this.sentence.toCharArray();
         String result = "";
         for ( int i = 0; i < chars.length; i++ ) {
-            char c = chars[i];
-            if (c != '{' && c != '}') {
+            final char c = chars[i];
+            if ( c != '{' && c != '}' ) {
                 result += c;
             }
         }
         return result;
     }
-    
+
     public DSLSentence copy() {
-        DSLSentence newOne = new DSLSentence();
+        final DSLSentence newOne = new DSLSentence();
         newOne.sentence = this.sentence;
         return newOne;
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/FactPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/FactPattern.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/FactPattern.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -7,68 +7,64 @@
  * @author Michael Neale
  *
  */
-public class FactPattern implements IPattern {
+public class FactPattern
+    implements
+    IPattern {
 
     public Constraint[] constraints;
-    public String factType;
-    public String boundName;
-    
+    public String       factType;
+    public String       boundName;
+
     public FactPattern() {
         this.constraints = new Constraint[0];
     }
-    
-    public FactPattern(String factType) {
+
+    public FactPattern(final String factType) {
         this.factType = factType;
         this.constraints = new Constraint[0];
     }
-    
 
-    
-    
-    public void addConstraint(Constraint constraint) {
-        if (constraints == null) {
-            constraints = new Constraint[1];            
-            constraints[0] = constraint;            
+    public void addConstraint(final Constraint constraint) {
+        if ( this.constraints == null ) {
+            this.constraints = new Constraint[1];
+            this.constraints[0] = constraint;
         } else {
-            Constraint[] newList = new Constraint[constraints.length + 1];
-            for ( int i = 0; i < constraints.length; i++ ) {            
-                newList[i] = constraints[i];
+            final Constraint[] newList = new Constraint[this.constraints.length + 1];
+            for ( int i = 0; i < this.constraints.length; i++ ) {
+                newList[i] = this.constraints[i];
             }
-            newList[constraints.length] = constraint;
-            constraints = newList;
+            newList[this.constraints.length] = constraint;
+            this.constraints = newList;
         }
     }
 
-    public void removeConstraint(int idx) {
+    public void removeConstraint(final int idx) {
         //Unfortunately, this is kinda duplicate code with other methods, 
         //but with typed arrays, and GWT, its not really possible to do anything "better" 
         //at this point in time. 
-        Constraint[] newList = new Constraint[constraints.length - 1];
+        final Constraint[] newList = new Constraint[this.constraints.length - 1];
         int newIdx = 0;
-        for ( int i = 0; i < constraints.length; i++ ) {
-            
-            if (i != idx) {
-                newList[newIdx] = constraints[i];
+        for ( int i = 0; i < this.constraints.length; i++ ) {
+
+            if ( i != idx ) {
+                newList[newIdx] = this.constraints[i];
                 newIdx++;
             }
-            
+
         }
-        this.constraints = newList;        
-        
+        this.constraints = newList;
+
     }
 
     /**
      * Returns true if there is a variable bound to this fact.
      */
     public boolean isBound() {
-        if (this.boundName != null && !"".equals(boundName) ) {
+        if ( this.boundName != null && !"".equals( this.boundName ) ) {
             return true;
         } else {
             return false;
         }
     }
-    
-    
-    
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/IAction.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/IAction.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/IAction.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,6 +1,7 @@
 package org.drools.brms.client.modeldriven.brxml;
 
+public interface IAction
+    extends
+    PortableObject {
 
-public interface IAction extends PortableObject {
-    
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/IConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/IConstraint.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/IConstraint.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -8,40 +8,40 @@
 public class IConstraint
     implements
     PortableObject {
-    
+
     /**
      * This is used only when constraint is first created. 
      * This means that there is no value yet for the constraint.
      */
-    public static final int    TYPE_UNDEFINED = 0;
-    
+    public static final int TYPE_UNDEFINED = 0;
+
     /**
      * This may be string, or number, anything really. 
      */
-    public static final int    TYPE_LITERAL   = 1;
-    
+    public static final int TYPE_LITERAL   = 1;
+
     /**
      * This is when it is set to a valid previously bound variable.
      */
-    public static final int    TYPE_VARIABLE  = 2;
-    
+    public static final int TYPE_VARIABLE  = 2;
+
     /**
      * This is for a "formula" that calculates a value.
      */
-    public static final int    TYPE_RET_VALUE = 3;
-    
+    public static final int TYPE_RET_VALUE = 3;
+
     /**
      * This is not used yet. ENUMs are not suitable for business rules
      * until we can get data driven non code enums.
      */
-    public static final int    TYPE_ENUM      = 4;
-    
+    public static final int TYPE_ENUM      = 4;
+
     /**
      * The fieldName and fieldBinding is not used in the case of a predicate. 
      */
-    public static final int    TYPE_PREDICATE = 5;
+    public static final int TYPE_PREDICATE = 5;
 
-    public String value;
-    public int constraintValueType;    
+    public String           value;
+    public int              constraintValueType;
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/IPattern.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/IPattern.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/IPattern.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,6 +1,5 @@
 package org.drools.brms.client.modeldriven.brxml;
 
-
 public interface IPattern
     extends
     PortableObject {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/RuleAttribute.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/RuleAttribute.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/RuleAttribute.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,6 +1,5 @@
 package org.drools.brms.client.modeldriven.brxml;
 
-
 /**
  * This holds values for rule attributes (eg salience, agenda-group etc).
  * @author Michael Neale
@@ -8,15 +7,17 @@
 public class RuleAttribute
     implements
     PortableObject {
-    
-    public RuleAttribute(String name,
-                         String value) {
+
+    public RuleAttribute(final String name,
+                         final String value) {
         this.attributeName = name;
         this.value = value;
     }
+
     public String attributeName;
     public String value;
 
-    public RuleAttribute() {}
-    
+    public RuleAttribute() {
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/RuleModel.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/RuleModel.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/RuleModel.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -3,50 +3,58 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class RuleModel implements PortableObject {
+public class RuleModel
+    implements
+    PortableObject {
 
-    public String name;
-    public String modelVersion = "1.0";
-    
-    public RuleAttribute[] attributes = new RuleAttribute[0];
-    
-    public IPattern[] lhs = new IPattern[0];
-    public IAction[] rhs = new IAction[0];
-    
+    public String          name;
+    public String          modelVersion = "1.0";
+
+    public RuleAttribute[] attributes   = new RuleAttribute[0];
+
+    public IPattern[]      lhs          = new IPattern[0];
+    public IAction[]       rhs          = new IAction[0];
+
     /**
      * This will return the fact pattern that a variable is bound to. 
      * 
      * @param var The bound fact variable (NOT bound field).
      * @return null or the FactPattern found. 
      */
-    public FactPattern getBoundFact(String var) {
-        if (lhs == null ) return null;
-        for ( int i = 0; i < lhs.length; i++ ) {
-            
-            if (lhs[i] instanceof FactPattern) {
-                FactPattern p = (FactPattern) lhs[i];
-                if (p.boundName != null && var.equals( p.boundName)) {
+    public FactPattern getBoundFact(final String var) {
+        if ( this.lhs == null ) {
+            return null;
+        }
+        for ( int i = 0; i < this.lhs.length; i++ ) {
+
+            if ( this.lhs[i] instanceof FactPattern ) {
+                final FactPattern p = (FactPattern) this.lhs[i];
+                if ( p.boundName != null && var.equals( p.boundName ) ) {
                     return p;
                 }
             }
         }
         return null;
     }
-    
+
     /**
      * @return A list of bound facts (String). Or empty list if none are found.
      */
     public List getBoundFacts() {
-        if (lhs == null) return null;
-        List list = new ArrayList();
-        for ( int i = 0; i < lhs.length; i++ ) {
-            if (lhs[i] instanceof FactPattern) {
-                FactPattern p = (FactPattern) lhs[i];
-                if (p.boundName != null)  list.add( p.boundName );
+        if ( this.lhs == null ) {
+            return null;
+        }
+        final List list = new ArrayList();
+        for ( int i = 0; i < this.lhs.length; i++ ) {
+            if ( this.lhs[i] instanceof FactPattern ) {
+                final FactPattern p = (FactPattern) this.lhs[i];
+                if ( p.boundName != null ) {
+                    list.add( p.boundName );
+                }
             }
         }
         return list;
-        
+
     }
 
     /**
@@ -55,25 +63,25 @@
      * @param Returns false if it was NOT allowed to remove this item (ie 
      * it is used on the RHS).
      */
-    public boolean removeLhsItem(int idx) {
-        
-        IPattern[] newList = new IPattern[lhs.length - 1];
+    public boolean removeLhsItem(final int idx) {
+
+        final IPattern[] newList = new IPattern[this.lhs.length - 1];
         int newIdx = 0;
-        for ( int i = 0; i < lhs.length; i++ ) {
-            
-            if (i != idx) {
-                newList[newIdx] = lhs[i];
+        for ( int i = 0; i < this.lhs.length; i++ ) {
+
+            if ( i != idx ) {
+                newList[newIdx] = this.lhs[i];
                 newIdx++;
             } else {
-                if (lhs[i] instanceof FactPattern) {
-                    FactPattern p = (FactPattern) lhs[i];
-                    if (p.boundName != null && isBoundFactUsed( p.boundName )) {
+                if ( this.lhs[i] instanceof FactPattern ) {
+                    final FactPattern p = (FactPattern) this.lhs[i];
+                    if ( p.boundName != null && isBoundFactUsed( p.boundName ) ) {
                         return false;
                     }
                 }
-                
+
             }
-            
+
         }
         this.lhs = newList;
         return true;
@@ -83,91 +91,96 @@
      * @param binding The name of the LHS fact binding.
      * @return Returns true if the specified binding is used on the RHS.
      */
-    public boolean isBoundFactUsed(String binding) {
-        if (rhs == null) return false;
-        for ( int i = 0; i < rhs.length; i++ ) {
-            if (rhs[i] instanceof ActionSetField) {
-                ActionSetField set = (ActionSetField) rhs[i];
-                if (set.variable.equals( binding )) {
+    public boolean isBoundFactUsed(final String binding) {
+        if ( this.rhs == null ) {
+            return false;
+        }
+        for ( int i = 0; i < this.rhs.length; i++ ) {
+            if ( this.rhs[i] instanceof ActionSetField ) {
+                final ActionSetField set = (ActionSetField) this.rhs[i];
+                if ( set.variable.equals( binding ) ) {
                     return true;
                 }
-            } else if (rhs[i] instanceof ActionRetractFact) {
-                ActionRetractFact ret = (ActionRetractFact) rhs[i];
-                if (ret.variableName.equals( binding )) {
+            } else if ( this.rhs[i] instanceof ActionRetractFact ) {
+                final ActionRetractFact ret = (ActionRetractFact) this.rhs[i];
+                if ( ret.variableName.equals( binding ) ) {
                     return true;
                 }
             }
         }
         return false;
     }
-    
-    public void addLhsItem(IPattern pat) {
-        if (this.lhs == null) this.lhs = new IPattern[0];
-        
-        IPattern[] list = this.lhs;
-        IPattern[] newList = new IPattern[list.length + 1];
-        
+
+    public void addLhsItem(final IPattern pat) {
+        if ( this.lhs == null ) {
+            this.lhs = new IPattern[0];
+        }
+
+        final IPattern[] list = this.lhs;
+        final IPattern[] newList = new IPattern[list.length + 1];
+
         for ( int i = 0; i < list.length; i++ ) {
-            newList[i] =  list[i];
+            newList[i] = list[i];
         }
-        newList[list.length] = pat; 
-        
-        this.lhs = newList;        
+        newList[list.length] = pat;
+
+        this.lhs = newList;
     }
-    
-    public void addRhsItem(IAction action) {
-        if (this.rhs == null) this.rhs = new IAction[0];
-        
-        IAction[] list = this.rhs;
-        IAction[] newList = new IAction[list.length + 1];
-        
+
+    public void addRhsItem(final IAction action) {
+        if ( this.rhs == null ) {
+            this.rhs = new IAction[0];
+        }
+
+        final IAction[] list = this.rhs;
+        final IAction[] newList = new IAction[list.length + 1];
+
         for ( int i = 0; i < list.length; i++ ) {
-            newList[i] =  list[i];
+            newList[i] = list[i];
         }
-        newList[list.length] = action; 
-        
-        this.rhs = newList;         
+        newList[list.length] = action;
+
+        this.rhs = newList;
     }
-    
-    public void removeRhsItem(int idx) {
-        IAction[] newList = new IAction[rhs.length - 1];
+
+    public void removeRhsItem(final int idx) {
+        final IAction[] newList = new IAction[this.rhs.length - 1];
         int newIdx = 0;
-        for ( int i = 0; i < rhs.length; i++ ) {
-            
-            if (i != idx) {
-                newList[newIdx] = rhs[i];
+        for ( int i = 0; i < this.rhs.length; i++ ) {
+
+            if ( i != idx ) {
+                newList[newIdx] = this.rhs[i];
                 newIdx++;
             }
-            
+
         }
         this.rhs = newList;
     }
 
-    public void addAttribute(RuleAttribute attribute) {
-        
-        
-        RuleAttribute[] list = this.attributes;
-        RuleAttribute[] newList = new RuleAttribute[list.length + 1];
-        
+    public void addAttribute(final RuleAttribute attribute) {
+
+        final RuleAttribute[] list = this.attributes;
+        final RuleAttribute[] newList = new RuleAttribute[list.length + 1];
+
         for ( int i = 0; i < list.length; i++ ) {
-            newList[i] =  list[i];
+            newList[i] = list[i];
         }
-        newList[list.length] = attribute; 
-        
-        this.attributes = newList;        
-        
+        newList[list.length] = attribute;
+
+        this.attributes = newList;
+
     }
-    
-    public void removeAttribute(int idx) {
-        RuleAttribute[] newList = new RuleAttribute[attributes.length - 1];
+
+    public void removeAttribute(final int idx) {
+        final RuleAttribute[] newList = new RuleAttribute[this.attributes.length - 1];
         int newIdx = 0;
-        for ( int i = 0; i < attributes.length; i++ ) {
-            
-            if (i != idx) {
-                newList[newIdx] = attributes[i];
+        for ( int i = 0; i < this.attributes.length; i++ ) {
+
+            if ( i != idx ) {
+                newList[newIdx] = this.attributes[i];
                 newIdx++;
             }
-            
+
         }
         this.attributes = newList;
 
@@ -178,44 +191,43 @@
      * what bound variables are in scope for a given constraint (including connectives).
      * Does not take into account globals.
      */
-    public List getBoundVariablesInScope(IConstraint con) {
-        List result = new ArrayList();
+    public List getBoundVariablesInScope(final IConstraint con) {
+        final List result = new ArrayList();
         for ( int i = 0; i < this.lhs.length; i++ ) {
-            IPattern pat = lhs[i];
-            if (pat instanceof FactPattern) {
-                FactPattern fact = (FactPattern) pat;
+            final IPattern pat = this.lhs[i];
+            if ( pat instanceof FactPattern ) {
+                final FactPattern fact = (FactPattern) pat;
 
-                if (fact.constraints != null) {
-                        Constraint[] cons = fact.constraints;
-                        for ( int k = 0; k < cons.length; k++ ) {
-                            Constraint c = cons[k];
-                            if (c == con) {
-                                return result;
-                            }                     
-                            if (c.connectives != null) {
-                                for ( int j = 0; j < c.connectives.length; j++ ) {
-                                    if (con == c.connectives[j]) {
-                                        return result;
-                                    }
+                if ( fact.constraints != null ) {
+                    final Constraint[] cons = fact.constraints;
+                    for ( int k = 0; k < cons.length; k++ ) {
+                        final Constraint c = cons[k];
+                        if ( c == con ) {
+                            return result;
+                        }
+                        if ( c.connectives != null ) {
+                            for ( int j = 0; j < c.connectives.length; j++ ) {
+                                if ( con == c.connectives[j] ) {
+                                    return result;
                                 }
                             }
-                            if (c.isBound()) {
-                                result.add( c.fieldBinding );
-                            }
                         }
-                    if (fact.isBound() ) {
-                        result.add(fact.boundName);
-                    }                       
+                        if ( c.isBound() ) {
+                            result.add( c.fieldBinding );
+                        }
+                    }
+                    if ( fact.isBound() ) {
+                        result.add( fact.boundName );
+                    }
                 } else {
-                    if (fact.isBound() ) {
-                        result.add(fact.boundName);
-                    }                       
+                    if ( fact.isBound() ) {
+                        result.add( fact.boundName );
+                    }
                 }
-                        
-                
+
             }
         }
         return result;
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/converter/BRXMLToDescrConverter.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/converter/BRXMLToDescrConverter.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/converter/BRXMLToDescrConverter.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -6,6 +6,7 @@
 import org.drools.brms.client.modeldriven.brxml.Constraint;
 import org.drools.brms.client.modeldriven.brxml.DSLSentence;
 import org.drools.brms.client.modeldriven.brxml.FactPattern;
+import org.drools.brms.client.modeldriven.brxml.IConstraint;
 import org.drools.brms.client.modeldriven.brxml.IPattern;
 import org.drools.brms.client.modeldriven.brxml.RuleAttribute;
 import org.drools.brms.client.modeldriven.brxml.RuleModel;
@@ -37,9 +38,9 @@
  */
 public class BRXMLToDescrConverter {
 
-    public RuleDescr toDescr(RuleModel model,
-                             String ruleName) {
-        RuleDescr rule = new RuleDescr( ruleName );
+    public RuleDescr toDescr(final RuleModel model,
+                             final String ruleName) {
+        final RuleDescr rule = new RuleDescr( ruleName );
         addAttributes( rule,
                        model.attributes );
         addLHS( rule,
@@ -47,12 +48,12 @@
         return rule;
     }
 
-    private void addLHS(RuleDescr rule,
-                        IPattern[] lhs) {
-        AndDescr lhsDescr = new AndDescr(); 
+    private void addLHS(final RuleDescr rule,
+                        final IPattern[] lhs) {
+        final AndDescr lhsDescr = new AndDescr();
         rule.setLhs( lhsDescr );
         for ( int i = 0; i < lhs.length; i++ ) {
-            IPattern cond = lhs[i];
+            final IPattern cond = lhs[i];
             if ( cond instanceof DSLSentence ) {
                 // need to decide what to do with DSL sentences
                 //render((DSLSentence) cond, buf);
@@ -67,57 +68,58 @@
 
     }
 
-    private void addComposite(ConditionalElementDescr ce,
-                              CompositeFactPattern pattern) {
+    private void addComposite(final ConditionalElementDescr ce,
+                              final CompositeFactPattern pattern) {
         ConditionalElementDescr inner = null;
-        if( CompositeFactPattern.OR.equals( pattern.type )) {
+        if ( CompositeFactPattern.OR.equals( pattern.type ) ) {
             inner = new OrDescr();
-        } else if( CompositeFactPattern.NOT.equals( pattern.type )) {
+        } else if ( CompositeFactPattern.NOT.equals( pattern.type ) ) {
             inner = new NotDescr();
-        } else if( CompositeFactPattern.EXISTS.equals( pattern.type )) {
+        } else if ( CompositeFactPattern.EXISTS.equals( pattern.type ) ) {
             inner = new ExistsDescr();
         }
-        for( int i = 0; i < pattern.patterns.length; i++ ) {
-            this.addFact( inner, pattern.patterns[i] );
+        for ( int i = 0; i < pattern.patterns.length; i++ ) {
+            this.addFact( inner,
+                          pattern.patterns[i] );
         }
         ce.addDescr( (BaseDescr) inner );
     }
 
-    private void addFact(ConditionalElementDescr ce,
-                         FactPattern pattern) {
-        ColumnDescr column = new ColumnDescr( pattern.factType );
+    private void addFact(final ConditionalElementDescr ce,
+                         final FactPattern pattern) {
+        final ColumnDescr column = new ColumnDescr( pattern.factType );
         column.setIdentifier( pattern.boundName );
         ce.addDescr( column );
 
         for ( int i = 0; i < pattern.constraints.length; i++ ) {
-            Constraint constr = pattern.constraints[i];
+            final Constraint constr = pattern.constraints[i];
             if ( constr.fieldBinding != null ) {
-                FieldBindingDescr fieldDescr = new FieldBindingDescr( constr.fieldName,
+                final FieldBindingDescr fieldDescr = new FieldBindingDescr( constr.fieldName,
                                                                       constr.fieldBinding );
                 column.addDescr( fieldDescr );
             }
-            if ( constr.constraintValueType == Constraint.TYPE_PREDICATE ) {
-                PredicateDescr predicateDescr = new PredicateDescr( constr.value );
+            if ( constr.constraintValueType == IConstraint.TYPE_PREDICATE ) {
+                final PredicateDescr predicateDescr = new PredicateDescr( constr.value );
                 column.addDescr( predicateDescr );
             } else {
-                FieldConstraintDescr constrDescr = new FieldConstraintDescr( constr.fieldName );
+                final FieldConstraintDescr constrDescr = new FieldConstraintDescr( constr.fieldName );
                 constrDescr.addRestriction( this.getFieldRestriction( constr.constraintValueType,
                                                                       constr.operator,
                                                                       constr.value ) );
 
                 if ( constr.connectives != null ) {
                     for ( int j = 0; j < constr.connectives.length; j++ ) {
-                        ConnectiveConstraint conn = constr.connectives[j];
-                        if (conn.isANDConnective()) {
-                                RestrictionConnectiveDescr andDescr = new RestrictionConnectiveDescr( RestrictionConnectiveDescr.AND );
-                                constrDescr.addRestriction( andDescr );
-                        } else if (conn.isORConnective()){
-                                RestrictionConnectiveDescr orDescr = new RestrictionConnectiveDescr( RestrictionConnectiveDescr.OR );
-                                constrDescr.addRestriction( orDescr );
+                        final ConnectiveConstraint conn = constr.connectives[j];
+                        if ( conn.isANDConnective() ) {
+                            final RestrictionConnectiveDescr andDescr = new RestrictionConnectiveDescr( RestrictionConnectiveDescr.AND );
+                            constrDescr.addRestriction( andDescr );
+                        } else if ( conn.isORConnective() ) {
+                            final RestrictionConnectiveDescr orDescr = new RestrictionConnectiveDescr( RestrictionConnectiveDescr.OR );
+                            constrDescr.addRestriction( orDescr );
                         } else {
-                            throw new IllegalStateException("Unknown connective type/operator: [" + conn.operator + "]");
+                            throw new IllegalStateException( "Unknown connective type/operator: [" + conn.operator + "]" );
                         }
-                        
+
                         constrDescr.addRestriction( this.getFieldRestriction( conn.constraintValueType,
                                                                               conn.operator,
                                                                               conn.value ) );
@@ -132,25 +134,25 @@
      * @param constr
      * @param constrDescr
      */
-    private RestrictionDescr getFieldRestriction(int type,
-                                                 String operator,
-                                                 String value) {
+    private RestrictionDescr getFieldRestriction(final int type,
+                                                 final String operator,
+                                                 final String value) {
         switch ( type ) {
-            case Constraint.TYPE_LITERAL :
-                LiteralRestrictionDescr lit = new LiteralRestrictionDescr( operator,
+            case IConstraint.TYPE_LITERAL :
+                final LiteralRestrictionDescr lit = new LiteralRestrictionDescr( operator,
                                                                            value );
                 return lit;
-            case Constraint.TYPE_VARIABLE :
-                VariableRestrictionDescr var = new VariableRestrictionDescr( operator,
+            case IConstraint.TYPE_VARIABLE :
+                final VariableRestrictionDescr var = new VariableRestrictionDescr( operator,
                                                                              value );
                 return var;
-            case Constraint.TYPE_ENUM :
-                LiteralRestrictionDescr enu = new LiteralRestrictionDescr( operator,
+            case IConstraint.TYPE_ENUM :
+                final LiteralRestrictionDescr enu = new LiteralRestrictionDescr( operator,
                                                                            value,
                                                                            true );
                 return enu;
-            case Constraint.TYPE_RET_VALUE :
-                ReturnValueRestrictionDescr rvc = new ReturnValueRestrictionDescr( operator,
+            case IConstraint.TYPE_RET_VALUE :
+                final ReturnValueRestrictionDescr rvc = new ReturnValueRestrictionDescr( operator,
                                                                                    value );
                 return rvc;
             default :
@@ -158,11 +160,11 @@
         }
     }
 
-    private void addAttributes(RuleDescr rule,
-                               RuleAttribute[] attributes) {
+    private void addAttributes(final RuleDescr rule,
+                               final RuleAttribute[] attributes) {
         for ( int i = 0; i < attributes.length; i++ ) {
-            RuleAttribute at = attributes[i];
-            AttributeDescr attr = new AttributeDescr( at.attributeName,
+            final RuleAttribute at = attributes[i];
+            final AttributeDescr attr = new AttributeDescr( at.attributeName,
                                                       at.value == null ? "true" : at.value );
             rule.addAttribute( attr );
         }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/rules/SuggestionCompletionLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/rules/SuggestionCompletionLoader.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/rules/SuggestionCompletionLoader.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -43,13 +43,13 @@
  */
 public class SuggestionCompletionLoader {
 
-    private SuggestionCompletionEngineBuilder builder = new SuggestionCompletionEngineBuilder();
-    private DrlParser                         parser  = new DrlParser();
+    private final SuggestionCompletionEngineBuilder builder = new SuggestionCompletionEngineBuilder();
+    private final DrlParser                         parser  = new DrlParser();
     private final ByteArrayClassLoader        loader;
-    protected List errors;
+    protected List                            errors;
 
     public SuggestionCompletionLoader() {
-        loader = new ByteArrayClassLoader( this.getClass().getClassLoader() );
+        this.loader = new ByteArrayClassLoader( this.getClass().getClassLoader() );
     }
 
     /**
@@ -58,43 +58,46 @@
      * @param pkg
      * @return
      */
-    public SuggestionCompletionEngine getSuggestionEngine(String header, List jars, List dsls) {
-        errors = new ArrayList();
-        builder.newCompletionEngine();
+    public SuggestionCompletionEngine getSuggestionEngine(final String header,
+                                                          final List jars,
+                                                          final List dsls) {
+        this.errors = new ArrayList();
+        this.builder.newCompletionEngine();
 
-        
-
-        if (!header.trim().equals( "" )) {
-            processPackageHeader( header, jars );
+        if ( !header.trim().equals( "" ) ) {
+            processPackageHeader( header,
+                                  jars );
         }
 
         // populating DSL sentences
         this.populateDSLSentences( dsls );
-        
-        return builder.getInstance();
+
+        return this.builder.getInstance();
     }
 
-    private void processPackageHeader(String header, List jars) {
+    private void processPackageHeader(final String header,
+                                      final List jars) {
         // get fact types from imports
         PackageDescr pkgDescr;
         try {
-            pkgDescr = parser.parse( header );
-        } catch ( DroolsParserException e1 ) {
+            pkgDescr = this.parser.parse( header );
+        } catch ( final DroolsParserException e1 ) {
             throw new IllegalStateException( "Serious error, unable to validate package." );
         }
-   
-        if (this.parser.hasErrors()) {
-            for ( Iterator iter = this.parser.getErrors().iterator(); iter.hasNext(); ) {
-                ParserError element = (ParserError) iter.next();
-                errors.add( element.getMessage() );
-            }            
+
+        if ( this.parser.hasErrors() ) {
+            for ( final Iterator iter = this.parser.getErrors().iterator(); iter.hasNext(); ) {
+                final ParserError element = (ParserError) iter.next();
+                this.errors.add( element.getMessage() );
+            }
         }
         // populating information for the model itself
-        this.populateModelInfo( pkgDescr, jars );
-   
+        this.populateModelInfo( pkgDescr,
+                                jars );
+
         // populating globals
-        this.populateGlobalInfo( pkgDescr, jars );
-   
+        this.populateGlobalInfo( pkgDescr,
+                                 jars );
 
     }
 
@@ -102,62 +105,61 @@
      * @param pkg
      * @param errors
      */
-    private void populateDSLSentences(List dsls) {
-//        AssetItemIterator it = pkg.listAssetsByFormat( new String[]{AssetFormats.DSL} );
-//        while ( it.hasNext() ) {
-//            AssetItem item = (AssetItem) it.next();
-//            String dslData = item.getContent();
-//            DSLMappingFile file = new DSLMappingFile();
-//            try {
-//                if ( file.parseAndLoad( new StringReader( dslData ) ) ) {
-//                    DSLMapping mapping = file.getMapping();
-//                    for ( Iterator entries = mapping.getEntries().iterator(); entries.hasNext(); ) {
-//                        DSLMappingEntry entry = (DSLMappingEntry) entries.next();
-//                        if (entry.getSection() == DSLMappingEntry.CONDITION) {
-//                            builder.addDSLConditionSentence( entry.getMappingKey() );
-//                        } else if (entry.getSection() == DSLMappingEntry.CONSEQUENCE) {
-//                            builder.addDSLActionSentence( entry.getMappingKey() );
-//                        }
-//                        
-//                    }
-//                } else {
-//                    errors.add( file.getErrors().toString() );
-//                }
-//            } catch ( IOException e ) {
-//                errors.add( "Error while loading DSL language configuration : " + item.getBinaryContentAttachmentFileName() + " error message: " + e.getMessage() );
-//            }
-//        }
+    private void populateDSLSentences(final List dsls) {
+        //        AssetItemIterator it = pkg.listAssetsByFormat( new String[]{AssetFormats.DSL} );
+        //        while ( it.hasNext() ) {
+        //            AssetItem item = (AssetItem) it.next();
+        //            String dslData = item.getContent();
+        //            DSLMappingFile file = new DSLMappingFile();
+        //            try {
+        //                if ( file.parseAndLoad( new StringReader( dslData ) ) ) {
+        //                    DSLMapping mapping = file.getMapping();
+        //                    for ( Iterator entries = mapping.getEntries().iterator(); entries.hasNext(); ) {
+        //                        DSLMappingEntry entry = (DSLMappingEntry) entries.next();
+        //                        if (entry.getSection() == DSLMappingEntry.CONDITION) {
+        //                            builder.addDSLConditionSentence( entry.getMappingKey() );
+        //                        } else if (entry.getSection() == DSLMappingEntry.CONSEQUENCE) {
+        //                            builder.addDSLActionSentence( entry.getMappingKey() );
+        //                        }
+        //                        
+        //                    }
+        //                } else {
+        //                    errors.add( file.getErrors().toString() );
+        //                }
+        //            } catch ( IOException e ) {
+        //                errors.add( "Error while loading DSL language configuration : " + item.getBinaryContentAttachmentFileName() + " error message: " + e.getMessage() );
+        //            }
+        //        }
 
-        for ( Iterator it = dsls.iterator(); it.hasNext(); ) {
-            DSLMappingFile file = (DSLMappingFile) it.next();        
-            DSLMapping mapping = file.getMapping();
-            for ( Iterator entries = mapping.getEntries().iterator(); entries.hasNext(); ) {
-                DSLMappingEntry entry = (DSLMappingEntry) entries.next();
-                if (entry.getSection() == DSLMappingEntry.CONDITION) {
-                    builder.addDSLConditionSentence( entry.getMappingKey() );
-                } else if (entry.getSection() == DSLMappingEntry.CONSEQUENCE) {
-                    builder.addDSLActionSentence( entry.getMappingKey() );
+        for ( final Iterator it = dsls.iterator(); it.hasNext(); ) {
+            final DSLMappingFile file = (DSLMappingFile) it.next();
+            final DSLMapping mapping = file.getMapping();
+            for ( final Iterator entries = mapping.getEntries().iterator(); entries.hasNext(); ) {
+                final DSLMappingEntry entry = (DSLMappingEntry) entries.next();
+                if ( entry.getSection() == DSLMappingEntry.CONDITION ) {
+                    this.builder.addDSLConditionSentence( entry.getMappingKey() );
+                } else if ( entry.getSection() == DSLMappingEntry.CONSEQUENCE ) {
+                    this.builder.addDSLActionSentence( entry.getMappingKey() );
                 }
             }
         }
-     
-        
+
     }
 
     /**
      * Populate the global stuff.
      */
-    private void populateGlobalInfo(PackageDescr pkgDescr,
-                                    List jars) {
+    private void populateGlobalInfo(final PackageDescr pkgDescr,
+                                    final List jars) {
 
         // populating information for the globals
-        for ( Iterator it = pkgDescr.getGlobals().iterator(); it.hasNext(); ) {
-            GlobalDescr global = (GlobalDescr) it.next();
+        for ( final Iterator it = pkgDescr.getGlobals().iterator(); it.hasNext(); ) {
+            final GlobalDescr global = (GlobalDescr) it.next();
             try {
-                String shortTypeName = global.getType();
+                final String shortTypeName = global.getType();
                 if ( !this.builder.hasFieldsForType( shortTypeName ) ) {
-                    Class clazz = loadClass( 
-                                             global.getType(), jars );
+                    final Class clazz = loadClass( global.getType(),
+                                             jars );
                     loadClassFields( clazz,
                                      shortTypeName );
 
@@ -165,10 +167,10 @@
                                                 shortTypeName );
                 }
 
-                builder.addGlobalType( global.getIdentifier(),
+                this.builder.addGlobalType( global.getIdentifier(),
                                        shortTypeName );
-            } catch ( IOException e ) {
-                errors.add( "Error while inspecting class for global: " + global.getType() + " error message: " + e.getMessage());
+            } catch ( final IOException e ) {
+                this.errors.add( "Error while inspecting class for global: " + global.getType() + " error message: " + e.getMessage() );
             }
 
         }
@@ -177,24 +179,26 @@
     /**
      * Populate the fact type data.
      */
-    private void populateModelInfo(PackageDescr pkgDescr, List jars) {
+    private void populateModelInfo(final PackageDescr pkgDescr,
+                                   final List jars) {
 
         // iterating over the import list
-        ClassTypeResolver resolver = new ClassTypeResolver();
-        for ( Iterator it = pkgDescr.getImports().iterator(); it.hasNext(); ) {
-            ImportDescr imp = (ImportDescr) it.next();
-            String classname = imp.getTarget();
+        final ClassTypeResolver resolver = new ClassTypeResolver();
+        for ( final Iterator it = pkgDescr.getImports().iterator(); it.hasNext(); ) {
+            final ImportDescr imp = (ImportDescr) it.next();
+            final String classname = imp.getTarget();
             resolver.addImport( classname );
 
-            Class clazz = loadClass(  classname, jars );
+            final Class clazz = loadClass( classname,
+                                     jars );
             if ( clazz != null ) {
                 try {
-                    String shortTypeName = getShortNameOfClass( clazz.getName() );
+                    final String shortTypeName = getShortNameOfClass( clazz.getName() );
                     loadClassFields( clazz,
                                      shortTypeName );
-                    builder.addFactType( shortTypeName );
-                } catch ( IOException e ) {
-                    errors.add( "Error while inspecting the class: " + classname + ". The error was: " + e.getMessage() );
+                    this.builder.addFactType( shortTypeName );
+                } catch ( final IOException e ) {
+                    this.errors.add( "Error while inspecting the class: " + classname + ". The error was: " + e.getMessage() );
                 }
             }
         }
@@ -209,54 +213,56 @@
      * 
      * @param pkgDescr
      */
-    private void populateFactTemplateTypes(PackageDescr pkgDescr,
-                                           ClassTypeResolver resolver) {
-        for ( Iterator it = pkgDescr.getFactTemplates().iterator(); it.hasNext(); ) {
-            FactTemplateDescr templ = (FactTemplateDescr) it.next();
-            String factType = templ.getName();
-            builder.addFactType( factType );
+    private void populateFactTemplateTypes(final PackageDescr pkgDescr,
+                                           final ClassTypeResolver resolver) {
+        for ( final Iterator it = pkgDescr.getFactTemplates().iterator(); it.hasNext(); ) {
+            final FactTemplateDescr templ = (FactTemplateDescr) it.next();
+            final String factType = templ.getName();
+            this.builder.addFactType( factType );
 
-            String[] fields = new String[templ.getFields().size()];
-            builder.addFieldsForType( factType,
+            final String[] fields = new String[templ.getFields().size()];
+            this.builder.addFieldsForType( factType,
                                       fields );
 
             int index = 0;
-            for ( Iterator fieldsIt = templ.getFields().iterator(); fieldsIt.hasNext(); ) {
-                FieldTemplateDescr fieldDescr = (FieldTemplateDescr) fieldsIt.next();
+            for ( final Iterator fieldsIt = templ.getFields().iterator(); fieldsIt.hasNext(); ) {
+                final FieldTemplateDescr fieldDescr = (FieldTemplateDescr) fieldsIt.next();
                 fields[index++] = fieldDescr.getName();
-                String fieldType = fieldDescr.getClassType();
+                final String fieldType = fieldDescr.getClassType();
 
                 Class fieldTypeClass = null;
                 try {
                     fieldTypeClass = resolver.resolveType( fieldType );
-                } catch ( ClassNotFoundException e ) {
-                    errors.add( "Fact template field type not found: " + fieldType );
+                } catch ( final ClassNotFoundException e ) {
+                    this.errors.add( "Fact template field type not found: " + fieldType );
                 }
-                builder.addFieldType( factType + "." + fieldDescr.getName(),
+                this.builder.addFieldType( factType + "." + fieldDescr.getName(),
                                       getFieldType( fieldTypeClass ) );
             }
         }
     }
 
-    private void loadClassFields(Class clazz,
-                                 String shortTypeName) throws IOException {
-        if (clazz == null) return;
-        ClassFieldInspector inspector = new ClassFieldInspector( clazz );
+    private void loadClassFields(final Class clazz,
+                                 final String shortTypeName) throws IOException {
+        if ( clazz == null ) {
+            return;
+        }
+        final ClassFieldInspector inspector = new ClassFieldInspector( clazz );
         String[] fields = (String[]) inspector.getFieldNames().keySet().toArray( new String[inspector.getFieldNames().size()] );
 
         fields = removeIrrelevantFields( fields );
 
-        builder.addFieldsForType( shortTypeName,
+        this.builder.addFieldsForType( shortTypeName,
                                   fields );
         for ( int i = 0; i < fields.length; i++ ) {
-            Class type = (Class) inspector.getFieldTypes().get( fields[i] );
-            String fieldType = getFieldType( type );
-            builder.addFieldType( shortTypeName + "." + fields[i],
+            final Class type = (Class) inspector.getFieldTypes().get( fields[i] );
+            final String fieldType = getFieldType( type );
+            this.builder.addFieldType( shortTypeName + "." + fields[i],
                                   fieldType );
         }
     }
 
-    String getShortNameOfClass(String clazz) {
+    String getShortNameOfClass(final String clazz) {
         return clazz.substring( clazz.lastIndexOf( '.' ) + 1 );
     }
 
@@ -264,10 +270,10 @@
      * This will remove the unneeded "fields" that come from java.lang.Object
      * these are really not needed for the modeller.
      */
-    String[] removeIrrelevantFields(String[] fields) {
-        List result = new ArrayList();
+    String[] removeIrrelevantFields(final String[] fields) {
+        final List result = new ArrayList();
         for ( int i = 0; i < fields.length; i++ ) {
-            String field = fields[i];
+            final String field = fields[i];
             if ( field.equals( "class" ) || field.equals( "hashCode" ) || field.equals( "toString" ) ) {
                 //ignore
             } else {
@@ -283,48 +289,51 @@
      * @param clazz
      * @return
      */
-    private Class loadClass(String classname, List jars) {
+    private Class loadClass(final String classname,
+                            final List jars) {
         Class clazz = null;
         try {
             // check if it is already in the classpath
-            clazz = loader.loadClass( classname );
+            clazz = this.loader.loadClass( classname );
 
-        } catch ( ClassNotFoundException e1 ) {
+        } catch ( final ClassNotFoundException e1 ) {
 
             // not found in the classpath, so check if it
             // is in a package model
             try {
                 addJars( jars );
-                clazz = loader.loadClass( classname );
-            } catch ( IOException e ) {
+                clazz = this.loader.loadClass( classname );
+            } catch ( final IOException e ) {
                 throw new IllegalStateException( e.getMessage() );
-            } catch ( ClassNotFoundException e ) {
-                errors.add( "Class not found: " + classname );
+            } catch ( final ClassNotFoundException e ) {
+                this.errors.add( "Class not found: " + classname );
             }
         }
         return clazz;
     }
-    
+
     /**
      * This will add the given jars to the classloader.
      */
-    private void addJars(List jars) throws IOException {
-        for ( Iterator it = jars.iterator(); it.hasNext(); ) {
-            JarInputStream jis = (JarInputStream) it.next();
+    private void addJars(final List jars) throws IOException {
+        for ( final Iterator it = jars.iterator(); it.hasNext(); ) {
+            final JarInputStream jis = (JarInputStream) it.next();
             JarEntry entry = null;
-            byte[] buf = new byte[1024];
+            final byte[] buf = new byte[1024];
             int len = 0;
             while ( (entry = jis.getNextJarEntry()) != null ) {
                 if ( !entry.isDirectory() ) {
-                    ByteArrayOutputStream out = new ByteArrayOutputStream();
+                    final ByteArrayOutputStream out = new ByteArrayOutputStream();
                     while ( (len = jis.read( buf )) >= 0 ) {
-                        out.write( buf, 0, len );
+                        out.write( buf,
+                                   0,
+                                   len );
                     }
-                    loader.addResource( entry.getName(),
+                    this.loader.addResource( entry.getName(),
                                         out.toByteArray() );
                 }
-            }        
-            
+            }
+
         }
     }
 
@@ -334,7 +343,7 @@
      * @param i
      * @return
      */
-    private String getFieldType(Class type) {
+    private String getFieldType(final Class type) {
         String fieldType = null; // if null, will use standard operators
         if ( type != null ) {
             if ( type.isPrimitive() && (type != boolean.class) ) {
@@ -347,18 +356,18 @@
                 fieldType = SuggestionCompletionEngine.TYPE_COLLECTION;
             } else if ( Comparable.class.isAssignableFrom( type ) ) {
                 fieldType = SuggestionCompletionEngine.TYPE_COMPARABLE;
-            } 
+            }
         }
         return fieldType;
     }
-    
+
     /**
      * @return true if there were errors when processing the package.
      */
     public boolean hasErrors() {
         return (this.errors.size() > 0);
     }
-    
+
     /**
      * Returns a list of String errors.
      */

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRLPersistence.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRLPersistence.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -26,43 +26,59 @@
  */
 public class BRLPersistence {
 
-    private XStream        xt;
+    private XStream                     xt;
     private static final BRLPersistence INSTANCE = new BRLPersistence();
 
     private BRLPersistence() {
-        xt = new XStream(new DomDriver());
+        this.xt = new XStream( new DomDriver() );
 
-        xt.alias( "rule", RuleModel.class );
-        xt.alias( "fact", FactPattern.class );
-        xt.alias( "retract", ActionRetractFact.class );
-        xt.alias( "assert", ActionAssertFact.class );
-        xt.alias( "modify", ActionModifyField.class );
-        xt.alias( "setField", ActionSetField.class );
-        xt.alias( "dslSentence", DSLSentence.class );
-        xt.alias( "compositePattern", CompositeFactPattern.class );
-        xt.alias( "attribute", RuleAttribute.class );
+        this.xt.alias( "rule",
+                  RuleModel.class );
+        this.xt.alias( "fact",
+                  FactPattern.class );
+        this.xt.alias( "retract",
+                  ActionRetractFact.class );
+        this.xt.alias( "assert",
+                  ActionAssertFact.class );
+        this.xt.alias( "modify",
+                  ActionModifyField.class );
+        this.xt.alias( "setField",
+                  ActionSetField.class );
+        this.xt.alias( "dslSentence",
+                  DSLSentence.class );
+        this.xt.alias( "compositePattern",
+                  CompositeFactPattern.class );
+        this.xt.alias( "attribute",
+                  RuleAttribute.class );
 
-        xt.alias( "fieldValue", ActionFieldValue.class );
-        xt.alias( "connectiveConstraint", ConnectiveConstraint.class );
-        xt.alias( "constraint", Constraint.class );
+        this.xt.alias( "fieldValue",
+                  ActionFieldValue.class );
+        this.xt.alias( "connectiveConstraint",
+                  ConnectiveConstraint.class );
+        this.xt.alias( "constraint",
+                  Constraint.class );
 
-        xt.alias( "assertLogical", ActionAssertLogicalFact.class );
+        this.xt.alias( "assertLogical",
+                  ActionAssertLogicalFact.class );
 
-
     }
 
     public static BRLPersistence getInstance() {
         return INSTANCE;
     }
 
-    public String toXML(RuleModel model) {
-        return xt.toXML( model );
+    public String toXML(final RuleModel model) {
+        return this.xt.toXML( model );
     }
 
-    public RuleModel toModel(String xml) {
-        if (xml == null) return new RuleModel();    
-        if (xml.trim().equals( "" )) return new RuleModel();
-        return (RuleModel) xt.fromXML( xml );
+    public RuleModel toModel(final String xml) {
+        if ( xml == null ) {
+            return new RuleModel();
+        }
+        if ( xml.trim().equals( "" ) ) {
+            return new RuleModel();
+        }
+        return (RuleModel) this.xt.fromXML( xml );
     }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/SuggestionCompletionEngineBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/SuggestionCompletionEngineBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/SuggestionCompletionEngineBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -31,13 +31,13 @@
  */
 public class SuggestionCompletionEngineBuilder {
 
-    private SuggestionCompletionEngine instance      = new SuggestionCompletionEngine();
-    private List                       factTypes     = new ArrayList();
-    private Map                        fieldsForType = new HashMap();
-    private Map                        fieldTypes    = new HashMap();
-    private Map                        globalTypes   = new HashMap();
-    private List                       actionDSLSentences  = new ArrayList();
-    private List                       conditionDSLSentences  = new ArrayList();
+    private SuggestionCompletionEngine instance              = new SuggestionCompletionEngine();
+    private List                       factTypes             = new ArrayList();
+    private Map                        fieldsForType         = new HashMap();
+    private Map                        fieldTypes            = new HashMap();
+    private Map                        globalTypes           = new HashMap();
+    private List                       actionDSLSentences    = new ArrayList();
+    private List                       conditionDSLSentences = new ArrayList();
 
     public SuggestionCompletionEngineBuilder() {
     }
@@ -60,7 +60,7 @@
      * 
      * @param factType
      */
-    public void addFactType(String factType) {
+    public void addFactType(final String factType) {
         this.factTypes.add( factType );
     }
 
@@ -70,8 +70,8 @@
      * @param type
      * @param fields
      */
-    public void addFieldsForType(String type,
-                                 String[] fields) {
+    public void addFieldsForType(final String type,
+                                 final String[] fields) {
         this.fieldsForType.put( type,
                                 fields );
     }
@@ -79,18 +79,18 @@
     /**
      * @return true if this has the type already registered (field information).
      */
-    public boolean hasFieldsForType(String type) {
+    public boolean hasFieldsForType(final String type) {
         return this.fieldsForType.containsKey( type );
     }
-    
+
     /**
      * Adds a type declaration for a field
      * 
      * @param field
      * @param type
      */
-    public void addFieldType(String field,
-                             String type) {
+    public void addFieldType(final String field,
+                             final String type) {
         this.fieldTypes.put( field,
                              type );
     }
@@ -101,8 +101,8 @@
      * @param global
      * @param type
      */
-    public void addGlobalType(String global,
-                              String type) {
+    public void addGlobalType(final String global,
+                              final String type) {
         this.globalTypes.put( global,
                               type );
     }
@@ -110,21 +110,20 @@
     /**
      * Add a DSL sentence for an action.
      */
-    public void addDSLActionSentence(String sentence) {
-        DSLSentence sen = new DSLSentence();
+    public void addDSLActionSentence(final String sentence) {
+        final DSLSentence sen = new DSLSentence();
         sen.sentence = sentence;
         this.actionDSLSentences.add( sen );
     }
-    
+
     /**
      * Add a DSL sentence for a condition.
      */
-    public void addDSLConditionSentence(String sentence) {
-        DSLSentence sen = new DSLSentence();
+    public void addDSLConditionSentence(final String sentence) {
+        final DSLSentence sen = new DSLSentence();
         sen.sentence = sentence;
         this.conditionDSLSentences.add( sen );
     }
-    
 
     /**
      * Returns a SuggestionCompletionEngine instance populated with 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DialectRegistry.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DialectRegistry.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DialectRegistry.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -7,17 +7,19 @@
 
 public class DialectRegistry {
     private Map map;
-    
+
     public DialectRegistry() {
         this.map = new HashMap();
     }
-    
-    public void addDialect(String name, Dialect dialect) {
-        this.map.put( name, dialect );
+
+    public void addDialect(final String name,
+                           final Dialect dialect) {
+        this.map.put( name,
+                      dialect );
     }
-    
-    public Dialect getDialect(String name) {
-        return ( Dialect ) this.map.get( name );
+
+    public Dialect getDialect(final String name) {
+        return (Dialect) this.map.get( name );
     }
-        
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -50,31 +50,30 @@
         return parser.getPackageDescr();
 
     }
-    
+
     public PackageDescr parse(final Reader reader) throws DroolsParserException {
         final DRLParser parser = getParser( reader );
         compile( parser );
         return parser.getPackageDescr();
 
-    }    
+    }
 
+    //    /** Parse and build a rule package from a DRL source */
+    //    public PackageDescr parse(final Reader reader) throws IOException,
+    //                                            DroolsParserException {
+    //        DRLParser parser = 
+    //        
+    //        //final StringBuffer text = getDRLText( reader );
+    //        //return parse( text.toString() );
+    //    }
 
-//    /** Parse and build a rule package from a DRL source */
-//    public PackageDescr parse(final Reader reader) throws IOException,
-//                                            DroolsParserException {
-//        DRLParser parser = 
-//        
-//        //final StringBuffer text = getDRLText( reader );
-//        //return parse( text.toString() );
-//    }
-
     /** 
      * Parse and build a rule package from a DRL source with a 
      * domain specific language.
      */
     public PackageDescr parse(final Reader drl,
                               final Reader dsl) throws DroolsParserException,
-                                         IOException {
+                                               IOException {
         final StringBuffer text = getDRLText( drl );
         return parse( text.toString(),
                       dsl );
@@ -92,12 +91,14 @@
         DefaultExpanderResolver resolver;
         try {
             resolver = new DefaultExpanderResolver( dsl );
-        } catch ( IOException e ) {
-            throw new DroolsParserException( "Error parsing the DSL.", e);
+        } catch ( final IOException e ) {
+            throw new DroolsParserException( "Error parsing the DSL.",
+                                             e );
         }
-        Expander expander = resolver.get( "*", null );
-        String expanded = expander.expand( source );
-        if( expander.hasErrors() ) {
+        final Expander expander = resolver.get( "*",
+                                          null );
+        final String expanded = expander.expand( source );
+        if ( expander.hasErrors() ) {
             this.results.addAll( expander.getErrors() );
         }
         return this.parse( expanded );
@@ -130,7 +131,7 @@
     public List getErrors() {
         return this.results;
     }
-    
+
     private void compile(final DRLParser parser) throws DroolsParserException {
         try {
             parser.compilation_unit();
@@ -146,8 +147,8 @@
         for ( final Iterator iter = parser.getErrors().iterator(); iter.hasNext(); ) {
             final RecognitionException recogErr = (RecognitionException) iter.next();
             final ParserError err = new ParserError( parser.createErrorMessage( recogErr ),
-                                               recogErr.line,
-                                               recogErr.charPositionInLine );
+                                                     recogErr.line,
+                                                     recogErr.charPositionInLine );
             this.results.add( err );
         }
     }
@@ -162,8 +163,9 @@
     private DRLParser getParser(final Reader reader) {
         try {
             return new DRLParser( new SwitchingCommonTokenStream( new DRLLexer( new ANTLRReaderStream( reader ) ) ) );
-        }catch (Exception e) {
-            throw new RuntimeException( "Unable to parser Reader", e);
+        } catch ( final Exception e ) {
+            throw new RuntimeException( "Unable to parser Reader",
+                                        e );
         }
-    }    
+    }
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/FactTemplateError.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/FactTemplateError.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/FactTemplateError.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -18,19 +18,18 @@
 
 import org.apache.commons.jci.problems.CompilationProblem;
 import org.drools.lang.descr.BaseDescr;
-import org.drools.rule.Rule;
 import org.drools.rule.Package;
 
 public class FactTemplateError extends DroolsError {
-    private Package pkg;
+    private Package   pkg;
     private BaseDescr descr;
-    private Object       object;
-    private String       message;
+    private Object    object;
+    private String    message;
 
     public FactTemplateError(final Package pkg,
-                     final BaseDescr descr,
-                     final Object object,
-                     final String message) {
+                             final BaseDescr descr,
+                             final Object object,
+                             final String message) {
         super();
         this.pkg = pkg;
         this.descr = descr;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/FieldTemplateError.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/FieldTemplateError.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/FieldTemplateError.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -18,14 +18,13 @@
 
 import org.apache.commons.jci.problems.CompilationProblem;
 import org.drools.lang.descr.BaseDescr;
-import org.drools.rule.Rule;
 import org.drools.rule.Package;
 
 public class FieldTemplateError extends DroolsError {
-    private Package      pkg;
+    private Package   pkg;
     private BaseDescr descr;
-    private Object       object;
-    private String       message;
+    private Object    object;
+    private String    message;
 
     public FieldTemplateError(final Package pkg,
                               final BaseDescr descr,

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -19,25 +19,14 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.jci.compilers.CompilationResult;
-import org.apache.commons.jci.compilers.EclipseJavaCompiler;
-import org.apache.commons.jci.compilers.EclipseJavaCompilerSettings;
-import org.apache.commons.jci.compilers.JavaCompiler;
-import org.apache.commons.jci.compilers.JavaCompilerFactory;
 import org.apache.commons.jci.problems.CompilationProblem;
-import org.apache.commons.jci.readers.MemoryResourceReader;
-import org.apache.commons.jci.readers.ResourceReader;
 import org.codehaus.jfdi.interpreter.ClassTypeResolver;
 import org.codehaus.jfdi.interpreter.TypeResolver;
-import org.drools.RuntimeDroolsException;
 import org.drools.base.ClassFieldExtractorCache;
 import org.drools.facttemplates.FactTemplate;
 import org.drools.facttemplates.FactTemplateImpl;
@@ -52,18 +41,12 @@
 import org.drools.lang.descr.ImportDescr;
 import org.drools.lang.descr.PackageDescr;
 import org.drools.lang.descr.RuleDescr;
-import org.drools.rule.LineMappings;
 import org.drools.rule.Package;
 import org.drools.rule.Rule;
 import org.drools.rule.builder.Dialect;
-import org.drools.rule.builder.FunctionBuilder;
 import org.drools.rule.builder.RuleBuilder;
 import org.drools.rule.builder.dialect.java.JavaDialect;
-import org.drools.rule.builder.dialect.java.JavaFunctionBuilder;
-import org.drools.rule.builder.dialect.java.PackageStore;
-import org.drools.spi.FunctionResolver;
 import org.drools.xml.XmlPackageReader;
-import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 import org.xml.sax.SAXException;
 
 /**
@@ -119,7 +102,7 @@
                           PackageBuilderConfiguration configuration) {
         if ( configuration == null ) {
             configuration = new PackageBuilderConfiguration();
-        }        
+        }
 
         this.configuration = configuration;
         this.results = new ArrayList();
@@ -130,7 +113,7 @@
         this.dialects.addDialect( "java",
                                   new JavaDialect( pkg,
                                                    configuration ) );
-        
+
         this.dialect = this.dialects.getDialect( "java" );
     }
 
@@ -203,7 +186,7 @@
             this.pkg = newPackage( packageDescr );
         }
 
-        builder = new RuleBuilder( getTypeResolver(),
+        this.builder = new RuleBuilder( getTypeResolver(),
                                    this.classFieldExtractorCache,
                                    this.dialect );
 
@@ -295,7 +278,7 @@
 
     private void addFunction(final FunctionDescr functionDescr) {
         this.dialect.addFunction( functionDescr,
-                                 getTypeResolver() );
+                                  getTypeResolver() );
     }
 
     private void addFactTemplate(final FactTemplateDescr factTemplateDescr) {
@@ -325,16 +308,16 @@
     private void addRule(final RuleDescr ruleDescr) {
         this.dialect.init( ruleDescr );
 
-        builder.build( this.pkg,
+        this.builder.build( this.pkg,
                        ruleDescr );
 
-        this.results.addAll( builder.getErrors() );
+        this.results.addAll( this.builder.getErrors() );
 
-        final Rule rule = builder.getRule();
+        final Rule rule = this.builder.getRule();
 
-        this.dialect.addRuleSemantics( builder,
-                                      rule,
-                                      ruleDescr );
+        this.dialect.addRuleSemantics( this.builder,
+                                       rule,
+                                       ruleDescr );
 
         this.pkg.addRule( rule );
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -63,20 +63,24 @@
     }
 
     public String getJavaLanguageLevel() {
-        if ( languageLevel != null ) return languageLevel;
+        if ( this.languageLevel != null ) {
+            return this.languageLevel;
+        }
         setJavaLanguageLevel( System.getProperty( "drools.compiler.lnglevel",
                                                   DEFAULT_LANGUAGE_LEVEL ) );
-        return languageLevel;
+        return this.languageLevel;
     }
 
     /**
      * You cannot set language level below 1.5, as we need static imports, 1.5 is now the default.
      * @param level
      */
-    public void setJavaLanguageLevel(String level) {
+    public void setJavaLanguageLevel(final String level) {
         if ( Arrays.binarySearch( LANGUAGE_LEVELS,
-                                  languageLevel ) < 0 ) throw new RuntimeDroolsException( "value '" + languageLevel + "' is not a valid language level" );
-        languageLevel = level;
+                                  this.languageLevel ) < 0 ) {
+            throw new RuntimeDroolsException( "value '" + this.languageLevel + "' is not a valid language level" );
+        }
+        this.languageLevel = level;
     }
 
     /** 
@@ -132,7 +136,7 @@
 
     static String getDefaultLanguageLevel() {
         try {
-            String languageLevel = System.getProperty( "drools.compiler.languagelevel",
+            final String languageLevel = System.getProperty( "drools.compiler.languagelevel",
                                                        DEFAULT_LANGUAGE_LEVEL );
 
             if ( Arrays.binarySearch( LANGUAGE_LEVELS,
@@ -141,7 +145,7 @@
             }
 
             return languageLevel;
-        } catch ( Exception e ) {
+        } catch ( final Exception e ) {
             System.err.println( "Drools config: unable to read the drools.compiler.lnglevel property. Using default." );
             return DEFAULT_LANGUAGE_LEVEL;
         }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ParserError.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ParserError.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ParserError.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -41,9 +41,9 @@
     public int getRow() {
         return this.row;
     }
-    
+
     public String toString() {
-        return "["+row+","+col+"]: "+message;
+        return "[" + this.row + "," + this.col + "]: " + this.message;
     }
 
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,4 +1,5 @@
 package org.drools.compiler;
+
 /*
  * Copyright 2005 JBoss Inc
  * 
@@ -31,33 +32,33 @@
  * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
  */
 public class ProcessBuilder {
-	
-	private List processes = new ArrayList();
-	
-	public IProcess[] getProcesses() {
-		return (IProcess[]) processes.toArray(new IProcess[processes.size()]);
-	}
-	
-	public void addProcess(IProcess process) {
-		processes.add(process);
-	}
-	
-	public void addProcessFromFile(final Reader reader) throws Exception {
-        XStream stream = new XStream();
-        stream.setMode(XStream.ID_REFERENCES);
-        
-        ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
-        ClassLoader newLoader = this.getClass().getClassLoader();
+
+    private final List processes = new ArrayList();
+
+    public IProcess[] getProcesses() {
+        return (IProcess[]) this.processes.toArray( new IProcess[this.processes.size()] );
+    }
+
+    public void addProcess(final IProcess process) {
+        this.processes.add( process );
+    }
+
+    public void addProcessFromFile(final Reader reader) throws Exception {
+        final XStream stream = new XStream();
+        stream.setMode( XStream.ID_REFERENCES );
+
+        final ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+        final ClassLoader newLoader = this.getClass().getClassLoader();
         try {
-            Thread.currentThread().setContextClassLoader(newLoader);
-            IRuleFlowProcess process = (IRuleFlowProcess) stream.fromXML(reader);
-            addProcess(process);
-        } catch (Exception t) {
+            Thread.currentThread().setContextClassLoader( newLoader );
+            final IRuleFlowProcess process = (IRuleFlowProcess) stream.fromXML( reader );
+            addProcess( process );
+        } catch ( final Exception t ) {
             t.printStackTrace();
             throw t;
         } finally {
-            Thread.currentThread().setContextClassLoader(oldLoader);
+            Thread.currentThread().setContextClassLoader( oldLoader );
         }
         reader.close();
-	}
+    }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/RuleBaseLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/RuleBaseLoader.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/RuleBaseLoader.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -18,7 +18,7 @@
 public class RuleBaseLoader {
 
     private static final RuleBaseLoader INSTANCE   = new RuleBaseLoader();
-    private static int            engineType = RuleBase.RETEOO;
+    private static int                  engineType = RuleBase.RETEOO;
 
     private RuleBaseLoader() {
     }
@@ -33,7 +33,7 @@
      * Uses the current default engine type.
      */
     public RuleBase loadFromReader(final Reader drl) throws CheckedDroolsException,
-                                              IOException {
+                                                    IOException {
         final PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( drl );
         return makeRuleBase( builder );
@@ -45,7 +45,7 @@
      */
     public RuleBase loadFromReader(final Reader drl,
                                    final Reader dsl) throws CheckedDroolsException,
-                                              IOException {
+                                                    IOException {
         final PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( drl,
                                    dsl );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/RuleError.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/RuleError.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/RuleError.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -21,10 +21,10 @@
 import org.drools.rule.Rule;
 
 public class RuleError extends DroolsError {
-    private Rule         rule;
-    private BaseDescr    descr;
-    private Object       object;
-    private String       message;
+    private Rule      rule;
+    private BaseDescr descr;
+    private Object    object;
+    private String    message;
 
     public RuleError(final Rule rule,
                      final BaseDescr descr,
@@ -72,14 +72,14 @@
         }
         return summary;
     }
-    
+
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        final StringBuffer buf = new StringBuffer();
         buf.append( this.message );
         buf.append( " : " );
         buf.append( this.rule );
         buf.append( "\n" );
-        if( this.object instanceof CompilationProblem[] ) {
+        if ( this.object instanceof CompilationProblem[] ) {
             final CompilationProblem[] problem = (CompilationProblem[]) this.object;
             for ( int i = 0; i < problem.length; i++ ) {
                 buf.append( "\t" );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/SwitchingCommonTokenStream.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/SwitchingCommonTokenStream.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/SwitchingCommonTokenStream.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -27,69 +27,71 @@
  * @author <mailto:tirelli at post.com>Edson Tirelli</mailto>
  */
 public class SwitchingCommonTokenStream extends CommonTokenStream {
-    
+
     public SwitchingCommonTokenStream() {
         super();
     }
 
-    public SwitchingCommonTokenStream(TokenSource tokenSource) {
-        super(tokenSource);
+    public SwitchingCommonTokenStream(final TokenSource tokenSource) {
+        super( tokenSource );
     }
 
-    public SwitchingCommonTokenStream(TokenSource tokenSource, int channel) {
-        super(tokenSource, channel);
+    public SwitchingCommonTokenStream(final TokenSource tokenSource,
+                                      final int channel) {
+        super( tokenSource,
+               channel );
     }
 
-    public Integer getTokenTypeChannel(int tokenType) {
-        if( this.channelOverrideMap != null ) {
-            return (Integer) this.channelOverrideMap.get( new Integer(tokenType) );
+    public Integer getTokenTypeChannel(final int tokenType) {
+        if ( this.channelOverrideMap != null ) {
+            return (Integer) this.channelOverrideMap.get( new Integer( tokenType ) );
         }
         return null;
     }
-    
-    public void removeTokenTypeChannel(int tokenType) {
-        if( this.channelOverrideMap != null ) {
-            this.channelOverrideMap.remove( new Integer(tokenType) );
+
+    public void removeTokenTypeChannel(final int tokenType) {
+        if ( this.channelOverrideMap != null ) {
+            this.channelOverrideMap.remove( new Integer( tokenType ) );
         }
     }
-    
+
     /** 
      * @inheritdoc
      */
     protected int skipOffTokenChannels(int i) {
-        int n = tokens.size();
-        while ( i<n ) {
-            Token t = ((Token)tokens.get(i));
+        final int n = this.tokens.size();
+        while ( i < n ) {
+            final Token t = ((Token) this.tokens.get( i ));
             // is there a channel override for token type?
-            if ( channelOverrideMap!=null ) {
-                Integer channelI = (Integer) channelOverrideMap.get(new Integer(t.getType()));
-                if ( channelI!=null ) {
-                    t.setChannel(channelI.intValue());
+            if ( this.channelOverrideMap != null ) {
+                final Integer channelI = (Integer) this.channelOverrideMap.get( new Integer( t.getType() ) );
+                if ( channelI != null ) {
+                    t.setChannel( channelI.intValue() );
                 }
             }
-            if( t.getChannel() == channel ) {
+            if ( t.getChannel() == this.channel ) {
                 break;
             }
             i++;
         }
         return i;
-        
+
     }
 
     /** 
      * @inheritdoc
      */
     protected int skipOffTokenChannelsReverse(int i) {
-        while ( i>=0 ) {
-            Token t = ((Token)tokens.get(i));
+        while ( i >= 0 ) {
+            final Token t = ((Token) this.tokens.get( i ));
             // is there a channel override for token type?
-            if ( channelOverrideMap!=null ) {
-                Integer channelI = (Integer) channelOverrideMap.get(new Integer(t.getType()));
-                if ( channelI!=null ) {
-                    t.setChannel(channelI.intValue());
+            if ( this.channelOverrideMap != null ) {
+                final Integer channelI = (Integer) this.channelOverrideMap.get( new Integer( t.getType() ) );
+                if ( channelI != null ) {
+                    t.setChannel( channelI.intValue() );
                 }
             }
-            if( t.getChannel() == channel ) {
+            if ( t.getChannel() == this.channel ) {
                 break;
             }
             i--;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,4097 +1,4532 @@
 // $ANTLR 3.0b7 C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g 2007-04-11 16:59:52
-
-	package org.drools.lang;
 
+package org.drools.lang;
 
 import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
 import java.util.HashMap;
+
 public class DRLLexer extends Lexer {
-    public static final int T75=75;
-    public static final int PACKAGE=4;
-    public static final int FUNCTION=6;
-    public static final int ACCUMULATE=28;
-    public static final int T76=76;
-    public static final int RIGHT_SQUARE=45;
-    public static final int T73=73;
-    public static final int T74=74;
-    public static final int ACTIVATION_GROUP=23;
-    public static final int T77=77;
-    public static final int RIGHT_CURLY=43;
-    public static final int ATTRIBUTES=13;
-    public static final int T78=78;
-    public static final int CONTAINS=37;
-    public static final int NO_LOOP=21;
-    public static final int LOCK_ON_ACTIVE=27;
-    public static final int AGENDA_GROUP=25;
-    public static final int FLOAT=40;
-    public static final int NOT=49;
-    public static final int SH_STYLE_SINGLE_LINE_COMMENT=59;
-    public static final int ID=33;
-    public static final int AND=46;
-    public static final int EOF=-1;
-    public static final int HexDigit=56;
-    public static final int DATE_EFFECTIVE=14;
-    public static final int T72=72;
-    public static final int ACTION=30;
-    public static final int T71=71;
-    public static final int T70=70;
-    public static final int T63=63;
-    public static final int T64=64;
-    public static final int RIGHT_PAREN=36;
-    public static final int T65=65;
-    public static final int IMPORT=5;
-    public static final int T66=66;
-    public static final int EOL=53;
-    public static final int T67=67;
-    public static final int THEN=52;
-    public static final int T68=68;
-    public static final int T69=69;
-    public static final int MATCHES=38;
-    public static final int ENABLED=17;
-    public static final int EXISTS=48;
-    public static final int RULE=11;
-    public static final int EXCLUDES=39;
-    public static final int AUTO_FOCUS=22;
-    public static final int NULL=41;
-    public static final int BOOL=18;
-    public static final int FORALL=51;
-    public static final int SALIENCE=19;
-    public static final int RULEFLOW_GROUP=24;
-    public static final int RESULT=31;
-    public static final int INT=20;
-    public static final int Tokens=79;
-    public static final int MULTI_LINE_COMMENT=61;
-    public static final int DURATION=26;
-    public static final int WS=54;
-    public static final int TEMPLATE=10;
-    public static final int EVAL=50;
-    public static final int WHEN=12;
-    public static final int UnicodeEscape=57;
-    public static final int LEFT_CURLY=42;
-    public static final int OR=34;
-    public static final int LEFT_PAREN=35;
-    public static final int QUERY=8;
-    public static final int GLOBAL=7;
-    public static final int END=9;
-    public static final int FROM=47;
-    public static final int MISC=62;
-    public static final int COLLECT=32;
-    public static final int INIT=29;
-    public static final int LEFT_SQUARE=44;
-    public static final int EscapeSequence=55;
-    public static final int OctalEscape=58;
-    public static final int C_STYLE_SINGLE_LINE_COMMENT=60;
-    public static final int STRING=15;
-    public static final int DATE_EXPIRES=16;
-    public DRLLexer() {;} 
-    public DRLLexer(CharStream input) {
-        super(input);
-        ruleMemo = new HashMap[77+1];
-     }
-    public String getGrammarFileName() { return "C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g"; }
+    public static final int T75                          = 75;
+    public static final int PACKAGE                      = 4;
+    public static final int FUNCTION                     = 6;
+    public static final int ACCUMULATE                   = 28;
+    public static final int T76                          = 76;
+    public static final int RIGHT_SQUARE                 = 45;
+    public static final int T73                          = 73;
+    public static final int T74                          = 74;
+    public static final int ACTIVATION_GROUP             = 23;
+    public static final int T77                          = 77;
+    public static final int RIGHT_CURLY                  = 43;
+    public static final int ATTRIBUTES                   = 13;
+    public static final int T78                          = 78;
+    public static final int CONTAINS                     = 37;
+    public static final int NO_LOOP                      = 21;
+    public static final int LOCK_ON_ACTIVE               = 27;
+    public static final int AGENDA_GROUP                 = 25;
+    public static final int FLOAT                        = 40;
+    public static final int NOT                          = 49;
+    public static final int SH_STYLE_SINGLE_LINE_COMMENT = 59;
+    public static final int ID                           = 33;
+    public static final int AND                          = 46;
+    public static final int EOF                          = -1;
+    public static final int HexDigit                     = 56;
+    public static final int DATE_EFFECTIVE               = 14;
+    public static final int T72                          = 72;
+    public static final int ACTION                       = 30;
+    public static final int T71                          = 71;
+    public static final int T70                          = 70;
+    public static final int T63                          = 63;
+    public static final int T64                          = 64;
+    public static final int RIGHT_PAREN                  = 36;
+    public static final int T65                          = 65;
+    public static final int IMPORT                       = 5;
+    public static final int T66                          = 66;
+    public static final int EOL                          = 53;
+    public static final int T67                          = 67;
+    public static final int THEN                         = 52;
+    public static final int T68                          = 68;
+    public static final int T69                          = 69;
+    public static final int MATCHES                      = 38;
+    public static final int ENABLED                      = 17;
+    public static final int EXISTS                       = 48;
+    public static final int RULE                         = 11;
+    public static final int EXCLUDES                     = 39;
+    public static final int AUTO_FOCUS                   = 22;
+    public static final int NULL                         = 41;
+    public static final int BOOL                         = 18;
+    public static final int FORALL                       = 51;
+    public static final int SALIENCE                     = 19;
+    public static final int RULEFLOW_GROUP               = 24;
+    public static final int RESULT                       = 31;
+    public static final int INT                          = 20;
+    public static final int Tokens                       = 79;
+    public static final int MULTI_LINE_COMMENT           = 61;
+    public static final int DURATION                     = 26;
+    public static final int WS                           = 54;
+    public static final int TEMPLATE                     = 10;
+    public static final int EVAL                         = 50;
+    public static final int WHEN                         = 12;
+    public static final int UnicodeEscape                = 57;
+    public static final int LEFT_CURLY                   = 42;
+    public static final int OR                           = 34;
+    public static final int LEFT_PAREN                   = 35;
+    public static final int QUERY                        = 8;
+    public static final int GLOBAL                       = 7;
+    public static final int END                          = 9;
+    public static final int FROM                         = 47;
+    public static final int MISC                         = 62;
+    public static final int COLLECT                      = 32;
+    public static final int INIT                         = 29;
+    public static final int LEFT_SQUARE                  = 44;
+    public static final int EscapeSequence               = 55;
+    public static final int OctalEscape                  = 58;
+    public static final int C_STYLE_SINGLE_LINE_COMMENT  = 60;
+    public static final int STRING                       = 15;
+    public static final int DATE_EXPIRES                 = 16;
 
+    public DRLLexer() {
+        ;
+    }
+
+    public DRLLexer(final CharStream input) {
+        super( input );
+        this.ruleMemo = new HashMap[77 + 1];
+    }
+
+    public String getGrammarFileName() {
+        return "C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g";
+    }
+
     // $ANTLR start T63
     public void mT63() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T63;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T63;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:6:7: ( ';' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:6:7: ';'
             {
-            match(';'); if (failed) return ;
+                match( ';' );
+                if ( this.failed ) {
+                    return;
+                }
 
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T63
 
     // $ANTLR start T64
     public void mT64() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T64;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T64;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:7:7: ( '.' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:7:7: '.'
             {
-            match('.'); if (failed) return ;
+                match( '.' );
+                if ( this.failed ) {
+                    return;
+                }
 
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T64
 
     // $ANTLR start T65
     public void mT65() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T65;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T65;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:8:7: ( '.*' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:8:7: '.*'
             {
-            match(".*"); if (failed) return ;
+                match( ".*" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T65
 
     // $ANTLR start T66
     public void mT66() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T66;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T66;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:9:7: ( ',' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:9:7: ','
             {
-            match(','); if (failed) return ;
+                match( ',' );
+                if ( this.failed ) {
+                    return;
+                }
 
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T66
 
     // $ANTLR start T67
     public void mT67() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T67;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T67;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:10:7: ( ':' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:10:7: ':'
             {
-            match(':'); if (failed) return ;
+                match( ':' );
+                if ( this.failed ) {
+                    return;
+                }
 
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T67
 
     // $ANTLR start T68
     public void mT68() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T68;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T68;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:11:7: ( '||' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:11:7: '||'
             {
-            match("||"); if (failed) return ;
+                match( "||" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T68
 
     // $ANTLR start T69
     public void mT69() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T69;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T69;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:12:7: ( '&' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:12:7: '&'
             {
-            match('&'); if (failed) return ;
+                match( '&' );
+                if ( this.failed ) {
+                    return;
+                }
 
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T69
 
     // $ANTLR start T70
     public void mT70() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T70;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T70;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:13:7: ( '|' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:13:7: '|'
             {
-            match('|'); if (failed) return ;
+                match( '|' );
+                if ( this.failed ) {
+                    return;
+                }
 
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T70
 
     // $ANTLR start T71
     public void mT71() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T71;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T71;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:14:7: ( '->' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:14:7: '->'
             {
-            match("->"); if (failed) return ;
+                match( "->" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T71
 
     // $ANTLR start T72
     public void mT72() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T72;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T72;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:15:7: ( '==' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:15:7: '=='
             {
-            match("=="); if (failed) return ;
+                match( "==" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T72
 
     // $ANTLR start T73
     public void mT73() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T73;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T73;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:16:7: ( '>' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:16:7: '>'
             {
-            match('>'); if (failed) return ;
+                match( '>' );
+                if ( this.failed ) {
+                    return;
+                }
 
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T73
 
     // $ANTLR start T74
     public void mT74() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T74;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T74;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:17:7: ( '>=' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:17:7: '>='
             {
-            match(">="); if (failed) return ;
+                match( ">=" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T74
 
     // $ANTLR start T75
     public void mT75() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T75;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T75;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:18:7: ( '<' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:18:7: '<'
             {
-            match('<'); if (failed) return ;
+                match( '<' );
+                if ( this.failed ) {
+                    return;
+                }
 
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T75
 
     // $ANTLR start T76
     public void mT76() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T76;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T76;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:19:7: ( '<=' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:19:7: '<='
             {
-            match("<="); if (failed) return ;
+                match( "<=" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T76
 
     // $ANTLR start T77
     public void mT77() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T77;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T77;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:20:7: ( '!=' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:20:7: '!='
             {
-            match("!="); if (failed) return ;
+                match( "!=" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T77
 
     // $ANTLR start T78
     public void mT78() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T78;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T78;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:21:7: ( '&&' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:21:7: '&&'
             {
-            match("&&"); if (failed) return ;
+                match( "&&" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end T78
 
     // $ANTLR start WS
     public void mWS() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = WS;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
+            this.ruleNestingLevel++;
+            final int _type = WS;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
             int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1465:17: ( ( ' ' | '\\t' | '\\f' | EOL ) )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1465:17: ( ' ' | '\\t' | '\\f' | EOL )
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1465:17: ( ' ' | '\\t' | '\\f' | EOL )
-            int alt1=4;
-            switch ( input.LA(1) ) {
-            case ' ':
-                alt1=1;
-                break;
-            case '\t':
-                alt1=2;
-                break;
-            case '\f':
-                alt1=3;
-                break;
-            case '\n':
-            case '\r':
-                alt1=4;
-                break;
-            default:
-                if (backtracking>0) {failed=true; return ;}
-                NoViableAltException nvae =
-                    new NoViableAltException("1465:17: ( ' ' | '\\t' | '\\f' | EOL )", 1, 0, input);
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1465:17: ( ' ' | '\\t' | '\\f' | EOL )
+                int alt1 = 4;
+                switch ( this.input.LA( 1 ) ) {
+                    case ' ' :
+                        alt1 = 1;
+                        break;
+                    case '\t' :
+                        alt1 = 2;
+                        break;
+                    case '\f' :
+                        alt1 = 3;
+                        break;
+                    case '\n' :
+                    case '\r' :
+                        alt1 = 4;
+                        break;
+                    default :
+                        if ( this.backtracking > 0 ) {
+                            this.failed = true;
+                            return;
+                        }
+                        final NoViableAltException nvae = new NoViableAltException( "1465:17: ( ' ' | '\\t' | '\\f' | EOL )",
+                                                                              1,
+                                                                              0,
+                                                                              this.input );
 
-                throw nvae;
-            }
+                        throw nvae;
+                }
 
-            switch (alt1) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1465:19: ' '
+                switch ( alt1 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1465:19: ' '
                     {
-                    match(' '); if (failed) return ;
+                        match( ' ' );
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
-                case 2 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1466:19: '\\t'
+                        break;
+                    case 2 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1466:19: '\\t'
                     {
-                    match('\t'); if (failed) return ;
+                        match( '\t' );
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
-                case 3 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1467:19: '\\f'
+                        break;
+                    case 3 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1467:19: '\\f'
                     {
-                    match('\f'); if (failed) return ;
+                        match( '\f' );
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
-                case 4 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1468:19: EOL
+                        break;
+                    case 4 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1468:19: EOL
                     {
-                    mEOL(); if (failed) return ;
+                        mEOL();
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-            if ( backtracking==0 ) {
-               _channel=HIDDEN; 
-            }
+                if ( this.backtracking == 0 ) {
+                    _channel = HIDDEN;
+                }
 
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end WS
 
     // $ANTLR start EOL
     public void mEOL() throws RecognitionException {
         try {
-            ruleNestingLevel++;
+            this.ruleNestingLevel++;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1475:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1475:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1475:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
-            int alt2=3;
-            int LA2_0 = input.LA(1);
-            if ( (LA2_0=='\r') ) {
-                int LA2_1 = input.LA(2);
-                if ( (LA2_1=='\n') ) {
-                    alt2=1;
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1475:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+                int alt2 = 3;
+                final int LA2_0 = this.input.LA( 1 );
+                if ( (LA2_0 == '\r') ) {
+                    final int LA2_1 = this.input.LA( 2 );
+                    if ( (LA2_1 == '\n') ) {
+                        alt2 = 1;
+                    } else {
+                        alt2 = 2;
+                    }
+                } else if ( (LA2_0 == '\n') ) {
+                    alt2 = 3;
+                } else {
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return;
+                    }
+                    final NoViableAltException nvae = new NoViableAltException( "1475:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )",
+                                                                          2,
+                                                                          0,
+                                                                          this.input );
+
+                    throw nvae;
                 }
-                else {
-                    alt2=2;}
-            }
-            else if ( (LA2_0=='\n') ) {
-                alt2=3;
-            }
-            else {
-                if (backtracking>0) {failed=true; return ;}
-                NoViableAltException nvae =
-                    new NoViableAltException("1475:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
-
-                throw nvae;
-            }
-            switch (alt2) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1475:14: ( '\\r\\n' )=> '\\r\\n'
+                switch ( alt2 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1475:14: ( '\\r\\n' )=> '\\r\\n'
                     {
-                    match("\r\n"); if (failed) return ;
+                        match( "\r\n" );
+                        if ( this.failed ) {
+                            return;
+                        }
 
-
                     }
-                    break;
-                case 2 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1476:25: '\\r'
+                        break;
+                    case 2 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1476:25: '\\r'
                     {
-                    match('\r'); if (failed) return ;
+                        match( '\r' );
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
-                case 3 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1477:25: '\\n'
+                        break;
+                    case 3 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1477:25: '\\n'
                     {
-                    match('\n'); if (failed) return ;
+                        match( '\n' );
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end EOL
 
     // $ANTLR start INT
     public void mINT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = INT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = INT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1482:4: ( ( '-' )? ( '0' .. '9' )+ )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1482:4: ( '-' )? ( '0' .. '9' )+
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1482:4: ( '-' )?
-            int alt3=2;
-            int LA3_0 = input.LA(1);
-            if ( (LA3_0=='-') ) {
-                alt3=1;
-            }
-            switch (alt3) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1482:5: '-'
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1482:4: ( '-' )?
+                int alt3 = 2;
+                final int LA3_0 = this.input.LA( 1 );
+                if ( (LA3_0 == '-') ) {
+                    alt3 = 1;
+                }
+                switch ( alt3 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1482:5: '-'
                     {
-                    match('-'); if (failed) return ;
+                        match( '-' );
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
-
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1482:10: ( '0' .. '9' )+
-            int cnt4=0;
-            loop4:
-            do {
-                int alt4=2;
-                int LA4_0 = input.LA(1);
-                if ( ((LA4_0>='0' && LA4_0<='9')) ) {
-                    alt4=1;
                 }
 
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1482:10: ( '0' .. '9' )+
+                int cnt4 = 0;
+                loop4 : do {
+                    int alt4 = 2;
+                    final int LA4_0 = this.input.LA( 1 );
+                    if ( ((LA4_0 >= '0' && LA4_0 <= '9')) ) {
+                        alt4 = 1;
+                    }
 
-                switch (alt4) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1482:11: '0' .. '9'
-            	    {
-            	    matchRange('0','9'); if (failed) return ;
+                    switch ( alt4 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1482:11: '0' .. '9'
+                        {
+                            matchRange( '0',
+                                        '9' );
+                            if ( this.failed ) {
+                                return;
+                            }
 
-            	    }
-            	    break;
+                        }
+                            break;
 
-            	default :
-            	    if ( cnt4 >= 1 ) break loop4;
-            	    if (backtracking>0) {failed=true; return ;}
-                        EarlyExitException eee =
-                            new EarlyExitException(4, input);
-                        throw eee;
-                }
-                cnt4++;
-            } while (true);
+                        default :
+                            if ( cnt4 >= 1 ) {
+                                break loop4;
+                            }
+                            if ( this.backtracking > 0 ) {
+                                this.failed = true;
+                                return;
+                            }
+                            final EarlyExitException eee = new EarlyExitException( 4,
+                                                                             this.input );
+                            throw eee;
+                    }
+                    cnt4++;
+                } while ( true );
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end INT
 
     // $ANTLR start FLOAT
     public void mFLOAT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = FLOAT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = FLOAT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1486:4: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1486:4: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1486:4: ( '-' )?
-            int alt5=2;
-            int LA5_0 = input.LA(1);
-            if ( (LA5_0=='-') ) {
-                alt5=1;
-            }
-            switch (alt5) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1486:5: '-'
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1486:4: ( '-' )?
+                int alt5 = 2;
+                final int LA5_0 = this.input.LA( 1 );
+                if ( (LA5_0 == '-') ) {
+                    alt5 = 1;
+                }
+                switch ( alt5 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1486:5: '-'
                     {
-                    match('-'); if (failed) return ;
+                        match( '-' );
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
-
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1486:10: ( '0' .. '9' )+
-            int cnt6=0;
-            loop6:
-            do {
-                int alt6=2;
-                int LA6_0 = input.LA(1);
-                if ( ((LA6_0>='0' && LA6_0<='9')) ) {
-                    alt6=1;
                 }
 
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1486:10: ( '0' .. '9' )+
+                int cnt6 = 0;
+                loop6 : do {
+                    int alt6 = 2;
+                    final int LA6_0 = this.input.LA( 1 );
+                    if ( ((LA6_0 >= '0' && LA6_0 <= '9')) ) {
+                        alt6 = 1;
+                    }
 
-                switch (alt6) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1486:11: '0' .. '9'
-            	    {
-            	    matchRange('0','9'); if (failed) return ;
+                    switch ( alt6 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1486:11: '0' .. '9'
+                        {
+                            matchRange( '0',
+                                        '9' );
+                            if ( this.failed ) {
+                                return;
+                            }
 
-            	    }
-            	    break;
+                        }
+                            break;
 
-            	default :
-            	    if ( cnt6 >= 1 ) break loop6;
-            	    if (backtracking>0) {failed=true; return ;}
-                        EarlyExitException eee =
-                            new EarlyExitException(6, input);
-                        throw eee;
-                }
-                cnt6++;
-            } while (true);
+                        default :
+                            if ( cnt6 >= 1 ) {
+                                break loop6;
+                            }
+                            if ( this.backtracking > 0 ) {
+                                this.failed = true;
+                                return;
+                            }
+                            final EarlyExitException eee = new EarlyExitException( 6,
+                                                                             this.input );
+                            throw eee;
+                    }
+                    cnt6++;
+                } while ( true );
 
-            match('.'); if (failed) return ;
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1486:26: ( '0' .. '9' )+
-            int cnt7=0;
-            loop7:
-            do {
-                int alt7=2;
-                int LA7_0 = input.LA(1);
-                if ( ((LA7_0>='0' && LA7_0<='9')) ) {
-                    alt7=1;
+                match( '.' );
+                if ( this.failed ) {
+                    return;
                 }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1486:26: ( '0' .. '9' )+
+                int cnt7 = 0;
+                loop7 : do {
+                    int alt7 = 2;
+                    final int LA7_0 = this.input.LA( 1 );
+                    if ( ((LA7_0 >= '0' && LA7_0 <= '9')) ) {
+                        alt7 = 1;
+                    }
 
+                    switch ( alt7 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1486:27: '0' .. '9'
+                        {
+                            matchRange( '0',
+                                        '9' );
+                            if ( this.failed ) {
+                                return;
+                            }
 
-                switch (alt7) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1486:27: '0' .. '9'
-            	    {
-            	    matchRange('0','9'); if (failed) return ;
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            if ( cnt7 >= 1 ) {
+                                break loop7;
+                            }
+                            if ( this.backtracking > 0 ) {
+                                this.failed = true;
+                                return;
+                            }
+                            final EarlyExitException eee = new EarlyExitException( 7,
+                                                                             this.input );
+                            throw eee;
+                    }
+                    cnt7++;
+                } while ( true );
 
-            	default :
-            	    if ( cnt7 >= 1 ) break loop7;
-            	    if (backtracking>0) {failed=true; return ;}
-                        EarlyExitException eee =
-                            new EarlyExitException(7, input);
-                        throw eee;
-                }
-                cnt7++;
-            } while (true);
-
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end FLOAT
 
     // $ANTLR start STRING
     public void mSTRING() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = STRING;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = STRING;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1490:8: ( ( '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"' ) | ( '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\'' ) )
-            int alt10=2;
-            int LA10_0 = input.LA(1);
-            if ( (LA10_0=='\"') ) {
-                alt10=1;
-            }
-            else if ( (LA10_0=='\'') ) {
-                alt10=2;
-            }
-            else {
-                if (backtracking>0) {failed=true; return ;}
-                NoViableAltException nvae =
-                    new NoViableAltException("1489:1: STRING : ( ( '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"' ) | ( '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\'' ) );", 10, 0, input);
+            int alt10 = 2;
+            final int LA10_0 = this.input.LA( 1 );
+            if ( (LA10_0 == '\"') ) {
+                alt10 = 1;
+            } else if ( (LA10_0 == '\'') ) {
+                alt10 = 2;
+            } else {
+                if ( this.backtracking > 0 ) {
+                    this.failed = true;
+                    return;
+                }
+                final NoViableAltException nvae = new NoViableAltException( "1489:1: STRING : ( ( '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"' ) | ( '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\'' ) );",
+                                                                      10,
+                                                                      0,
+                                                                      this.input );
 
                 throw nvae;
             }
-            switch (alt10) {
+            switch ( alt10 ) {
                 case 1 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1490:8: ( '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"' )
-                    {
+                {
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1490:8: ( '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"' )
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1490:9: '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"'
                     {
-                    match('\"'); if (failed) return ;
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1490:13: ( EscapeSequence | ~ ('\\\\'|'\"'))*
-                    loop8:
-                    do {
-                        int alt8=3;
-                        int LA8_0 = input.LA(1);
-                        if ( (LA8_0=='\\') ) {
-                            alt8=1;
+                        match( '\"' );
+                        if ( this.failed ) {
+                            return;
                         }
-                        else if ( ((LA8_0>='\u0000' && LA8_0<='!')||(LA8_0>='#' && LA8_0<='[')||(LA8_0>=']' && LA8_0<='\uFFFE')) ) {
-                            alt8=2;
-                        }
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1490:13: ( EscapeSequence | ~ ('\\\\'|'\"'))*
+                        loop8 : do {
+                            int alt8 = 3;
+                            final int LA8_0 = this.input.LA( 1 );
+                            if ( (LA8_0 == '\\') ) {
+                                alt8 = 1;
+                            } else if ( ((LA8_0 >= '\u0000' && LA8_0 <= '!') || (LA8_0 >= '#' && LA8_0 <= '[') || (LA8_0 >= ']' && LA8_0 <= '\uFFFE')) ) {
+                                alt8 = 2;
+                            }
 
+                            switch ( alt8 ) {
+                                case 1 :
+                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1490:15: EscapeSequence
+                                {
+                                    mEscapeSequence();
+                                    if ( this.failed ) {
+                                        return;
+                                    }
 
-                        switch (alt8) {
-                    	case 1 :
-                    	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1490:15: EscapeSequence
-                    	    {
-                    	    mEscapeSequence(); if (failed) return ;
+                                }
+                                    break;
+                                case 2 :
+                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1490:32: ~ ('\\\\'|'\"')
+                                {
+                                    if ( (this.input.LA( 1 ) >= '\u0000' && this.input.LA( 1 ) <= '!') || (this.input.LA( 1 ) >= '#' && this.input.LA( 1 ) <= '[') || (this.input.LA( 1 ) >= ']' && this.input.LA( 1 ) <= '\uFFFE') ) {
+                                        this.input.consume();
+                                        this.failed = false;
+                                    } else {
+                                        if ( this.backtracking > 0 ) {
+                                            this.failed = true;
+                                            return;
+                                        }
+                                        final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                                 this.input );
+                                        recover( mse );
+                                        throw mse;
+                                    }
 
-                    	    }
-                    	    break;
-                    	case 2 :
-                    	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1490:32: ~ ('\\\\'|'\"')
-                    	    {
-                    	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
-                    	        input.consume();
-                    	    failed=false;
-                    	    }
-                    	    else {
-                    	        if (backtracking>0) {failed=true; return ;}
-                    	        MismatchedSetException mse =
-                    	            new MismatchedSetException(null,input);
-                    	        recover(mse);    throw mse;
-                    	    }
+                                }
+                                    break;
 
+                                default :
+                                    break loop8;
+                            }
+                        } while ( true );
 
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop8;
+                        match( '\"' );
+                        if ( this.failed ) {
+                            return;
                         }
-                    } while (true);
 
-                    match('\"'); if (failed) return ;
-
                     }
 
-
-                    }
+                }
                     break;
                 case 2 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1491:8: ( '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\'' )
-                    {
+                {
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1491:8: ( '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\'' )
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1491:9: '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\''
                     {
-                    match('\''); if (failed) return ;
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1491:14: ( EscapeSequence | ~ ('\\\\'|'\\''))*
-                    loop9:
-                    do {
-                        int alt9=3;
-                        int LA9_0 = input.LA(1);
-                        if ( (LA9_0=='\\') ) {
-                            alt9=1;
+                        match( '\'' );
+                        if ( this.failed ) {
+                            return;
                         }
-                        else if ( ((LA9_0>='\u0000' && LA9_0<='&')||(LA9_0>='(' && LA9_0<='[')||(LA9_0>=']' && LA9_0<='\uFFFE')) ) {
-                            alt9=2;
-                        }
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1491:14: ( EscapeSequence | ~ ('\\\\'|'\\''))*
+                        loop9 : do {
+                            int alt9 = 3;
+                            final int LA9_0 = this.input.LA( 1 );
+                            if ( (LA9_0 == '\\') ) {
+                                alt9 = 1;
+                            } else if ( ((LA9_0 >= '\u0000' && LA9_0 <= '&') || (LA9_0 >= '(' && LA9_0 <= '[') || (LA9_0 >= ']' && LA9_0 <= '\uFFFE')) ) {
+                                alt9 = 2;
+                            }
 
+                            switch ( alt9 ) {
+                                case 1 :
+                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1491:16: EscapeSequence
+                                {
+                                    mEscapeSequence();
+                                    if ( this.failed ) {
+                                        return;
+                                    }
 
-                        switch (alt9) {
-                    	case 1 :
-                    	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1491:16: EscapeSequence
-                    	    {
-                    	    mEscapeSequence(); if (failed) return ;
+                                }
+                                    break;
+                                case 2 :
+                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1491:33: ~ ('\\\\'|'\\'')
+                                {
+                                    if ( (this.input.LA( 1 ) >= '\u0000' && this.input.LA( 1 ) <= '&') || (this.input.LA( 1 ) >= '(' && this.input.LA( 1 ) <= '[') || (this.input.LA( 1 ) >= ']' && this.input.LA( 1 ) <= '\uFFFE') ) {
+                                        this.input.consume();
+                                        this.failed = false;
+                                    } else {
+                                        if ( this.backtracking > 0 ) {
+                                            this.failed = true;
+                                            return;
+                                        }
+                                        final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                                 this.input );
+                                        recover( mse );
+                                        throw mse;
+                                    }
 
-                    	    }
-                    	    break;
-                    	case 2 :
-                    	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1491:33: ~ ('\\\\'|'\\'')
-                    	    {
-                    	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
-                    	        input.consume();
-                    	    failed=false;
-                    	    }
-                    	    else {
-                    	        if (backtracking>0) {failed=true; return ;}
-                    	        MismatchedSetException mse =
-                    	            new MismatchedSetException(null,input);
-                    	        recover(mse);    throw mse;
-                    	    }
+                                }
+                                    break;
 
+                                default :
+                                    break loop9;
+                            }
+                        } while ( true );
 
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop9;
+                        match( '\'' );
+                        if ( this.failed ) {
+                            return;
                         }
-                    } while (true);
 
-                    match('\''); if (failed) return ;
-
                     }
 
-
-                    }
+                }
                     break;
 
             }
 
-            if ( backtracking==0 ) {
+            if ( this.backtracking == 0 ) {
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end STRING
 
     // $ANTLR start HexDigit
     public void mHexDigit() throws RecognitionException {
         try {
-            ruleNestingLevel++;
+            this.ruleNestingLevel++;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1495:12: ( ('0'..'9'|'a'..'f'|'A'..'F'))
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1495:12: ('0'..'9'|'a'..'f'|'A'..'F')
             {
-            if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f') ) {
-                input.consume();
-            failed=false;
-            }
-            else {
-                if (backtracking>0) {failed=true; return ;}
-                MismatchedSetException mse =
-                    new MismatchedSetException(null,input);
-                recover(mse);    throw mse;
-            }
+                if ( (this.input.LA( 1 ) >= '0' && this.input.LA( 1 ) <= '9') || (this.input.LA( 1 ) >= 'A' && this.input.LA( 1 ) <= 'F') || (this.input.LA( 1 ) >= 'a' && this.input.LA( 1 ) <= 'f') ) {
+                    this.input.consume();
+                    this.failed = false;
+                } else {
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return;
+                    }
+                    final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                             this.input );
+                    recover( mse );
+                    throw mse;
+                }
 
-
             }
 
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end HexDigit
 
     // $ANTLR start EscapeSequence
     public void mEscapeSequence() throws RecognitionException {
         try {
-            ruleNestingLevel++;
+            this.ruleNestingLevel++;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1499:9: ( '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\"'|'\\''|'\\\\'|'.') | UnicodeEscape | OctalEscape )
-            int alt11=3;
-            int LA11_0 = input.LA(1);
-            if ( (LA11_0=='\\') ) {
-                switch ( input.LA(2) ) {
-                case '\"':
-                case '\'':
-                case '.':
-                case '\\':
-                case 'b':
-                case 'f':
-                case 'n':
-                case 'r':
-                case 't':
-                    alt11=1;
-                    break;
-                case 'u':
-                    alt11=2;
-                    break;
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                    alt11=3;
-                    break;
-                default:
-                    if (backtracking>0) {failed=true; return ;}
-                    NoViableAltException nvae =
-                        new NoViableAltException("1497:1: fragment EscapeSequence : ( '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\"'|'\\''|'\\\\'|'.') | UnicodeEscape | OctalEscape );", 11, 1, input);
+            int alt11 = 3;
+            final int LA11_0 = this.input.LA( 1 );
+            if ( (LA11_0 == '\\') ) {
+                switch ( this.input.LA( 2 ) ) {
+                    case '\"' :
+                    case '\'' :
+                    case '.' :
+                    case '\\' :
+                    case 'b' :
+                    case 'f' :
+                    case 'n' :
+                    case 'r' :
+                    case 't' :
+                        alt11 = 1;
+                        break;
+                    case 'u' :
+                        alt11 = 2;
+                        break;
+                    case '0' :
+                    case '1' :
+                    case '2' :
+                    case '3' :
+                    case '4' :
+                    case '5' :
+                    case '6' :
+                    case '7' :
+                        alt11 = 3;
+                        break;
+                    default :
+                        if ( this.backtracking > 0 ) {
+                            this.failed = true;
+                            return;
+                        }
+                        final NoViableAltException nvae = new NoViableAltException( "1497:1: fragment EscapeSequence : ( '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\"'|'\\''|'\\\\'|'.') | UnicodeEscape | OctalEscape );",
+                                                                              11,
+                                                                              1,
+                                                                              this.input );
 
-                    throw nvae;
+                        throw nvae;
                 }
 
-            }
-            else {
-                if (backtracking>0) {failed=true; return ;}
-                NoViableAltException nvae =
-                    new NoViableAltException("1497:1: fragment EscapeSequence : ( '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\"'|'\\''|'\\\\'|'.') | UnicodeEscape | OctalEscape );", 11, 0, input);
+            } else {
+                if ( this.backtracking > 0 ) {
+                    this.failed = true;
+                    return;
+                }
+                final NoViableAltException nvae = new NoViableAltException( "1497:1: fragment EscapeSequence : ( '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\"'|'\\''|'\\\\'|'.') | UnicodeEscape | OctalEscape );",
+                                                                      11,
+                                                                      0,
+                                                                      this.input );
 
                 throw nvae;
             }
-            switch (alt11) {
+            switch ( alt11 ) {
                 case 1 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1499:9: '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\"'|'\\''|'\\\\'|'.')
-                    {
-                    match('\\'); if (failed) return ;
-                    if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='.'||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
-                        input.consume();
-                    failed=false;
+                {
+                    match( '\\' );
+                    if ( this.failed ) {
+                        return;
                     }
-                    else {
-                        if (backtracking>0) {failed=true; return ;}
-                        MismatchedSetException mse =
-                            new MismatchedSetException(null,input);
-                        recover(mse);    throw mse;
+                    if ( this.input.LA( 1 ) == '\"' || this.input.LA( 1 ) == '\'' || this.input.LA( 1 ) == '.' || this.input.LA( 1 ) == '\\' || this.input.LA( 1 ) == 'b' || this.input.LA( 1 ) == 'f' || this.input.LA( 1 ) == 'n' || this.input.LA( 1 ) == 'r' || this.input.LA( 1 ) == 't' ) {
+                        this.input.consume();
+                        this.failed = false;
+                    } else {
+                        if ( this.backtracking > 0 ) {
+                            this.failed = true;
+                            return;
+                        }
+                        final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                 this.input );
+                        recover( mse );
+                        throw mse;
                     }
 
-
-                    }
+                }
                     break;
                 case 2 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1500:9: UnicodeEscape
-                    {
-                    mUnicodeEscape(); if (failed) return ;
+                {
+                    mUnicodeEscape();
+                    if ( this.failed ) {
+                        return;
+                    }
 
-                    }
+                }
                     break;
                 case 3 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1501:9: OctalEscape
-                    {
-                    mOctalEscape(); if (failed) return ;
+                {
+                    mOctalEscape();
+                    if ( this.failed ) {
+                        return;
+                    }
 
-                    }
+                }
                     break;
 
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end EscapeSequence
 
     // $ANTLR start OctalEscape
     public void mOctalEscape() throws RecognitionException {
         try {
-            ruleNestingLevel++;
+            this.ruleNestingLevel++;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1506:9: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
-            int alt12=3;
-            int LA12_0 = input.LA(1);
-            if ( (LA12_0=='\\') ) {
-                int LA12_1 = input.LA(2);
-                if ( ((LA12_1>='0' && LA12_1<='3')) ) {
-                    int LA12_2 = input.LA(3);
-                    if ( ((LA12_2>='0' && LA12_2<='7')) ) {
-                        int LA12_4 = input.LA(4);
-                        if ( ((LA12_4>='0' && LA12_4<='7')) ) {
-                            alt12=1;
+            int alt12 = 3;
+            final int LA12_0 = this.input.LA( 1 );
+            if ( (LA12_0 == '\\') ) {
+                final int LA12_1 = this.input.LA( 2 );
+                if ( ((LA12_1 >= '0' && LA12_1 <= '3')) ) {
+                    final int LA12_2 = this.input.LA( 3 );
+                    if ( ((LA12_2 >= '0' && LA12_2 <= '7')) ) {
+                        final int LA12_4 = this.input.LA( 4 );
+                        if ( ((LA12_4 >= '0' && LA12_4 <= '7')) ) {
+                            alt12 = 1;
+                        } else {
+                            alt12 = 2;
                         }
-                        else {
-                            alt12=2;}
+                    } else {
+                        alt12 = 3;
                     }
-                    else {
-                        alt12=3;}
-                }
-                else if ( ((LA12_1>='4' && LA12_1<='7')) ) {
-                    int LA12_3 = input.LA(3);
-                    if ( ((LA12_3>='0' && LA12_3<='7')) ) {
-                        alt12=2;
+                } else if ( ((LA12_1 >= '4' && LA12_1 <= '7')) ) {
+                    final int LA12_3 = this.input.LA( 3 );
+                    if ( ((LA12_3 >= '0' && LA12_3 <= '7')) ) {
+                        alt12 = 2;
+                    } else {
+                        alt12 = 3;
                     }
-                    else {
-                        alt12=3;}
-                }
-                else {
-                    if (backtracking>0) {failed=true; return ;}
-                    NoViableAltException nvae =
-                        new NoViableAltException("1504:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
+                } else {
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return;
+                    }
+                    final NoViableAltException nvae = new NoViableAltException( "1504:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );",
+                                                                          12,
+                                                                          1,
+                                                                          this.input );
 
                     throw nvae;
                 }
-            }
-            else {
-                if (backtracking>0) {failed=true; return ;}
-                NoViableAltException nvae =
-                    new NoViableAltException("1504:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 0, input);
+            } else {
+                if ( this.backtracking > 0 ) {
+                    this.failed = true;
+                    return;
+                }
+                final NoViableAltException nvae = new NoViableAltException( "1504:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );",
+                                                                      12,
+                                                                      0,
+                                                                      this.input );
 
                 throw nvae;
             }
-            switch (alt12) {
+            switch ( alt12 ) {
                 case 1 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1506:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
-                    {
-                    match('\\'); if (failed) return ;
+                {
+                    match( '\\' );
+                    if ( this.failed ) {
+                        return;
+                    }
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1506:14: ( '0' .. '3' )
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1506:15: '0' .. '3'
                     {
-                    matchRange('0','3'); if (failed) return ;
+                        matchRange( '0',
+                                    '3' );
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
 
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1506:25: ( '0' .. '7' )
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1506:26: '0' .. '7'
                     {
-                    matchRange('0','7'); if (failed) return ;
+                        matchRange( '0',
+                                    '7' );
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
 
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1506:36: ( '0' .. '7' )
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1506:37: '0' .. '7'
                     {
-                    matchRange('0','7'); if (failed) return ;
+                        matchRange( '0',
+                                    '7' );
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
 
-
-                    }
+                }
                     break;
                 case 2 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1507:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
-                    {
-                    match('\\'); if (failed) return ;
+                {
+                    match( '\\' );
+                    if ( this.failed ) {
+                        return;
+                    }
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1507:14: ( '0' .. '7' )
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1507:15: '0' .. '7'
                     {
-                    matchRange('0','7'); if (failed) return ;
+                        matchRange( '0',
+                                    '7' );
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
 
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1507:25: ( '0' .. '7' )
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1507:26: '0' .. '7'
                     {
-                    matchRange('0','7'); if (failed) return ;
+                        matchRange( '0',
+                                    '7' );
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
 
-
-                    }
+                }
                     break;
                 case 3 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1508:9: '\\\\' ( '0' .. '7' )
-                    {
-                    match('\\'); if (failed) return ;
+                {
+                    match( '\\' );
+                    if ( this.failed ) {
+                        return;
+                    }
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1508:14: ( '0' .. '7' )
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1508:15: '0' .. '7'
                     {
-                    matchRange('0','7'); if (failed) return ;
+                        matchRange( '0',
+                                    '7' );
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
 
-
-                    }
+                }
                     break;
 
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end OctalEscape
 
     // $ANTLR start UnicodeEscape
     public void mUnicodeEscape() throws RecognitionException {
         try {
-            ruleNestingLevel++;
+            this.ruleNestingLevel++;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1513:9: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1513:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
             {
-            match('\\'); if (failed) return ;
-            match('u'); if (failed) return ;
-            mHexDigit(); if (failed) return ;
-            mHexDigit(); if (failed) return ;
-            mHexDigit(); if (failed) return ;
-            mHexDigit(); if (failed) return ;
+                match( '\\' );
+                if ( this.failed ) {
+                    return;
+                }
+                match( 'u' );
+                if ( this.failed ) {
+                    return;
+                }
+                mHexDigit();
+                if ( this.failed ) {
+                    return;
+                }
+                mHexDigit();
+                if ( this.failed ) {
+                    return;
+                }
+                mHexDigit();
+                if ( this.failed ) {
+                    return;
+                }
+                mHexDigit();
+                if ( this.failed ) {
+                    return;
+                }
 
             }
 
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end UnicodeEscape
 
     // $ANTLR start BOOL
     public void mBOOL() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = BOOL;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = BOOL;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1517:4: ( ( 'true' | 'false' ) )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1517:4: ( 'true' | 'false' )
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1517:4: ( 'true' | 'false' )
-            int alt13=2;
-            int LA13_0 = input.LA(1);
-            if ( (LA13_0=='t') ) {
-                alt13=1;
-            }
-            else if ( (LA13_0=='f') ) {
-                alt13=2;
-            }
-            else {
-                if (backtracking>0) {failed=true; return ;}
-                NoViableAltException nvae =
-                    new NoViableAltException("1517:4: ( 'true' | 'false' )", 13, 0, input);
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1517:4: ( 'true' | 'false' )
+                int alt13 = 2;
+                final int LA13_0 = this.input.LA( 1 );
+                if ( (LA13_0 == 't') ) {
+                    alt13 = 1;
+                } else if ( (LA13_0 == 'f') ) {
+                    alt13 = 2;
+                } else {
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return;
+                    }
+                    final NoViableAltException nvae = new NoViableAltException( "1517:4: ( 'true' | 'false' )",
+                                                                          13,
+                                                                          0,
+                                                                          this.input );
 
-                throw nvae;
-            }
-            switch (alt13) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1517:5: 'true'
+                    throw nvae;
+                }
+                switch ( alt13 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1517:5: 'true'
                     {
-                    match("true"); if (failed) return ;
+                        match( "true" );
+                        if ( this.failed ) {
+                            return;
+                        }
 
-
                     }
-                    break;
-                case 2 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1517:12: 'false'
+                        break;
+                    case 2 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1517:12: 'false'
                     {
-                    match("false"); if (failed) return ;
+                        match( "false" );
+                        if ( this.failed ) {
+                            return;
+                        }
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end BOOL
 
     // $ANTLR start PACKAGE
     public void mPACKAGE() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = PACKAGE;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = PACKAGE;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1520:11: ( 'package' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1520:11: 'package'
             {
-            match("package"); if (failed) return ;
+                match( "package" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end PACKAGE
 
     // $ANTLR start IMPORT
     public void mIMPORT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = IMPORT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = IMPORT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1522:10: ( 'import' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1522:10: 'import'
             {
-            match("import"); if (failed) return ;
+                match( "import" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end IMPORT
 
     // $ANTLR start FUNCTION
     public void mFUNCTION() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = FUNCTION;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = FUNCTION;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1524:12: ( 'function' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1524:12: 'function'
             {
-            match("function"); if (failed) return ;
+                match( "function" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end FUNCTION
 
     // $ANTLR start GLOBAL
     public void mGLOBAL() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = GLOBAL;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = GLOBAL;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1526:10: ( 'global' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1526:10: 'global'
             {
-            match("global"); if (failed) return ;
+                match( "global" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end GLOBAL
 
     // $ANTLR start RULE
     public void mRULE() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = RULE;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = RULE;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1528:11: ( 'rule' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1528:11: 'rule'
             {
-            match("rule"); if (failed) return ;
+                match( "rule" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end RULE
 
     // $ANTLR start QUERY
     public void mQUERY() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = QUERY;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = QUERY;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1530:9: ( 'query' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1530:9: 'query'
             {
-            match("query"); if (failed) return ;
+                match( "query" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end QUERY
 
     // $ANTLR start TEMPLATE
     public void mTEMPLATE() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = TEMPLATE;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = TEMPLATE;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1532:12: ( 'template' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1532:12: 'template'
             {
-            match("template"); if (failed) return ;
+                match( "template" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end TEMPLATE
 
     // $ANTLR start ATTRIBUTES
     public void mATTRIBUTES() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = ATTRIBUTES;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = ATTRIBUTES;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1534:14: ( 'attributes' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1534:14: 'attributes'
             {
-            match("attributes"); if (failed) return ;
+                match( "attributes" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end ATTRIBUTES
 
     // $ANTLR start DATE_EFFECTIVE
     public void mDATE_EFFECTIVE() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = DATE_EFFECTIVE;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = DATE_EFFECTIVE;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1537:4: ( 'date-effective' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1537:4: 'date-effective'
             {
-            match("date-effective"); if (failed) return ;
+                match( "date-effective" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end DATE_EFFECTIVE
 
     // $ANTLR start DATE_EXPIRES
     public void mDATE_EXPIRES() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = DATE_EXPIRES;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = DATE_EXPIRES;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1540:4: ( 'date-expires' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1540:4: 'date-expires'
             {
-            match("date-expires"); if (failed) return ;
+                match( "date-expires" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end DATE_EXPIRES
 
     // $ANTLR start ENABLED
     public void mENABLED() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = ENABLED;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = ENABLED;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1542:11: ( 'enabled' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1542:11: 'enabled'
             {
-            match("enabled"); if (failed) return ;
+                match( "enabled" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end ENABLED
 
     // $ANTLR start SALIENCE
     public void mSALIENCE() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = SALIENCE;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = SALIENCE;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1545:4: ( 'salience' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1545:4: 'salience'
             {
-            match("salience"); if (failed) return ;
+                match( "salience" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end SALIENCE
 
     // $ANTLR start NO_LOOP
     public void mNO_LOOP() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = NO_LOOP;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = NO_LOOP;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1547:11: ( 'no-loop' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1547:11: 'no-loop'
             {
-            match("no-loop"); if (failed) return ;
+                match( "no-loop" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end NO_LOOP
 
     // $ANTLR start AUTO_FOCUS
     public void mAUTO_FOCUS() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = AUTO_FOCUS;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = AUTO_FOCUS;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1550:4: ( 'auto-focus' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1550:4: 'auto-focus'
             {
-            match("auto-focus"); if (failed) return ;
+                match( "auto-focus" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end AUTO_FOCUS
 
     // $ANTLR start ACTIVATION_GROUP
     public void mACTIVATION_GROUP() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = ACTIVATION_GROUP;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = ACTIVATION_GROUP;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1553:4: ( 'activation-group' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1553:4: 'activation-group'
             {
-            match("activation-group"); if (failed) return ;
+                match( "activation-group" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end ACTIVATION_GROUP
 
     // $ANTLR start AGENDA_GROUP
     public void mAGENDA_GROUP() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = AGENDA_GROUP;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = AGENDA_GROUP;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1556:4: ( 'agenda-group' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1556:4: 'agenda-group'
             {
-            match("agenda-group"); if (failed) return ;
+                match( "agenda-group" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end AGENDA_GROUP
 
     // $ANTLR start RULEFLOW_GROUP
     public void mRULEFLOW_GROUP() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = RULEFLOW_GROUP;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = RULEFLOW_GROUP;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1559:4: ( 'ruleflow-group' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1559:4: 'ruleflow-group'
             {
-            match("ruleflow-group"); if (failed) return ;
+                match( "ruleflow-group" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end RULEFLOW_GROUP
 
     // $ANTLR start DURATION
     public void mDURATION() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = DURATION;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = DURATION;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1562:4: ( 'duration' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1562:4: 'duration'
             {
-            match("duration"); if (failed) return ;
+                match( "duration" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end DURATION
 
     // $ANTLR start LOCK_ON_ACTIVE
     public void mLOCK_ON_ACTIVE() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = LOCK_ON_ACTIVE;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = LOCK_ON_ACTIVE;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1565:4: ( 'lock-on-active' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1565:4: 'lock-on-active'
             {
-            match("lock-on-active"); if (failed) return ;
+                match( "lock-on-active" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end LOCK_ON_ACTIVE
 
     // $ANTLR start FROM
     public void mFROM() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = FROM;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = FROM;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1567:8: ( 'from' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1567:8: 'from'
             {
-            match("from"); if (failed) return ;
+                match( "from" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end FROM
 
     // $ANTLR start ACCUMULATE
     public void mACCUMULATE() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = ACCUMULATE;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = ACCUMULATE;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1570:4: ( 'accumulate' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1570:4: 'accumulate'
             {
-            match("accumulate"); if (failed) return ;
+                match( "accumulate" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end ACCUMULATE
 
     // $ANTLR start INIT
     public void mINIT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = INIT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = INIT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1572:8: ( 'init' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1572:8: 'init'
             {
-            match("init"); if (failed) return ;
+                match( "init" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end INIT
 
     // $ANTLR start ACTION
     public void mACTION() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = ACTION;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = ACTION;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1574:10: ( 'action' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1574:10: 'action'
             {
-            match("action"); if (failed) return ;
+                match( "action" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end ACTION
 
     // $ANTLR start RESULT
     public void mRESULT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = RESULT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = RESULT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1576:10: ( 'result' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1576:10: 'result'
             {
-            match("result"); if (failed) return ;
+                match( "result" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end RESULT
 
     // $ANTLR start COLLECT
     public void mCOLLECT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = COLLECT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = COLLECT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1578:11: ( 'collect' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1578:11: 'collect'
             {
-            match("collect"); if (failed) return ;
+                match( "collect" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end COLLECT
 
     // $ANTLR start OR
     public void mOR() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = OR;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = OR;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1580:6: ( 'or' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1580:6: 'or'
             {
-            match("or"); if (failed) return ;
+                match( "or" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end OR
 
     // $ANTLR start AND
     public void mAND() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = AND;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = AND;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1582:7: ( 'and' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1582:7: 'and'
             {
-            match("and"); if (failed) return ;
+                match( "and" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end AND
 
     // $ANTLR start CONTAINS
     public void mCONTAINS() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = CONTAINS;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = CONTAINS;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1585:4: ( 'contains' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1585:4: 'contains'
             {
-            match("contains"); if (failed) return ;
+                match( "contains" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end CONTAINS
 
     // $ANTLR start EXCLUDES
     public void mEXCLUDES() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = EXCLUDES;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = EXCLUDES;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1588:4: ( 'excludes' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1588:4: 'excludes'
             {
-            match("excludes"); if (failed) return ;
+                match( "excludes" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end EXCLUDES
 
     // $ANTLR start MATCHES
     public void mMATCHES() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = MATCHES;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = MATCHES;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1590:11: ( 'matches' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1590:11: 'matches'
             {
-            match("matches"); if (failed) return ;
+                match( "matches" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end MATCHES
 
     // $ANTLR start NULL
     public void mNULL() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = NULL;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = NULL;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1592:8: ( 'null' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1592:8: 'null'
             {
-            match("null"); if (failed) return ;
+                match( "null" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end NULL
 
     // $ANTLR start EXISTS
     public void mEXISTS() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = EXISTS;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = EXISTS;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1594:10: ( 'exists' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1594:10: 'exists'
             {
-            match("exists"); if (failed) return ;
+                match( "exists" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end EXISTS
 
     // $ANTLR start NOT
     public void mNOT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = NOT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = NOT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1596:7: ( 'not' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1596:7: 'not'
             {
-            match("not"); if (failed) return ;
+                match( "not" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end NOT
 
     // $ANTLR start EVAL
     public void mEVAL() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = EVAL;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = EVAL;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1598:8: ( 'eval' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1598:8: 'eval'
             {
-            match("eval"); if (failed) return ;
+                match( "eval" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end EVAL
 
     // $ANTLR start FORALL
     public void mFORALL() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = FORALL;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = FORALL;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1600:10: ( 'forall' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1600:10: 'forall'
             {
-            match("forall"); if (failed) return ;
+                match( "forall" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end FORALL
 
     // $ANTLR start WHEN
     public void mWHEN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = WHEN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = WHEN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1602:11: ( 'when' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1602:11: 'when'
             {
-            match("when"); if (failed) return ;
+                match( "when" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end WHEN
 
     // $ANTLR start THEN
     public void mTHEN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = THEN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = THEN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1604:12: ( 'then' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1604:12: 'then'
             {
-            match("then"); if (failed) return ;
+                match( "then" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end THEN
 
     // $ANTLR start END
     public void mEND() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = END;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = END;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1606:11: ( 'end' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1606:11: 'end'
             {
-            match("end"); if (failed) return ;
+                match( "end" );
+                if ( this.failed ) {
+                    return;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end END
 
     // $ANTLR start ID
     public void mID() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = ID;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = ID;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1609:4: ( ('a'..'z'|'A'..'Z'|'_'|'$'|'\\u00c0'..'\\u00ff') ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\\u00c0'..'\\u00ff'))* )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1609:4: ('a'..'z'|'A'..'Z'|'_'|'$'|'\\u00c0'..'\\u00ff') ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\\u00c0'..'\\u00ff'))*
             {
-            if ( input.LA(1)=='$'||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z')||(input.LA(1)>='\u00C0' && input.LA(1)<='\u00FF') ) {
-                input.consume();
-            failed=false;
-            }
-            else {
-                if (backtracking>0) {failed=true; return ;}
-                MismatchedSetException mse =
-                    new MismatchedSetException(null,input);
-                recover(mse);    throw mse;
-            }
-
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1609:50: ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\\u00c0'..'\\u00ff'))*
-            loop14:
-            do {
-                int alt14=2;
-                int LA14_0 = input.LA(1);
-                if ( ((LA14_0>='0' && LA14_0<='9')||(LA14_0>='A' && LA14_0<='Z')||LA14_0=='_'||(LA14_0>='a' && LA14_0<='z')||(LA14_0>='\u00C0' && LA14_0<='\u00FF')) ) {
-                    alt14=1;
+                if ( this.input.LA( 1 ) == '$' || (this.input.LA( 1 ) >= 'A' && this.input.LA( 1 ) <= 'Z') || this.input.LA( 1 ) == '_' || (this.input.LA( 1 ) >= 'a' && this.input.LA( 1 ) <= 'z') || (this.input.LA( 1 ) >= '\u00C0' && this.input.LA( 1 ) <= '\u00FF') ) {
+                    this.input.consume();
+                    this.failed = false;
+                } else {
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return;
+                    }
+                    final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                             this.input );
+                    recover( mse );
+                    throw mse;
                 }
 
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1609:50: ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\\u00c0'..'\\u00ff'))*
+                loop14 : do {
+                    int alt14 = 2;
+                    final int LA14_0 = this.input.LA( 1 );
+                    if ( ((LA14_0 >= '0' && LA14_0 <= '9') || (LA14_0 >= 'A' && LA14_0 <= 'Z') || LA14_0 == '_' || (LA14_0 >= 'a' && LA14_0 <= 'z') || (LA14_0 >= '\u00C0' && LA14_0 <= '\u00FF')) ) {
+                        alt14 = 1;
+                    }
 
-                switch (alt14) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1609:51: ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\\u00c0'..'\\u00ff')
-            	    {
-            	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z')||(input.LA(1)>='\u00C0' && input.LA(1)<='\u00FF') ) {
-            	        input.consume();
-            	    failed=false;
-            	    }
-            	    else {
-            	        if (backtracking>0) {failed=true; return ;}
-            	        MismatchedSetException mse =
-            	            new MismatchedSetException(null,input);
-            	        recover(mse);    throw mse;
-            	    }
+                    switch ( alt14 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1609:51: ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\\u00c0'..'\\u00ff')
+                        {
+                            if ( (this.input.LA( 1 ) >= '0' && this.input.LA( 1 ) <= '9') || (this.input.LA( 1 ) >= 'A' && this.input.LA( 1 ) <= 'Z') || this.input.LA( 1 ) == '_' || (this.input.LA( 1 ) >= 'a' && this.input.LA( 1 ) <= 'z')
+                                 || (this.input.LA( 1 ) >= '\u00C0' && this.input.LA( 1 ) <= '\u00FF') ) {
+                                this.input.consume();
+                                this.failed = false;
+                            } else {
+                                if ( this.backtracking > 0 ) {
+                                    this.failed = true;
+                                    return;
+                                }
+                                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                         this.input );
+                                recover( mse );
+                                throw mse;
+                            }
 
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            break loop14;
+                    }
+                } while ( true );
 
-            	default :
-            	    break loop14;
-                }
-            } while (true);
-
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end ID
 
     // $ANTLR start SH_STYLE_SINGLE_LINE_COMMENT
     public void mSH_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = SH_STYLE_SINGLE_LINE_COMMENT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
+            this.ruleNestingLevel++;
+            final int _type = SH_STYLE_SINGLE_LINE_COMMENT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
             int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1614:4: ( '#' ( options {greedy=false; } : . )* EOL )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1614:4: '#' ( options {greedy=false; } : . )* EOL
             {
-            match('#'); if (failed) return ;
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1614:8: ( options {greedy=false; } : . )*
-            loop15:
-            do {
-                int alt15=2;
-                int LA15_0 = input.LA(1);
-                if ( (LA15_0=='\r') ) {
-                    alt15=2;
+                match( '#' );
+                if ( this.failed ) {
+                    return;
                 }
-                else if ( (LA15_0=='\n') ) {
-                    alt15=2;
-                }
-                else if ( ((LA15_0>='\u0000' && LA15_0<='\t')||(LA15_0>='\u000B' && LA15_0<='\f')||(LA15_0>='\u000E' && LA15_0<='\uFFFE')) ) {
-                    alt15=1;
-                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1614:8: ( options {greedy=false; } : . )*
+                loop15 : do {
+                    int alt15 = 2;
+                    final int LA15_0 = this.input.LA( 1 );
+                    if ( (LA15_0 == '\r') ) {
+                        alt15 = 2;
+                    } else if ( (LA15_0 == '\n') ) {
+                        alt15 = 2;
+                    } else if ( ((LA15_0 >= '\u0000' && LA15_0 <= '\t') || (LA15_0 >= '\u000B' && LA15_0 <= '\f') || (LA15_0 >= '\u000E' && LA15_0 <= '\uFFFE')) ) {
+                        alt15 = 1;
+                    }
 
+                    switch ( alt15 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1614:35: .
+                        {
+                            matchAny();
+                            if ( this.failed ) {
+                                return;
+                            }
 
-                switch (alt15) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1614:35: .
-            	    {
-            	    matchAny(); if (failed) return ;
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            break loop15;
+                    }
+                } while ( true );
 
-            	default :
-            	    break loop15;
+                mEOL();
+                if ( this.failed ) {
+                    return;
                 }
-            } while (true);
+                if ( this.backtracking == 0 ) {
+                    _channel = HIDDEN;
+                }
 
-            mEOL(); if (failed) return ;
-            if ( backtracking==0 ) {
-               _channel=HIDDEN; 
             }
 
-            }
+            if ( this.backtracking == 0 ) {
 
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-            if ( backtracking==0 ) {
-
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end SH_STYLE_SINGLE_LINE_COMMENT
 
     // $ANTLR start C_STYLE_SINGLE_LINE_COMMENT
     public void mC_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = C_STYLE_SINGLE_LINE_COMMENT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
+            this.ruleNestingLevel++;
+            final int _type = C_STYLE_SINGLE_LINE_COMMENT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
             int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1620:4: ( '//' ( options {greedy=false; } : . )* EOL )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1620:4: '//' ( options {greedy=false; } : . )* EOL
             {
-            match("//"); if (failed) return ;
-
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1620:9: ( options {greedy=false; } : . )*
-            loop16:
-            do {
-                int alt16=2;
-                int LA16_0 = input.LA(1);
-                if ( (LA16_0=='\r') ) {
-                    alt16=2;
+                match( "//" );
+                if ( this.failed ) {
+                    return;
                 }
-                else if ( (LA16_0=='\n') ) {
-                    alt16=2;
-                }
-                else if ( ((LA16_0>='\u0000' && LA16_0<='\t')||(LA16_0>='\u000B' && LA16_0<='\f')||(LA16_0>='\u000E' && LA16_0<='\uFFFE')) ) {
-                    alt16=1;
-                }
 
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1620:9: ( options {greedy=false; } : . )*
+                loop16 : do {
+                    int alt16 = 2;
+                    final int LA16_0 = this.input.LA( 1 );
+                    if ( (LA16_0 == '\r') ) {
+                        alt16 = 2;
+                    } else if ( (LA16_0 == '\n') ) {
+                        alt16 = 2;
+                    } else if ( ((LA16_0 >= '\u0000' && LA16_0 <= '\t') || (LA16_0 >= '\u000B' && LA16_0 <= '\f') || (LA16_0 >= '\u000E' && LA16_0 <= '\uFFFE')) ) {
+                        alt16 = 1;
+                    }
 
-                switch (alt16) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1620:36: .
-            	    {
-            	    matchAny(); if (failed) return ;
+                    switch ( alt16 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1620:36: .
+                        {
+                            matchAny();
+                            if ( this.failed ) {
+                                return;
+                            }
 
-            	    }
-            	    break;
+                        }
+                            break;
 
-            	default :
-            	    break loop16;
+                        default :
+                            break loop16;
+                    }
+                } while ( true );
+
+                mEOL();
+                if ( this.failed ) {
+                    return;
                 }
-            } while (true);
+                if ( this.backtracking == 0 ) {
+                    _channel = HIDDEN;
+                }
 
-            mEOL(); if (failed) return ;
-            if ( backtracking==0 ) {
-               _channel=HIDDEN; 
             }
 
-            }
+            if ( this.backtracking == 0 ) {
 
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-            if ( backtracking==0 ) {
-
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end C_STYLE_SINGLE_LINE_COMMENT
 
     // $ANTLR start LEFT_PAREN
     public void mLEFT_PAREN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = LEFT_PAREN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = LEFT_PAREN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1626:11: ( '(' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1626:11: '('
             {
-            match('('); if (failed) return ;
+                match( '(' );
+                if ( this.failed ) {
+                    return;
+                }
 
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end LEFT_PAREN
 
     // $ANTLR start RIGHT_PAREN
     public void mRIGHT_PAREN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = RIGHT_PAREN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = RIGHT_PAREN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1630:11: ( ')' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1630:11: ')'
             {
-            match(')'); if (failed) return ;
+                match( ')' );
+                if ( this.failed ) {
+                    return;
+                }
 
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end RIGHT_PAREN
 
     // $ANTLR start LEFT_SQUARE
     public void mLEFT_SQUARE() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = LEFT_SQUARE;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = LEFT_SQUARE;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1634:11: ( '[' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1634:11: '['
             {
-            match('['); if (failed) return ;
+                match( '[' );
+                if ( this.failed ) {
+                    return;
+                }
 
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end LEFT_SQUARE
 
     // $ANTLR start RIGHT_SQUARE
     public void mRIGHT_SQUARE() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = RIGHT_SQUARE;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = RIGHT_SQUARE;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1638:11: ( ']' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1638:11: ']'
             {
-            match(']'); if (failed) return ;
+                match( ']' );
+                if ( this.failed ) {
+                    return;
+                }
 
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end RIGHT_SQUARE
 
     // $ANTLR start LEFT_CURLY
     public void mLEFT_CURLY() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = LEFT_CURLY;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = LEFT_CURLY;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1642:11: ( '{' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1642:11: '{'
             {
-            match('{'); if (failed) return ;
+                match( '{' );
+                if ( this.failed ) {
+                    return;
+                }
 
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end LEFT_CURLY
 
     // $ANTLR start RIGHT_CURLY
     public void mRIGHT_CURLY() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = RIGHT_CURLY;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = RIGHT_CURLY;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1646:11: ( '}' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1646:11: '}'
             {
-            match('}'); if (failed) return ;
+                match( '}' );
+                if ( this.failed ) {
+                    return;
+                }
 
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end RIGHT_CURLY
 
     // $ANTLR start MULTI_LINE_COMMENT
     public void mMULTI_LINE_COMMENT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = MULTI_LINE_COMMENT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
+            this.ruleNestingLevel++;
+            final int _type = MULTI_LINE_COMMENT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
             int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1650:4: ( '/*' ( options {greedy=false; } : . )* '*/' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1650:4: '/*' ( options {greedy=false; } : . )* '*/'
             {
-            match("/*"); if (failed) return ;
+                match( "/*" );
+                if ( this.failed ) {
+                    return;
+                }
 
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1650:9: ( options {greedy=false; } : . )*
-            loop17:
-            do {
-                int alt17=2;
-                int LA17_0 = input.LA(1);
-                if ( (LA17_0=='*') ) {
-                    int LA17_1 = input.LA(2);
-                    if ( (LA17_1=='/') ) {
-                        alt17=2;
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1650:9: ( options {greedy=false; } : . )*
+                loop17 : do {
+                    int alt17 = 2;
+                    final int LA17_0 = this.input.LA( 1 );
+                    if ( (LA17_0 == '*') ) {
+                        final int LA17_1 = this.input.LA( 2 );
+                        if ( (LA17_1 == '/') ) {
+                            alt17 = 2;
+                        } else if ( ((LA17_1 >= '\u0000' && LA17_1 <= '.') || (LA17_1 >= '0' && LA17_1 <= '\uFFFE')) ) {
+                            alt17 = 1;
+                        }
+
+                    } else if ( ((LA17_0 >= '\u0000' && LA17_0 <= ')') || (LA17_0 >= '+' && LA17_0 <= '\uFFFE')) ) {
+                        alt17 = 1;
                     }
-                    else if ( ((LA17_1>='\u0000' && LA17_1<='.')||(LA17_1>='0' && LA17_1<='\uFFFE')) ) {
-                        alt17=1;
-                    }
 
+                    switch ( alt17 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1650:35: .
+                        {
+                            matchAny();
+                            if ( this.failed ) {
+                                return;
+                            }
 
-                }
-                else if ( ((LA17_0>='\u0000' && LA17_0<=')')||(LA17_0>='+' && LA17_0<='\uFFFE')) ) {
-                    alt17=1;
-                }
+                        }
+                            break;
 
+                        default :
+                            break loop17;
+                    }
+                } while ( true );
 
-                switch (alt17) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1650:35: .
-            	    {
-            	    matchAny(); if (failed) return ;
+                match( "*/" );
+                if ( this.failed ) {
+                    return;
+                }
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop17;
+                if ( this.backtracking == 0 ) {
+                    _channel = HIDDEN;
                 }
-            } while (true);
 
-            match("*/"); if (failed) return ;
-
-            if ( backtracking==0 ) {
-               _channel=HIDDEN; 
             }
 
-            }
+            if ( this.backtracking == 0 ) {
 
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-            if ( backtracking==0 ) {
-
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end MULTI_LINE_COMMENT
 
     // $ANTLR start MISC
     public void mMISC() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = MISC;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = MISC;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1654:7: ( ('!'|'@'|'$'|'%'|'^'|'&'|'*'|'_'|'-'|'+'|'?'|'|'|','|'='|'/'|'\\''|'\\\\'))
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1655:3: ('!'|'@'|'$'|'%'|'^'|'&'|'*'|'_'|'-'|'+'|'?'|'|'|','|'='|'/'|'\\''|'\\\\')
             {
-            if ( input.LA(1)=='!'||(input.LA(1)>='$' && input.LA(1)<='\'')||(input.LA(1)>='*' && input.LA(1)<='-')||input.LA(1)=='/'||input.LA(1)=='='||(input.LA(1)>='?' && input.LA(1)<='@')||input.LA(1)=='\\'||(input.LA(1)>='^' && input.LA(1)<='_')||input.LA(1)=='|' ) {
-                input.consume();
-            failed=false;
-            }
-            else {
-                if (backtracking>0) {failed=true; return ;}
-                MismatchedSetException mse =
-                    new MismatchedSetException(null,input);
-                recover(mse);    throw mse;
-            }
+                if ( this.input.LA( 1 ) == '!' || (this.input.LA( 1 ) >= '$' && this.input.LA( 1 ) <= '\'') || (this.input.LA( 1 ) >= '*' && this.input.LA( 1 ) <= '-') || this.input.LA( 1 ) == '/' || this.input.LA( 1 ) == '=' || (this.input.LA( 1 ) >= '?' && this.input.LA( 1 ) <= '@')
+                     || this.input.LA( 1 ) == '\\' || (this.input.LA( 1 ) >= '^' && this.input.LA( 1 ) <= '_') || this.input.LA( 1 ) == '|' ) {
+                    this.input.consume();
+                    this.failed = false;
+                } else {
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return;
+                    }
+                    final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                             this.input );
+                    recover( mse );
+                    throw mse;
+                }
 
-
             }
 
+            if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
+                if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                    emit( _type,
+                          _line,
+                          _charPosition,
+                          _channel,
+                          _start,
+                          getCharIndex() - 1 );
+                }
 
-                      if ( token==null && ruleNestingLevel==1 ) {
-                          emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                      }
-
-                      
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end MISC
 
     public void mTokens() throws RecognitionException {
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:10: ( T63 | T64 | T65 | T66 | T67 | T68 | T69 | T70 | T71 | T72 | T73 | T74 | T75 | T76 | T77 | T78 | WS | INT | FLOAT | STRING | BOOL | PACKAGE | IMPORT | FUNCTION | GLOBAL | RULE | QUERY | TEMPLATE | ATTRIBUTES | DATE_EFFECTIVE | DATE_EXPIRES | ENABLED | SALIENCE | NO_LOOP | AUTO_FOCUS | ACTIVATION_GROUP | AGENDA_GROUP | RULEFLOW_GROUP | DURATION | LOCK_ON_ACTIVE | FROM | ACCUMULATE | INIT | ACTION | RESULT | COLLECT | OR | AND | CONTAINS | EXCLUDES | MATCHES | NULL | EXISTS | NOT | EVAL | FORALL | WHEN | THEN | END | ID | SH_STYLE_SINGLE_LINE_COMMENT | C_STYLE_SINGLE_LINE_COMMENT | LEFT_PAREN | RIGHT_PAREN | LEFT_SQUARE | RIGHT_SQUARE | LEFT_CURLY | RIGHT_CURLY | MULTI_LINE_COMMENT | MISC )
-        int alt18=70;
-        alt18 = dfa18.predict(input);
-        switch (alt18) {
+        int alt18 = 70;
+        alt18 = this.dfa18.predict( this.input );
+        switch ( alt18 ) {
             case 1 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:10: T63
-                {
-                mT63(); if (failed) return ;
+            {
+                mT63();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 2 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:14: T64
-                {
-                mT64(); if (failed) return ;
+            {
+                mT64();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 3 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:18: T65
-                {
-                mT65(); if (failed) return ;
+            {
+                mT65();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 4 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:22: T66
-                {
-                mT66(); if (failed) return ;
+            {
+                mT66();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 5 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:26: T67
-                {
-                mT67(); if (failed) return ;
+            {
+                mT67();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 6 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:30: T68
-                {
-                mT68(); if (failed) return ;
+            {
+                mT68();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 7 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:34: T69
-                {
-                mT69(); if (failed) return ;
+            {
+                mT69();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 8 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:38: T70
-                {
-                mT70(); if (failed) return ;
+            {
+                mT70();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 9 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:42: T71
-                {
-                mT71(); if (failed) return ;
+            {
+                mT71();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 10 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:46: T72
-                {
-                mT72(); if (failed) return ;
+            {
+                mT72();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 11 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:50: T73
-                {
-                mT73(); if (failed) return ;
+            {
+                mT73();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 12 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:54: T74
-                {
-                mT74(); if (failed) return ;
+            {
+                mT74();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 13 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:58: T75
-                {
-                mT75(); if (failed) return ;
+            {
+                mT75();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 14 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:62: T76
-                {
-                mT76(); if (failed) return ;
+            {
+                mT76();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 15 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:66: T77
-                {
-                mT77(); if (failed) return ;
+            {
+                mT77();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 16 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:70: T78
-                {
-                mT78(); if (failed) return ;
+            {
+                mT78();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 17 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:74: WS
-                {
-                mWS(); if (failed) return ;
+            {
+                mWS();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 18 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:77: INT
-                {
-                mINT(); if (failed) return ;
+            {
+                mINT();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 19 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:81: FLOAT
-                {
-                mFLOAT(); if (failed) return ;
+            {
+                mFLOAT();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 20 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:87: STRING
-                {
-                mSTRING(); if (failed) return ;
+            {
+                mSTRING();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 21 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:94: BOOL
-                {
-                mBOOL(); if (failed) return ;
+            {
+                mBOOL();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 22 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:99: PACKAGE
-                {
-                mPACKAGE(); if (failed) return ;
+            {
+                mPACKAGE();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 23 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:107: IMPORT
-                {
-                mIMPORT(); if (failed) return ;
+            {
+                mIMPORT();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 24 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:114: FUNCTION
-                {
-                mFUNCTION(); if (failed) return ;
+            {
+                mFUNCTION();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 25 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:123: GLOBAL
-                {
-                mGLOBAL(); if (failed) return ;
+            {
+                mGLOBAL();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 26 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:130: RULE
-                {
-                mRULE(); if (failed) return ;
+            {
+                mRULE();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 27 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:135: QUERY
-                {
-                mQUERY(); if (failed) return ;
+            {
+                mQUERY();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 28 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:141: TEMPLATE
-                {
-                mTEMPLATE(); if (failed) return ;
+            {
+                mTEMPLATE();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 29 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:150: ATTRIBUTES
-                {
-                mATTRIBUTES(); if (failed) return ;
+            {
+                mATTRIBUTES();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 30 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:161: DATE_EFFECTIVE
-                {
-                mDATE_EFFECTIVE(); if (failed) return ;
+            {
+                mDATE_EFFECTIVE();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 31 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:176: DATE_EXPIRES
-                {
-                mDATE_EXPIRES(); if (failed) return ;
+            {
+                mDATE_EXPIRES();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 32 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:189: ENABLED
-                {
-                mENABLED(); if (failed) return ;
+            {
+                mENABLED();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 33 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:197: SALIENCE
-                {
-                mSALIENCE(); if (failed) return ;
+            {
+                mSALIENCE();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 34 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:206: NO_LOOP
-                {
-                mNO_LOOP(); if (failed) return ;
+            {
+                mNO_LOOP();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 35 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:214: AUTO_FOCUS
-                {
-                mAUTO_FOCUS(); if (failed) return ;
+            {
+                mAUTO_FOCUS();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 36 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:225: ACTIVATION_GROUP
-                {
-                mACTIVATION_GROUP(); if (failed) return ;
+            {
+                mACTIVATION_GROUP();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 37 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:242: AGENDA_GROUP
-                {
-                mAGENDA_GROUP(); if (failed) return ;
+            {
+                mAGENDA_GROUP();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 38 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:255: RULEFLOW_GROUP
-                {
-                mRULEFLOW_GROUP(); if (failed) return ;
+            {
+                mRULEFLOW_GROUP();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 39 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:270: DURATION
-                {
-                mDURATION(); if (failed) return ;
+            {
+                mDURATION();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 40 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:279: LOCK_ON_ACTIVE
-                {
-                mLOCK_ON_ACTIVE(); if (failed) return ;
+            {
+                mLOCK_ON_ACTIVE();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 41 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:294: FROM
-                {
-                mFROM(); if (failed) return ;
+            {
+                mFROM();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 42 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:299: ACCUMULATE
-                {
-                mACCUMULATE(); if (failed) return ;
+            {
+                mACCUMULATE();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 43 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:310: INIT
-                {
-                mINIT(); if (failed) return ;
+            {
+                mINIT();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 44 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:315: ACTION
-                {
-                mACTION(); if (failed) return ;
+            {
+                mACTION();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 45 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:322: RESULT
-                {
-                mRESULT(); if (failed) return ;
+            {
+                mRESULT();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 46 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:329: COLLECT
-                {
-                mCOLLECT(); if (failed) return ;
+            {
+                mCOLLECT();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 47 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:337: OR
-                {
-                mOR(); if (failed) return ;
+            {
+                mOR();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 48 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:340: AND
-                {
-                mAND(); if (failed) return ;
+            {
+                mAND();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 49 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:344: CONTAINS
-                {
-                mCONTAINS(); if (failed) return ;
+            {
+                mCONTAINS();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 50 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:353: EXCLUDES
-                {
-                mEXCLUDES(); if (failed) return ;
+            {
+                mEXCLUDES();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 51 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:362: MATCHES
-                {
-                mMATCHES(); if (failed) return ;
+            {
+                mMATCHES();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 52 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:370: NULL
-                {
-                mNULL(); if (failed) return ;
+            {
+                mNULL();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 53 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:375: EXISTS
-                {
-                mEXISTS(); if (failed) return ;
+            {
+                mEXISTS();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 54 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:382: NOT
-                {
-                mNOT(); if (failed) return ;
+            {
+                mNOT();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 55 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:386: EVAL
-                {
-                mEVAL(); if (failed) return ;
+            {
+                mEVAL();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 56 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:391: FORALL
-                {
-                mFORALL(); if (failed) return ;
+            {
+                mFORALL();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 57 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:398: WHEN
-                {
-                mWHEN(); if (failed) return ;
+            {
+                mWHEN();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 58 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:403: THEN
-                {
-                mTHEN(); if (failed) return ;
+            {
+                mTHEN();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 59 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:408: END
-                {
-                mEND(); if (failed) return ;
+            {
+                mEND();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 60 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:412: ID
-                {
-                mID(); if (failed) return ;
+            {
+                mID();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 61 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:415: SH_STYLE_SINGLE_LINE_COMMENT
-                {
-                mSH_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
+            {
+                mSH_STYLE_SINGLE_LINE_COMMENT();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 62 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:444: C_STYLE_SINGLE_LINE_COMMENT
-                {
-                mC_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
+            {
+                mC_STYLE_SINGLE_LINE_COMMENT();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 63 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:472: LEFT_PAREN
-                {
-                mLEFT_PAREN(); if (failed) return ;
+            {
+                mLEFT_PAREN();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 64 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:483: RIGHT_PAREN
-                {
-                mRIGHT_PAREN(); if (failed) return ;
+            {
+                mRIGHT_PAREN();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 65 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:495: LEFT_SQUARE
-                {
-                mLEFT_SQUARE(); if (failed) return ;
+            {
+                mLEFT_SQUARE();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 66 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:507: RIGHT_SQUARE
-                {
-                mRIGHT_SQUARE(); if (failed) return ;
+            {
+                mRIGHT_SQUARE();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 67 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:520: LEFT_CURLY
-                {
-                mLEFT_CURLY(); if (failed) return ;
+            {
+                mLEFT_CURLY();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 68 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:531: RIGHT_CURLY
-                {
-                mRIGHT_CURLY(); if (failed) return ;
+            {
+                mRIGHT_CURLY();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 69 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:543: MULTI_LINE_COMMENT
-                {
-                mMULTI_LINE_COMMENT(); if (failed) return ;
+            {
+                mMULTI_LINE_COMMENT();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
             case 70 :
                 // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:562: MISC
-                {
-                mMISC(); if (failed) return ;
+            {
+                mMISC();
+                if ( this.failed ) {
+                    return;
+                }
 
-                }
+            }
                 break;
 
         }
 
     }
 
-
-    protected DFA18 dfa18 = new DFA18(this);
-    public static final String DFA18_eotS =
-        "\2\uffff\1\55\2\uffff\1\60\1\62\2\53\1\66\1\70\1\53\1\uffff\1\73"+
-        "\1\uffff\1\53\21\52\2\uffff\1\53\30\uffff\35\52\1\u0080\2\52\2\uffff"+
-        "\16\52\1\u0091\13\52\1\u009d\1\52\1\u009f\1\uffff\4\52\1\uffff\2"+
-        "\52\1\u00a6\1\u00a7\4\52\1\u00ac\2\52\1\u00af\2\52\1\u00b3\1\52"+
-        "\1\uffff\7\52\1\u00bd\3\52\1\uffff\1\52\1\uffff\1\u00c2\4\52\1\u00c7"+
-        "\2\uffff\2\52\1\u00a7\1\52\1\uffff\2\52\1\uffff\3\52\1\uffff\1\u00d0"+
-        "\1\uffff\5\52\1\uffff\1\52\1\uffff\4\52\2\uffff\3\52\1\uffff\1\52"+
-        "\1\u00e0\2\52\1\u00e3\1\u00e4\1\u00e5\1\52\1\uffff\2\52\1\u00e9"+
-        "\2\52\1\uffff\1\52\1\u00ef\7\52\1\uffff\1\52\1\u00f8\3\uffff\3\52"+
-        "\1\uffff\1\52\3\uffff\1\52\1\uffff\1\52\1\u00ff\1\52\1\u0101\1\52"+
-        "\1\u0103\1\u0104\1\u0105\1\uffff\4\52\1\u010a\1\u010b\1\uffff\1"+
-        "\u010c\1\uffff\1\u010d\4\uffff\3\52\4\uffff\1\u0111\1\52\1\u0113"+
-        "\3\uffff";
-    public static final String DFA18_eofS =
-        "\u0114\uffff";
-    public static final String DFA18_minS =
-        "\1\11\1\uffff\1\52\2\uffff\1\174\1\46\1\60\4\75\1\uffff\1\56\1\uffff"+
-        "\1\0\1\145\2\141\1\155\1\154\1\145\1\165\1\143\1\141\1\156\1\141"+
-        "\3\157\1\162\1\141\1\150\2\uffff\1\52\30\uffff\1\145\1\165\1\155"+
-        "\1\162\1\154\1\156\1\157\1\143\1\160\1\151\1\157\1\163\1\154\1\145"+
-        "\1\144\2\164\1\143\1\145\1\164\1\162\1\141\1\143\1\141\1\154\1\55"+
-        "\1\154\1\143\1\154\1\60\1\164\1\145\2\uffff\1\156\1\145\1\160\1"+
-        "\141\1\163\1\143\1\155\1\153\1\157\1\164\1\142\1\165\1\145\1\162"+
-        "\1\60\1\157\1\162\1\151\1\165\1\156\1\145\1\141\1\154\1\163\1\154"+
-        "\1\142\1\60\1\151\1\60\1\uffff\1\154\1\153\1\154\1\164\1\uffff\1"+
-        "\143\1\156\2\60\2\154\1\145\1\164\1\60\1\141\1\162\1\60\1\141\1"+
-        "\154\1\60\1\171\1\uffff\1\55\1\151\1\157\1\155\1\144\1\55\1\164"+
-        "\1\60\1\164\1\165\1\154\1\uffff\1\145\1\uffff\1\60\1\55\1\145\1"+
-        "\141\1\150\1\60\2\uffff\1\141\1\154\1\60\1\151\1\uffff\1\147\1\164"+
-        "\1\uffff\1\154\1\164\1\154\1\uffff\1\60\1\uffff\1\142\1\141\1\156"+
-        "\1\165\1\141\1\145\1\151\1\uffff\1\163\1\144\1\145\1\156\2\uffff"+
-        "\1\143\1\151\1\145\1\uffff\1\164\1\60\1\157\1\145\3\60\1\157\1\uffff"+
-        "\1\165\1\164\1\60\1\154\1\55\1\146\1\157\1\60\1\145\1\144\1\143"+
-        "\1\164\1\156\1\163\1\145\1\uffff\1\156\1\60\3\uffff\1\167\1\164"+
-        "\1\151\1\uffff\1\141\3\uffff\1\156\1\uffff\1\163\1\60\1\145\1\60"+
-        "\1\163\3\60\1\uffff\1\55\1\145\1\157\1\164\2\60\1\uffff\1\60\1\uffff"+
-        "\1\60\4\uffff\1\163\1\156\1\145\4\uffff\1\60\1\55\1\60\3\uffff";
-    public static final String DFA18_maxS =
-        "\1\u00ff\1\uffff\1\52\2\uffff\1\174\1\46\1\76\4\75\1\uffff\1\71"+
-        "\1\uffff\1\ufffe\1\162\1\165\1\141\1\156\1\154\4\165\1\170\1\141"+
-        "\1\165\2\157\1\162\1\141\1\150\2\uffff\1\57\30\uffff\1\145\1\165"+
-        "\1\155\1\162\1\154\1\156\1\157\1\143\1\160\1\151\1\157\1\163\1\154"+
-        "\1\145\1\144\3\164\1\145\1\164\1\162\1\141\1\151\1\144\1\154\1\164"+
-        "\1\154\1\143\1\156\1\u00ff\1\164\1\145\2\uffff\1\156\1\145\1\160"+
-        "\1\141\1\163\1\143\1\155\1\153\1\157\1\164\1\142\1\165\1\145\1\162"+
-        "\1\u00ff\1\157\1\162\1\151\1\165\1\156\1\145\1\141\1\154\1\163\1"+
-        "\154\1\142\1\u00ff\1\151\1\u00ff\1\uffff\1\154\1\153\1\154\1\164"+
-        "\1\uffff\1\143\1\156\2\u00ff\2\154\1\145\1\164\1\u00ff\1\141\1\162"+
-        "\1\u00ff\1\141\1\154\1\u00ff\1\171\1\uffff\1\55\1\151\1\166\1\155"+
-        "\1\144\1\55\1\164\1\u00ff\1\164\1\165\1\154\1\uffff\1\145\1\uffff"+
-        "\1\u00ff\1\55\1\145\1\141\1\150\1\u00ff\2\uffff\1\141\1\154\1\u00ff"+
-        "\1\151\1\uffff\1\147\1\164\1\uffff\1\154\1\164\1\154\1\uffff\1\u00ff"+
-        "\1\uffff\1\142\1\141\1\156\1\165\1\141\1\145\1\151\1\uffff\1\163"+
-        "\1\144\1\145\1\156\2\uffff\1\143\1\151\1\145\1\uffff\1\164\1\u00ff"+
-        "\1\157\1\145\3\u00ff\1\157\1\uffff\1\165\1\164\1\u00ff\1\154\1\55"+
-        "\1\170\1\157\1\u00ff\1\145\1\144\1\143\1\164\1\156\1\163\1\145\1"+
-        "\uffff\1\156\1\u00ff\3\uffff\1\167\1\164\1\151\1\uffff\1\141\3\uffff"+
-        "\1\156\1\uffff\1\163\1\u00ff\1\145\1\u00ff\1\163\3\u00ff\1\uffff"+
-        "\1\55\1\145\1\157\1\164\2\u00ff\1\uffff\1\u00ff\1\uffff\1\u00ff"+
-        "\4\uffff\1\163\1\156\1\145\4\uffff\1\u00ff\1\55\1\u00ff\3\uffff";
-    public static final String DFA18_acceptS =
-        "\1\uffff\1\1\1\uffff\1\4\1\5\7\uffff\1\21\1\uffff\1\24\22\uffff"+
-        "\1\74\1\75\1\uffff\1\77\1\100\1\101\1\102\1\103\1\104\1\74\1\106"+
-        "\1\3\1\2\1\4\1\6\1\10\1\20\1\7\1\11\1\12\1\14\1\13\1\16\1\15\1\17"+
-        "\1\23\1\22\40\uffff\1\105\1\76\35\uffff\1\42\4\uffff\1\57\20\uffff"+
-        "\1\60\13\uffff\1\73\1\uffff\1\66\6\uffff\1\72\1\25\4\uffff\1\51"+
-        "\2\uffff\1\53\3\uffff\1\32\1\uffff\1\43\7\uffff\1\67\4\uffff\1\64"+
-        "\1\50\3\uffff\1\71\10\uffff\1\33\17\uffff\1\70\2\uffff\1\27\1\31"+
-        "\1\55\3\uffff\1\54\1\uffff\1\45\1\37\1\36\1\uffff\1\65\10\uffff"+
-        "\1\26\6\uffff\1\40\1\uffff\1\56\1\uffff\1\63\1\34\1\30\1\46\3\uffff"+
-        "\1\47\1\62\1\41\1\61\3\uffff\1\35\1\44\1\52";
-    public static final String DFA18_specialS =
-        "\u0114\uffff}>";
+    protected DFA18              dfa18            = new DFA18( this );
+    public static final String   DFA18_eotS       = "\2\uffff\1\55\2\uffff\1\60\1\62\2\53\1\66\1\70\1\53\1\uffff\1\73" + "\1\uffff\1\53\21\52\2\uffff\1\53\30\uffff\35\52\1\u0080\2\52\2\uffff"
+                                                    + "\16\52\1\u0091\13\52\1\u009d\1\52\1\u009f\1\uffff\4\52\1\uffff\2" + "\52\1\u00a6\1\u00a7\4\52\1\u00ac\2\52\1\u00af\2\52\1\u00b3\1\52"
+                                                    + "\1\uffff\7\52\1\u00bd\3\52\1\uffff\1\52\1\uffff\1\u00c2\4\52\1\u00c7" + "\2\uffff\2\52\1\u00a7\1\52\1\uffff\2\52\1\uffff\3\52\1\uffff\1\u00d0"
+                                                    + "\1\uffff\5\52\1\uffff\1\52\1\uffff\4\52\2\uffff\3\52\1\uffff\1\52" + "\1\u00e0\2\52\1\u00e3\1\u00e4\1\u00e5\1\52\1\uffff\2\52\1\u00e9"
+                                                    + "\2\52\1\uffff\1\52\1\u00ef\7\52\1\uffff\1\52\1\u00f8\3\uffff\3\52" + "\1\uffff\1\52\3\uffff\1\52\1\uffff\1\52\1\u00ff\1\52\1\u0101\1\52"
+                                                    + "\1\u0103\1\u0104\1\u0105\1\uffff\4\52\1\u010a\1\u010b\1\uffff\1" + "\u010c\1\uffff\1\u010d\4\uffff\3\52\4\uffff\1\u0111\1\52\1\u0113" + "\3\uffff";
+    public static final String   DFA18_eofS       = "\u0114\uffff";
+    public static final String   DFA18_minS       = "\1\11\1\uffff\1\52\2\uffff\1\174\1\46\1\60\4\75\1\uffff\1\56\1\uffff" + "\1\0\1\145\2\141\1\155\1\154\1\145\1\165\1\143\1\141\1\156\1\141"
+                                                    + "\3\157\1\162\1\141\1\150\2\uffff\1\52\30\uffff\1\145\1\165\1\155" + "\1\162\1\154\1\156\1\157\1\143\1\160\1\151\1\157\1\163\1\154\1\145"
+                                                    + "\1\144\2\164\1\143\1\145\1\164\1\162\1\141\1\143\1\141\1\154\1\55" + "\1\154\1\143\1\154\1\60\1\164\1\145\2\uffff\1\156\1\145\1\160\1"
+                                                    + "\141\1\163\1\143\1\155\1\153\1\157\1\164\1\142\1\165\1\145\1\162" + "\1\60\1\157\1\162\1\151\1\165\1\156\1\145\1\141\1\154\1\163\1\154"
+                                                    + "\1\142\1\60\1\151\1\60\1\uffff\1\154\1\153\1\154\1\164\1\uffff\1" + "\143\1\156\2\60\2\154\1\145\1\164\1\60\1\141\1\162\1\60\1\141\1"
+                                                    + "\154\1\60\1\171\1\uffff\1\55\1\151\1\157\1\155\1\144\1\55\1\164" + "\1\60\1\164\1\165\1\154\1\uffff\1\145\1\uffff\1\60\1\55\1\145\1"
+                                                    + "\141\1\150\1\60\2\uffff\1\141\1\154\1\60\1\151\1\uffff\1\147\1\164" + "\1\uffff\1\154\1\164\1\154\1\uffff\1\60\1\uffff\1\142\1\141\1\156"
+                                                    + "\1\165\1\141\1\145\1\151\1\uffff\1\163\1\144\1\145\1\156\2\uffff" + "\1\143\1\151\1\145\1\uffff\1\164\1\60\1\157\1\145\3\60\1\157\1\uffff"
+                                                    + "\1\165\1\164\1\60\1\154\1\55\1\146\1\157\1\60\1\145\1\144\1\143" + "\1\164\1\156\1\163\1\145\1\uffff\1\156\1\60\3\uffff\1\167\1\164"
+                                                    + "\1\151\1\uffff\1\141\3\uffff\1\156\1\uffff\1\163\1\60\1\145\1\60" + "\1\163\3\60\1\uffff\1\55\1\145\1\157\1\164\2\60\1\uffff\1\60\1\uffff"
+                                                    + "\1\60\4\uffff\1\163\1\156\1\145\4\uffff\1\60\1\55\1\60\3\uffff";
+    public static final String   DFA18_maxS       = "\1\u00ff\1\uffff\1\52\2\uffff\1\174\1\46\1\76\4\75\1\uffff\1\71" + "\1\uffff\1\ufffe\1\162\1\165\1\141\1\156\1\154\4\165\1\170\1\141"
+                                                    + "\1\165\2\157\1\162\1\141\1\150\2\uffff\1\57\30\uffff\1\145\1\165" + "\1\155\1\162\1\154\1\156\1\157\1\143\1\160\1\151\1\157\1\163\1\154"
+                                                    + "\1\145\1\144\3\164\1\145\1\164\1\162\1\141\1\151\1\144\1\154\1\164" + "\1\154\1\143\1\156\1\u00ff\1\164\1\145\2\uffff\1\156\1\145\1\160"
+                                                    + "\1\141\1\163\1\143\1\155\1\153\1\157\1\164\1\142\1\165\1\145\1\162" + "\1\u00ff\1\157\1\162\1\151\1\165\1\156\1\145\1\141\1\154\1\163\1"
+                                                    + "\154\1\142\1\u00ff\1\151\1\u00ff\1\uffff\1\154\1\153\1\154\1\164" + "\1\uffff\1\143\1\156\2\u00ff\2\154\1\145\1\164\1\u00ff\1\141\1\162"
+                                                    + "\1\u00ff\1\141\1\154\1\u00ff\1\171\1\uffff\1\55\1\151\1\166\1\155" + "\1\144\1\55\1\164\1\u00ff\1\164\1\165\1\154\1\uffff\1\145\1\uffff"
+                                                    + "\1\u00ff\1\55\1\145\1\141\1\150\1\u00ff\2\uffff\1\141\1\154\1\u00ff" + "\1\151\1\uffff\1\147\1\164\1\uffff\1\154\1\164\1\154\1\uffff\1\u00ff"
+                                                    + "\1\uffff\1\142\1\141\1\156\1\165\1\141\1\145\1\151\1\uffff\1\163" + "\1\144\1\145\1\156\2\uffff\1\143\1\151\1\145\1\uffff\1\164\1\u00ff"
+                                                    + "\1\157\1\145\3\u00ff\1\157\1\uffff\1\165\1\164\1\u00ff\1\154\1\55" + "\1\170\1\157\1\u00ff\1\145\1\144\1\143\1\164\1\156\1\163\1\145\1"
+                                                    + "\uffff\1\156\1\u00ff\3\uffff\1\167\1\164\1\151\1\uffff\1\141\3\uffff" + "\1\156\1\uffff\1\163\1\u00ff\1\145\1\u00ff\1\163\3\u00ff\1\uffff"
+                                                    + "\1\55\1\145\1\157\1\164\2\u00ff\1\uffff\1\u00ff\1\uffff\1\u00ff" + "\4\uffff\1\163\1\156\1\145\4\uffff\1\u00ff\1\55\1\u00ff\3\uffff";
+    public static final String   DFA18_acceptS    = "\1\uffff\1\1\1\uffff\1\4\1\5\7\uffff\1\21\1\uffff\1\24\22\uffff" + "\1\74\1\75\1\uffff\1\77\1\100\1\101\1\102\1\103\1\104\1\74\1\106"
+                                                    + "\1\3\1\2\1\4\1\6\1\10\1\20\1\7\1\11\1\12\1\14\1\13\1\16\1\15\1\17" + "\1\23\1\22\40\uffff\1\105\1\76\35\uffff\1\42\4\uffff\1\57\20\uffff"
+                                                    + "\1\60\13\uffff\1\73\1\uffff\1\66\6\uffff\1\72\1\25\4\uffff\1\51" + "\2\uffff\1\53\3\uffff\1\32\1\uffff\1\43\7\uffff\1\67\4\uffff\1\64"
+                                                    + "\1\50\3\uffff\1\71\10\uffff\1\33\17\uffff\1\70\2\uffff\1\27\1\31" + "\1\55\3\uffff\1\54\1\uffff\1\45\1\37\1\36\1\uffff\1\65\10\uffff"
+                                                    + "\1\26\6\uffff\1\40\1\uffff\1\56\1\uffff\1\63\1\34\1\30\1\46\3\uffff" + "\1\47\1\62\1\41\1\61\3\uffff\1\35\1\44\1\52";
+    public static final String   DFA18_specialS   = "\u0114\uffff}>";
     public static final String[] DFA18_transition = {
-        "\2\14\1\uffff\2\14\22\uffff\1\14\1\13\1\16\1\42\1\41\1\53\1\6\1"+
-        "\17\1\44\1\45\2\53\1\3\1\7\1\2\1\43\12\15\1\4\1\1\1\12\1\10\1\11"+
-        "\2\53\32\52\1\46\1\53\1\47\1\53\1\41\1\uffff\1\27\1\52\1\35\1\30"+
-        "\1\31\1\21\1\24\1\52\1\23\2\52\1\34\1\37\1\33\1\36\1\22\1\26\1\25"+
-        "\1\32\1\20\2\52\1\40\3\52\1\50\1\5\1\51\102\uffff\100\52",
-        "",
-        "\1\54",
-        "",
-        "",
-        "\1\57",
-        "\1\61",
-        "\12\15\4\uffff\1\63",
-        "\1\64",
-        "\1\65",
-        "\1\67",
-        "\1\71",
-        "",
-        "\1\72\1\uffff\12\15",
-        "",
-        "\uffff\16",
-        "\1\76\2\uffff\1\74\11\uffff\1\75",
-        "\1\100\15\uffff\1\77\2\uffff\1\102\2\uffff\1\101",
-        "\1\103",
-        "\1\104\1\105",
-        "\1\106",
-        "\1\107\17\uffff\1\110",
-        "\1\111",
-        "\1\115\3\uffff\1\116\6\uffff\1\112\5\uffff\1\114\1\113",
-        "\1\117\23\uffff\1\120",
-        "\1\123\7\uffff\1\121\1\uffff\1\122",
-        "\1\124",
-        "\1\125\5\uffff\1\126",
-        "\1\127",
-        "\1\130",
-        "\1\131",
-        "\1\132",
-        "\1\133",
-        "",
-        "",
-        "\1\134\4\uffff\1\135",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "\1\136",
-        "\1\137",
-        "\1\140",
-        "\1\141",
-        "\1\142",
-        "\1\143",
-        "\1\144",
-        "\1\145",
-        "\1\146",
-        "\1\147",
-        "\1\150",
-        "\1\151",
-        "\1\152",
-        "\1\153",
-        "\1\154",
-        "\1\155",
-        "\1\156",
-        "\1\160\20\uffff\1\157",
-        "\1\161",
-        "\1\162",
-        "\1\163",
-        "\1\164",
-        "\1\166\5\uffff\1\165",
-        "\1\167\2\uffff\1\170",
-        "\1\171",
-        "\1\173\106\uffff\1\172",
-        "\1\174",
-        "\1\175",
-        "\1\176\1\uffff\1\177",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u0081",
-        "\1\u0082",
-        "",
-        "",
-        "\1\u0083",
-        "\1\u0084",
-        "\1\u0085",
-        "\1\u0086",
-        "\1\u0087",
-        "\1\u0088",
-        "\1\u0089",
-        "\1\u008a",
-        "\1\u008b",
-        "\1\u008c",
-        "\1\u008d",
-        "\1\u008e",
-        "\1\u008f",
-        "\1\u0090",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u0092",
-        "\1\u0093",
-        "\1\u0094",
-        "\1\u0095",
-        "\1\u0096",
-        "\1\u0097",
-        "\1\u0098",
-        "\1\u0099",
-        "\1\u009a",
-        "\1\u009b",
-        "\1\u009c",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u009e",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "",
-        "\1\u00a0",
-        "\1\u00a1",
-        "\1\u00a2",
-        "\1\u00a3",
-        "",
-        "\1\u00a4",
-        "\1\u00a5",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u00a8",
-        "\1\u00a9",
-        "\1\u00aa",
-        "\1\u00ab",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u00ad",
-        "\1\u00ae",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u00b0",
-        "\1\u00b1",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\5\52\1\u00b2\24\52\105"+
-        "\uffff\100\52",
-        "\1\u00b4",
-        "",
-        "\1\u00b5",
-        "\1\u00b6",
-        "\1\u00b8\6\uffff\1\u00b7",
-        "\1\u00b9",
-        "\1\u00ba",
-        "\1\u00bb",
-        "\1\u00bc",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u00be",
-        "\1\u00bf",
-        "\1\u00c0",
-        "",
-        "\1\u00c1",
-        "",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u00c3",
-        "\1\u00c4",
-        "\1\u00c5",
-        "\1\u00c6",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "",
-        "",
-        "\1\u00c8",
-        "\1\u00c9",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u00ca",
-        "",
-        "\1\u00cb",
-        "\1\u00cc",
-        "",
-        "\1\u00cd",
-        "\1\u00ce",
-        "\1\u00cf",
-        "",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "",
-        "\1\u00d1",
-        "\1\u00d2",
-        "\1\u00d3",
-        "\1\u00d4",
-        "\1\u00d5",
-        "\1\u00d6",
-        "\1\u00d7",
-        "",
-        "\1\u00d8",
-        "\1\u00d9",
-        "\1\u00da",
-        "\1\u00db",
-        "",
-        "",
-        "\1\u00dc",
-        "\1\u00dd",
-        "\1\u00de",
-        "",
-        "\1\u00df",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u00e1",
-        "\1\u00e2",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u00e6",
-        "",
-        "\1\u00e7",
-        "\1\u00e8",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u00ea",
-        "\1\u00eb",
-        "\1\u00ed\21\uffff\1\u00ec",
-        "\1\u00ee",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u00f0",
-        "\1\u00f1",
-        "\1\u00f2",
-        "\1\u00f3",
-        "\1\u00f4",
-        "\1\u00f5",
-        "\1\u00f6",
-        "",
-        "\1\u00f7",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "",
-        "",
-        "",
-        "\1\u00f9",
-        "\1\u00fa",
-        "\1\u00fb",
-        "",
-        "\1\u00fc",
-        "",
-        "",
-        "",
-        "\1\u00fd",
-        "",
-        "\1\u00fe",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u0100",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u0102",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "",
-        "\1\u0106",
-        "\1\u0107",
-        "\1\u0108",
-        "\1\u0109",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "",
-        "",
-        "",
-        "",
-        "\1\u010e",
-        "\1\u010f",
-        "\1\u0110",
-        "",
-        "",
-        "",
-        "",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "\1\u0112",
-        "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
-        "",
-        "",
-        ""
-    };
+            "\2\14\1\uffff\2\14\22\uffff\1\14\1\13\1\16\1\42\1\41\1\53\1\6\1" + "\17\1\44\1\45\2\53\1\3\1\7\1\2\1\43\12\15\1\4\1\1\1\12\1\10\1\11" + "\2\53\32\52\1\46\1\53\1\47\1\53\1\41\1\uffff\1\27\1\52\1\35\1\30"
+                    + "\1\31\1\21\1\24\1\52\1\23\2\52\1\34\1\37\1\33\1\36\1\22\1\26\1\25" + "\1\32\1\20\2\52\1\40\3\52\1\50\1\5\1\51\102\uffff\100\52", "", "\1\54", "", "", "\1\57", "\1\61", "\12\15\4\uffff\1\63", "\1\64", "\1\65", "\1\67", "\1\71",
+            "", "\1\72\1\uffff\12\15", "", "\uffff\16", "\1\76\2\uffff\1\74\11\uffff\1\75", "\1\100\15\uffff\1\77\2\uffff\1\102\2\uffff\1\101", "\1\103", "\1\104\1\105", "\1\106", "\1\107\17\uffff\1\110", "\1\111",
+            "\1\115\3\uffff\1\116\6\uffff\1\112\5\uffff\1\114\1\113", "\1\117\23\uffff\1\120", "\1\123\7\uffff\1\121\1\uffff\1\122", "\1\124", "\1\125\5\uffff\1\126", "\1\127", "\1\130", "\1\131", "\1\132", "\1\133", "", "", "\1\134\4\uffff\1\135",
+            "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "\1\136", "\1\137", "\1\140", "\1\141", "\1\142", "\1\143", "\1\144", "\1\145", "\1\146", "\1\147", "\1\150", "\1\151", "\1\152", "\1\153",
+            "\1\154", "\1\155", "\1\156", "\1\160\20\uffff\1\157", "\1\161", "\1\162", "\1\163", "\1\164", "\1\166\5\uffff\1\165", "\1\167\2\uffff\1\170", "\1\171", "\1\173\106\uffff\1\172", "\1\174", "\1\175", "\1\176\1\uffff\1\177",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u0081", "\1\u0082", "", "", "\1\u0083", "\1\u0084", "\1\u0085", "\1\u0086", "\1\u0087", "\1\u0088", "\1\u0089", "\1\u008a", "\1\u008b", "\1\u008c", "\1\u008d",
+            "\1\u008e", "\1\u008f", "\1\u0090", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u0092", "\1\u0093", "\1\u0094", "\1\u0095", "\1\u0096", "\1\u0097", "\1\u0098", "\1\u0099", "\1\u009a", "\1\u009b", "\1\u009c",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u009e", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "", "\1\u00a0", "\1\u00a1", "\1\u00a2", "\1\u00a3", "", "\1\u00a4", "\1\u00a5",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u00a8", "\1\u00a9", "\1\u00aa", "\1\u00ab",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u00ad", "\1\u00ae", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u00b0", "\1\u00b1",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\5\52\1\u00b2\24\52\105" + "\uffff\100\52", "\1\u00b4", "", "\1\u00b5", "\1\u00b6", "\1\u00b8\6\uffff\1\u00b7", "\1\u00b9", "\1\u00ba", "\1\u00bb", "\1\u00bc",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u00be", "\1\u00bf", "\1\u00c0", "", "\1\u00c1", "", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u00c3", "\1\u00c4", "\1\u00c5",
+            "\1\u00c6", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "", "", "\1\u00c8", "\1\u00c9", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u00ca", "", "\1\u00cb", "\1\u00cc", "", "\1\u00cd",
+            "\1\u00ce", "\1\u00cf", "", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "", "\1\u00d1", "\1\u00d2", "\1\u00d3", "\1\u00d4", "\1\u00d5", "\1\u00d6", "\1\u00d7", "", "\1\u00d8", "\1\u00d9", "\1\u00da", "\1\u00db",
+            "", "", "\1\u00dc", "\1\u00dd", "\1\u00de", "", "\1\u00df", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u00e1", "\1\u00e2", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u00e6", "", "\1\u00e7", "\1\u00e8",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u00ea", "\1\u00eb", "\1\u00ed\21\uffff\1\u00ec", "\1\u00ee", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u00f0", "\1\u00f1", "\1\u00f2",
+            "\1\u00f3", "\1\u00f4", "\1\u00f5", "\1\u00f6", "", "\1\u00f7", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "", "", "", "\1\u00f9", "\1\u00fa", "\1\u00fb", "", "\1\u00fc", "", "", "", "\1\u00fd", "", "\1\u00fe",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u0100", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u0102", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "", "\1\u0106", "\1\u0107", "\1\u0108", "\1\u0109",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "", "", "", "", "\1\u010e", "\1\u010f", "\1\u0110", "", "", "", "", "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "\1\u0112",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100\52", "", "", ""};
 
     class DFA18 extends DFA {
-        public DFA18(BaseRecognizer recognizer) {
+        public DFA18(final BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 18;
-            this.eot = DFA.unpackEncodedString(DFA18_eotS);
-            this.eof = DFA.unpackEncodedString(DFA18_eofS);
-            this.min = DFA.unpackEncodedStringToUnsignedChars(DFA18_minS);
-            this.max = DFA.unpackEncodedStringToUnsignedChars(DFA18_maxS);
-            this.accept = DFA.unpackEncodedString(DFA18_acceptS);
-            this.special = DFA.unpackEncodedString(DFA18_specialS);
-            int numStates = DFA18_transition.length;
+            this.eot = DFA.unpackEncodedString( DFA18_eotS );
+            this.eof = DFA.unpackEncodedString( DFA18_eofS );
+            this.min = DFA.unpackEncodedStringToUnsignedChars( DFA18_minS );
+            this.max = DFA.unpackEncodedStringToUnsignedChars( DFA18_maxS );
+            this.accept = DFA.unpackEncodedString( DFA18_acceptS );
+            this.special = DFA.unpackEncodedString( DFA18_specialS );
+            final int numStates = DFA18_transition.length;
             this.transition = new short[numStates][];
-            for (int i=0; i<numStates; i++) {
-                transition[i] = DFA.unpackEncodedString(DFA18_transition[i]);
+            for ( int i = 0; i < numStates; i++ ) {
+                this.transition[i] = DFA.unpackEncodedString( DFA18_transition[i] );
             }
         }
+
         public String getDescription() {
             return "1:1: Tokens : ( T63 | T64 | T65 | T66 | T67 | T68 | T69 | T70 | T71 | T72 | T73 | T74 | T75 | T76 | T77 | T78 | WS | INT | FLOAT | STRING | BOOL | PACKAGE | IMPORT | FUNCTION | GLOBAL | RULE | QUERY | TEMPLATE | ATTRIBUTES | DATE_EFFECTIVE | DATE_EXPIRES | ENABLED | SALIENCE | NO_LOOP | AUTO_FOCUS | ACTIVATION_GROUP | AGENDA_GROUP | RULEFLOW_GROUP | DURATION | LOCK_ON_ACTIVE | FROM | ACCUMULATE | INIT | ACTION | RESULT | COLLECT | OR | AND | CONTAINS | EXCLUDES | MATCHES | NULL | EXISTS | NOT | EVAL | FORALL | WHEN | THEN | END | ID | SH_STYLE_SINGLE_LINE_COMMENT | C_STYLE_SINGLE_LINE_COMMENT | LEFT_PAREN | RIGHT_PAREN | LEFT_SQUARE | RIGHT_SQUARE | LEFT_CURLY | RIGHT_CURLY | MULTI_LINE_COMMENT | MISC );";
         }
     }
- 
 
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,245 +1,226 @@
 // $ANTLR 3.0b7 C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g 2007-04-11 16:59:51
-
-	package org.drools.lang;
-	import java.util.List;
-	import java.util.ArrayList;
-	import java.util.Iterator;
-	import java.util.HashMap;	
-	import java.util.StringTokenizer;
-	import org.drools.lang.descr.*;
-	import org.drools.compiler.SwitchingCommonTokenStream;
 
+package org.drools.lang;
 
-import org.antlr.runtime.*;
-import java.util.Stack;
 import java.util.List;
 import java.util.ArrayList;
-import java.util.Map;
+import java.util.Iterator;
 import java.util.HashMap;
+import org.drools.lang.descr.*;
+import org.drools.compiler.SwitchingCommonTokenStream;
+
+import org.antlr.runtime.*;
+
 public class DRLParser extends Parser {
-    public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "PACKAGE", "IMPORT", "FUNCTION", "GLOBAL", "QUERY", "END", "TEMPLATE", "RULE", "WHEN", "ATTRIBUTES", "DATE_EFFECTIVE", "STRING", "DATE_EXPIRES", "ENABLED", "BOOL", "SALIENCE", "INT", "NO_LOOP", "AUTO_FOCUS", "ACTIVATION_GROUP", "RULEFLOW_GROUP", "AGENDA_GROUP", "DURATION", "LOCK_ON_ACTIVE", "ACCUMULATE", "INIT", "ACTION", "RESULT", "COLLECT", "ID", "OR", "LEFT_PAREN", "RIGHT_PAREN", "CONTAINS", "MATCHES", "EXCLUDES", "FLOAT", "NULL", "LEFT_CURLY", "RIGHT_CURLY", "LEFT_SQUARE", "RIGHT_SQUARE", "AND", "FROM", "EXISTS", "NOT", "EVAL", "FORALL", "THEN", "EOL", "WS", "EscapeSequence", "HexDigit", "UnicodeEscape", "OctalEscape", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT", "MISC", "';'", "'.'", "'.*'", "','", "':'", "'||'", "'&'", "'|'", "'->'", "'=='", "'>'", "'>='", "'<'", "'<='", "'!='", "'&&'"
-    };
-    public static final int PACKAGE=4;
-    public static final int FUNCTION=6;
-    public static final int ACCUMULATE=28;
-    public static final int RIGHT_SQUARE=45;
-    public static final int ACTIVATION_GROUP=23;
-    public static final int ATTRIBUTES=13;
-    public static final int RIGHT_CURLY=43;
-    public static final int CONTAINS=37;
-    public static final int NO_LOOP=21;
-    public static final int LOCK_ON_ACTIVE=27;
-    public static final int AGENDA_GROUP=25;
-    public static final int FLOAT=40;
-    public static final int SH_STYLE_SINGLE_LINE_COMMENT=59;
-    public static final int NOT=49;
-    public static final int AND=46;
-    public static final int ID=33;
-    public static final int EOF=-1;
-    public static final int HexDigit=56;
-    public static final int DATE_EFFECTIVE=14;
-    public static final int ACTION=30;
-    public static final int RIGHT_PAREN=36;
-    public static final int IMPORT=5;
-    public static final int EOL=53;
-    public static final int THEN=52;
-    public static final int MATCHES=38;
-    public static final int ENABLED=17;
-    public static final int EXISTS=48;
-    public static final int RULE=11;
-    public static final int EXCLUDES=39;
-    public static final int AUTO_FOCUS=22;
-    public static final int NULL=41;
-    public static final int BOOL=18;
-    public static final int FORALL=51;
-    public static final int SALIENCE=19;
-    public static final int RULEFLOW_GROUP=24;
-    public static final int RESULT=31;
-    public static final int INT=20;
-    public static final int MULTI_LINE_COMMENT=61;
-    public static final int DURATION=26;
-    public static final int WS=54;
-    public static final int EVAL=50;
-    public static final int TEMPLATE=10;
-    public static final int WHEN=12;
-    public static final int UnicodeEscape=57;
-    public static final int LEFT_CURLY=42;
-    public static final int OR=34;
-    public static final int LEFT_PAREN=35;
-    public static final int QUERY=8;
-    public static final int MISC=62;
-    public static final int FROM=47;
-    public static final int END=9;
-    public static final int GLOBAL=7;
-    public static final int COLLECT=32;
-    public static final int LEFT_SQUARE=44;
-    public static final int INIT=29;
-    public static final int OctalEscape=58;
-    public static final int EscapeSequence=55;
-    public static final int C_STYLE_SINGLE_LINE_COMMENT=60;
-    public static final int DATE_EXPIRES=16;
-    public static final int STRING=15;
+    public static final String[] tokenNames                   = new String[]{"<invalid>", "<EOR>", "<DOWN>", "<UP>", "PACKAGE", "IMPORT", "FUNCTION", "GLOBAL", "QUERY", "END", "TEMPLATE", "RULE", "WHEN", "ATTRIBUTES", "DATE_EFFECTIVE", "STRING",
+            "DATE_EXPIRES", "ENABLED", "BOOL", "SALIENCE", "INT", "NO_LOOP", "AUTO_FOCUS", "ACTIVATION_GROUP", "RULEFLOW_GROUP", "AGENDA_GROUP", "DURATION", "LOCK_ON_ACTIVE", "ACCUMULATE", "INIT", "ACTION", "RESULT", "COLLECT", "ID", "OR",
+            "LEFT_PAREN", "RIGHT_PAREN", "CONTAINS", "MATCHES", "EXCLUDES", "FLOAT", "NULL", "LEFT_CURLY", "RIGHT_CURLY", "LEFT_SQUARE", "RIGHT_SQUARE", "AND", "FROM", "EXISTS", "NOT", "EVAL", "FORALL", "THEN", "EOL", "WS", "EscapeSequence",
+            "HexDigit", "UnicodeEscape", "OctalEscape", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT", "MISC", "';'", "'.'", "'.*'", "','", "':'", "'||'", "'&'", "'|'", "'->'", "'=='", "'>'", "'>='", "'<'",
+            "'<='", "'!='", "'&&'"                            };
+    public static final int      PACKAGE                      = 4;
+    public static final int      FUNCTION                     = 6;
+    public static final int      ACCUMULATE                   = 28;
+    public static final int      RIGHT_SQUARE                 = 45;
+    public static final int      ACTIVATION_GROUP             = 23;
+    public static final int      ATTRIBUTES                   = 13;
+    public static final int      RIGHT_CURLY                  = 43;
+    public static final int      CONTAINS                     = 37;
+    public static final int      NO_LOOP                      = 21;
+    public static final int      LOCK_ON_ACTIVE               = 27;
+    public static final int      AGENDA_GROUP                 = 25;
+    public static final int      FLOAT                        = 40;
+    public static final int      SH_STYLE_SINGLE_LINE_COMMENT = 59;
+    public static final int      NOT                          = 49;
+    public static final int      AND                          = 46;
+    public static final int      ID                           = 33;
+    public static final int      EOF                          = -1;
+    public static final int      HexDigit                     = 56;
+    public static final int      DATE_EFFECTIVE               = 14;
+    public static final int      ACTION                       = 30;
+    public static final int      RIGHT_PAREN                  = 36;
+    public static final int      IMPORT                       = 5;
+    public static final int      EOL                          = 53;
+    public static final int      THEN                         = 52;
+    public static final int      MATCHES                      = 38;
+    public static final int      ENABLED                      = 17;
+    public static final int      EXISTS                       = 48;
+    public static final int      RULE                         = 11;
+    public static final int      EXCLUDES                     = 39;
+    public static final int      AUTO_FOCUS                   = 22;
+    public static final int      NULL                         = 41;
+    public static final int      BOOL                         = 18;
+    public static final int      FORALL                       = 51;
+    public static final int      SALIENCE                     = 19;
+    public static final int      RULEFLOW_GROUP               = 24;
+    public static final int      RESULT                       = 31;
+    public static final int      INT                          = 20;
+    public static final int      MULTI_LINE_COMMENT           = 61;
+    public static final int      DURATION                     = 26;
+    public static final int      WS                           = 54;
+    public static final int      EVAL                         = 50;
+    public static final int      TEMPLATE                     = 10;
+    public static final int      WHEN                         = 12;
+    public static final int      UnicodeEscape                = 57;
+    public static final int      LEFT_CURLY                   = 42;
+    public static final int      OR                           = 34;
+    public static final int      LEFT_PAREN                   = 35;
+    public static final int      QUERY                        = 8;
+    public static final int      MISC                         = 62;
+    public static final int      FROM                         = 47;
+    public static final int      END                          = 9;
+    public static final int      GLOBAL                       = 7;
+    public static final int      COLLECT                      = 32;
+    public static final int      LEFT_SQUARE                  = 44;
+    public static final int      INIT                         = 29;
+    public static final int      OctalEscape                  = 58;
+    public static final int      EscapeSequence               = 55;
+    public static final int      C_STYLE_SINGLE_LINE_COMMENT  = 60;
+    public static final int      DATE_EXPIRES                 = 16;
+    public static final int      STRING                       = 15;
 
-        public DRLParser(TokenStream input) {
-            super(input);
-            ruleMemo = new HashMap[176+1];
-         }
-        
+    public DRLParser(final TokenStream input) {
+        super( input );
+        this.ruleMemo = new HashMap[176 + 1];
+    }
 
-    public String[] getTokenNames() { return tokenNames; }
-    public String getGrammarFileName() { return "C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g"; }
+    public String[] getTokenNames() {
+        return tokenNames;
+    }
 
-    
-    	private PackageDescr packageDescr;
-    	private List errors = new ArrayList();
-    	private String source = "unknown";
-    	private int lineOffset = 0;
-    	private DescrFactory factory = new DescrFactory();
-    	private boolean parserDebug = false;
-    	
-    	// THE FOLLOWING LINE IS A DUMMY ATTRIBUTE TO WORK AROUND AN ANTLR BUG
-    	private BaseDescr from = null;
-    	
-    	public void setParserDebug(boolean parserDebug) {
-    		this.parserDebug = parserDebug;
-    	}
-    	
-    	public void debug(String message) {
-    		if ( parserDebug ) 
-    			System.err.println( "drl parser: " + message );
-    	}
-    	
-    	public void setSource(String source) {
-    		this.source = source;
-    	}
-    	public DescrFactory getFactory() {
-    		return factory;
-    	}	
-    
-    	public String getSource() {
-    		return this.source;
-    	}
-    	
-    	public PackageDescr getPackageDescr() {
-    		return packageDescr;
-    	}
-    	
-    	private int offset(int line) {
-    		return line + lineOffset;
-    	}
-    	
-    	/**
-    	 * This will set the offset to record when reparsing. Normally is zero of course 
-    	 */
-    	public void setLineOffset(int i) {
-    	 	this.lineOffset = i;
-    	}
-    	
-    	private String getString(Token token) {
-    		String orig = token.getText();
-    		return orig.substring( 1, orig.length() -1 );
-    	}
-    	
-    	public void reportError(RecognitionException ex) {
-    	        // if we've already reported an error and have not matched a token
-                    // yet successfully, don't report any errors.
-                    if ( errorRecovery ) {
-                            return;
-                    }
-                    errorRecovery = true;
-    
-    		ex.line = offset(ex.line); //add the offset if there is one
-    		errors.add( ex ); 
-    	}
-         	
-         	/** return the raw RecognitionException errors */
-         	public List getErrors() {
-         		return errors;
-         	}
-         	
-         	/** Return a list of pretty strings summarising the errors */
-         	public List getErrorMessages() {
-         		List messages = new ArrayList();
-     		for ( Iterator errorIter = errors.iterator() ; errorIter.hasNext() ; ) {
-         	     		messages.add( createErrorMessage( (RecognitionException) errorIter.next() ) );
-         	     	}
-         	     	return messages;
-         	}
-         	
-         	/** return true if any parser errors were accumulated */
-         	public boolean hasErrors() {
-      		return ! errors.isEmpty();
-         	}
-         	
-         	/** This will take a RecognitionException, and create a sensible error message out of it */
-         	public String createErrorMessage(RecognitionException e)
-            {
-    		StringBuffer message = new StringBuffer();		
-                    message.append( source + ":"+e.line+":"+e.charPositionInLine+" ");
-                    if ( e instanceof MismatchedTokenException ) {
-                            MismatchedTokenException mte = (MismatchedTokenException)e;
-                            message.append("mismatched token: "+
-                                                               e.token+
-                                                               "; expecting type "+
-                                                               tokenNames[mte.expecting]);
-                    }
-                    else if ( e instanceof MismatchedTreeNodeException ) {
-                            MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
-                            message.append("mismatched tree node: "+
-                                                               mtne.foundNode+
-                                                               "; expecting type "+
-                                                               tokenNames[mtne.expecting]);
-                    }
-                    else if ( e instanceof NoViableAltException ) {
-                            NoViableAltException nvae = (NoViableAltException)e;
-    			message.append( "Unexpected token '" + e.token.getText() + "'" );
-                            /*
-                            message.append("decision=<<"+nvae.grammarDecisionDescription+">>"+
-                                                               " state "+nvae.stateNumber+
-                                                               " (decision="+nvae.decisionNumber+
-                                                               ") no viable alt; token="+
-                                                               e.token);
-                                                               */
-                    }
-                    else if ( e instanceof EarlyExitException ) {
-                            EarlyExitException eee = (EarlyExitException)e;
-                            message.append("required (...)+ loop (decision="+
-                                                               eee.decisionNumber+
-                                                               ") did not match anything; token="+
-                                                               e.token);
-                    }
-                    else if ( e instanceof MismatchedSetException ) {
-                            MismatchedSetException mse = (MismatchedSetException)e;
-                            message.append("mismatched token '"+
-                                                               e.token+
-                                                               "' expecting set "+mse.expecting);
-                    }
-                    else if ( e instanceof MismatchedNotSetException ) {
-                            MismatchedNotSetException mse = (MismatchedNotSetException)e;
-                            message.append("mismatched token '"+
-                                                               e.token+
-                                                               "' expecting set "+mse.expecting);
-                    }
-                    else if ( e instanceof FailedPredicateException ) {
-                            FailedPredicateException fpe = (FailedPredicateException)e;
-                            message.append("rule "+fpe.ruleName+" failed predicate: {"+
-                                                               fpe.predicateText+"}?");
-                    } else if (e instanceof GeneralParseException) {
-    			message.append(" " + e.getMessage());
-    		}
-                   	return message.toString();
-            }   
-            
-            void checkTrailingSemicolon(String text, int line) {
-            	if (text.trim().endsWith( ";" ) ) {
-            		this.errors.add( new GeneralParseException( "Trailing semi-colon not allowed", offset(line) ) );
-            	}
-            }
-          
+    public String getGrammarFileName() {
+        return "C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g";
+    }
 
+    private PackageDescr packageDescr;
+    private final List         errors      = new ArrayList();
+    private String       source      = "unknown";
+    private int          lineOffset  = 0;
+    private final DescrFactory factory     = new DescrFactory();
+    private boolean      parserDebug = false;
 
+    // THE FOLLOWING LINE IS A DUMMY ATTRIBUTE TO WORK AROUND AN ANTLR BUG
+    private final BaseDescr    from        = null;
 
+    public void setParserDebug(final boolean parserDebug) {
+        this.parserDebug = parserDebug;
+    }
+
+    public void debug(final String message) {
+        if ( this.parserDebug ) {
+            System.err.println( "drl parser: " + message );
+        }
+    }
+
+    public void setSource(final String source) {
+        this.source = source;
+    }
+
+    public DescrFactory getFactory() {
+        return this.factory;
+    }
+
+    public String getSource() {
+        return this.source;
+    }
+
+    public PackageDescr getPackageDescr() {
+        return this.packageDescr;
+    }
+
+    private int offset(final int line) {
+        return line + this.lineOffset;
+    }
+
+    /**
+     * This will set the offset to record when reparsing. Normally is zero of course 
+     */
+    public void setLineOffset(final int i) {
+        this.lineOffset = i;
+    }
+
+    private String getString(final Token token) {
+        final String orig = token.getText();
+        return orig.substring( 1,
+                               orig.length() - 1 );
+    }
+
+    public void reportError(final RecognitionException ex) {
+        // if we've already reported an error and have not matched a token
+        // yet successfully, don't report any errors.
+        if ( this.errorRecovery ) {
+            return;
+        }
+        this.errorRecovery = true;
+
+        ex.line = offset( ex.line ); //add the offset if there is one
+        this.errors.add( ex );
+    }
+
+    /** return the raw RecognitionException errors */
+    public List getErrors() {
+        return this.errors;
+    }
+
+    /** Return a list of pretty strings summarising the errors */
+    public List getErrorMessages() {
+        final List messages = new ArrayList();
+        for ( final Iterator errorIter = this.errors.iterator(); errorIter.hasNext(); ) {
+            messages.add( createErrorMessage( (RecognitionException) errorIter.next() ) );
+        }
+        return messages;
+    }
+
+    /** return true if any parser errors were accumulated */
+    public boolean hasErrors() {
+        return !this.errors.isEmpty();
+    }
+
+    /** This will take a RecognitionException, and create a sensible error message out of it */
+    public String createErrorMessage(final RecognitionException e) {
+        final StringBuffer message = new StringBuffer();
+        message.append( this.source + ":" + e.line + ":" + e.charPositionInLine + " " );
+        if ( e instanceof MismatchedTokenException ) {
+            final MismatchedTokenException mte = (MismatchedTokenException) e;
+            message.append( "mismatched token: " + e.token + "; expecting type " + tokenNames[mte.expecting] );
+        } else if ( e instanceof MismatchedTreeNodeException ) {
+            final MismatchedTreeNodeException mtne = (MismatchedTreeNodeException) e;
+            message.append( "mismatched tree node: " + mtne.foundNode + "; expecting type " + tokenNames[mtne.expecting] );
+        } else if ( e instanceof NoViableAltException ) {
+            final NoViableAltException nvae = (NoViableAltException) e;
+            message.append( "Unexpected token '" + e.token.getText() + "'" );
+            /*
+             message.append("decision=<<"+nvae.grammarDecisionDescription+">>"+
+             " state "+nvae.stateNumber+
+             " (decision="+nvae.decisionNumber+
+             ") no viable alt; token="+
+             e.token);
+             */
+        } else if ( e instanceof EarlyExitException ) {
+            final EarlyExitException eee = (EarlyExitException) e;
+            message.append( "required (...)+ loop (decision=" + eee.decisionNumber + ") did not match anything; token=" + e.token );
+        } else if ( e instanceof MismatchedSetException ) {
+            final MismatchedSetException mse = (MismatchedSetException) e;
+            message.append( "mismatched token '" + e.token + "' expecting set " + mse.expecting );
+        } else if ( e instanceof MismatchedNotSetException ) {
+            final MismatchedNotSetException mse = (MismatchedNotSetException) e;
+            message.append( "mismatched token '" + e.token + "' expecting set " + mse.expecting );
+        } else if ( e instanceof FailedPredicateException ) {
+            final FailedPredicateException fpe = (FailedPredicateException) e;
+            message.append( "rule " + fpe.ruleName + " failed predicate: {" + fpe.predicateText + "}?" );
+        } else if ( e instanceof GeneralParseException ) {
+            message.append( " " + e.getMessage() );
+        }
+        return message.toString();
+    }
+
+    void checkTrailingSemicolon(final String text,
+                                final int line) {
+        if ( text.trim().endsWith( ";" ) ) {
+            this.errors.add( new GeneralParseException( "Trailing semi-colon not allowed",
+                                                        offset( line ) ) );
+        }
+    }
+
     // $ANTLR start opt_semicolon
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:168:1: opt_semicolon : ( ( ';' )=> ';' )? ;
     public void opt_semicolon() throws RecognitionException {
@@ -247,38 +228,41 @@
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:169:4: ( ( ( ';' )=> ';' )? )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:169:4: ( ( ';' )=> ';' )?
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:169:4: ( ( ';' )=> ';' )?
-            int alt1=2;
-            int LA1_0 = input.LA(1);
-            if ( (LA1_0==63) ) {
-                alt1=1;
-            }
-            switch (alt1) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: ( ';' )=> ';'
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:169:4: ( ( ';' )=> ';' )?
+                int alt1 = 2;
+                final int LA1_0 = this.input.LA( 1 );
+                if ( (LA1_0 == 63) ) {
+                    alt1 = 1;
+                }
+                switch ( alt1 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: ( ';' )=> ';'
                     {
-                    match(input,63,FOLLOW_63_in_opt_semicolon46); if (failed) return ;
+                        match( this.input,
+                               63,
+                               FOLLOW_63_in_opt_semicolon46 );
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
+        return;
     }
+
     // $ANTLR end opt_semicolon
 
-
     // $ANTLR start compilation_unit
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:172:1: compilation_unit : prolog ( ( statement )=> statement )+ ;
     public void compilation_unit() throws RecognitionException {
@@ -286,114 +270,118 @@
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:173:4: ( prolog ( ( statement )=> statement )+ )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:173:4: prolog ( ( statement )=> statement )+
             {
-            pushFollow(FOLLOW_prolog_in_compilation_unit58);
-            prolog();
-            _fsp--;
-            if (failed) return ;
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:174:3: ( ( statement )=> statement )+
-            int cnt2=0;
-            loop2:
-            do {
-                int alt2=2;
-                int LA2_0 = input.LA(1);
-                if ( ((LA2_0>=IMPORT && LA2_0<=QUERY)||(LA2_0>=TEMPLATE && LA2_0<=RULE)) ) {
-                    alt2=1;
+                pushFollow( FOLLOW_prolog_in_compilation_unit58 );
+                prolog();
+                this._fsp--;
+                if ( this.failed ) {
+                    return;
                 }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:174:3: ( ( statement )=> statement )+
+                int cnt2 = 0;
+                loop2 : do {
+                    int alt2 = 2;
+                    final int LA2_0 = this.input.LA( 1 );
+                    if ( ((LA2_0 >= IMPORT && LA2_0 <= QUERY) || (LA2_0 >= TEMPLATE && LA2_0 <= RULE)) ) {
+                        alt2 = 1;
+                    }
 
+                    switch ( alt2 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:174:5: ( statement )=> statement
+                        {
+                            pushFollow( FOLLOW_statement_in_compilation_unit65 );
+                            statement();
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return;
+                            }
 
-                switch (alt2) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:174:5: ( statement )=> statement
-            	    {
-            	    pushFollow(FOLLOW_statement_in_compilation_unit65);
-            	    statement();
-            	    _fsp--;
-            	    if (failed) return ;
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            if ( cnt2 >= 1 ) {
+                                break loop2;
+                            }
+                            if ( this.backtracking > 0 ) {
+                                this.failed = true;
+                                return;
+                            }
+                            final EarlyExitException eee = new EarlyExitException( 2,
+                                                                             this.input );
+                            throw eee;
+                    }
+                    cnt2++;
+                } while ( true );
 
-            	default :
-            	    if ( cnt2 >= 1 ) break loop2;
-            	    if (backtracking>0) {failed=true; return ;}
-                        EarlyExitException eee =
-                            new EarlyExitException(2, input);
-                        throw eee;
-                }
-                cnt2++;
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
+        return;
     }
+
     // $ANTLR end compilation_unit
 
-
     // $ANTLR start prolog
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:177:1: prolog : ( ( package_statement )=>n= package_statement )? ;
     public void prolog() throws RecognitionException {
         String n = null;
 
+        String packageName = "";
 
-        
-        		String packageName = "";
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:181:4: ( ( ( package_statement )=>n= package_statement )? )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:181:4: ( ( package_statement )=>n= package_statement )?
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:181:4: ( ( package_statement )=>n= package_statement )?
-            int alt3=2;
-            int LA3_0 = input.LA(1);
-            if ( (LA3_0==PACKAGE) ) {
-                alt3=1;
-            }
-            switch (alt3) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:181:6: ( package_statement )=>n= package_statement
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:181:4: ( ( package_statement )=>n= package_statement )?
+                int alt3 = 2;
+                final int LA3_0 = this.input.LA( 1 );
+                if ( (LA3_0 == PACKAGE) ) {
+                    alt3 = 1;
+                }
+                switch ( alt3 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:181:6: ( package_statement )=>n= package_statement
                     {
-                    pushFollow(FOLLOW_package_statement_in_prolog90);
-                    n=package_statement();
-                    _fsp--;
-                    if (failed) return ;
-                    if ( backtracking==0 ) {
-                       packageName = n; 
-                    }
+                        pushFollow( FOLLOW_package_statement_in_prolog90 );
+                        n = package_statement();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return;
+                        }
+                        if ( this.backtracking == 0 ) {
+                            packageName = n;
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-            if ( backtracking==0 ) {
-               
-              			this.packageDescr = factory.createPackage( packageName ); 
-              		
-            }
+                if ( this.backtracking == 0 ) {
 
+                    this.packageDescr = this.factory.createPackage( packageName );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
+        return;
     }
+
     // $ANTLR end prolog
 
-
     // $ANTLR start statement
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:187:1: statement : ( ( function_import_statement )=> function_import_statement | ( import_statement )=> import_statement | ( global )=> global | ( function )=> function | ( template )=>t= template | ( rule )=>r= rule | q= query ) ;
     public void statement() throws RecognitionException {
@@ -403,150 +391,173 @@
 
         QueryDescr q = null;
 
-
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:189:2: ( ( ( function_import_statement )=> function_import_statement | ( import_statement )=> import_statement | ( global )=> global | ( function )=> function | ( template )=>t= template | ( rule )=>r= rule | q= query ) )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:189:2: ( ( function_import_statement )=> function_import_statement | ( import_statement )=> import_statement | ( global )=> global | ( function )=> function | ( template )=>t= template | ( rule )=>r= rule | q= query )
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:189:2: ( ( function_import_statement )=> function_import_statement | ( import_statement )=> import_statement | ( global )=> global | ( function )=> function | ( template )=>t= template | ( rule )=>r= rule | q= query )
-            int alt4=7;
-            switch ( input.LA(1) ) {
-            case IMPORT:
-                if ( (synpred4()) ) {
-                    alt4=1;
-                }
-                else if ( (synpred5()) ) {
-                    alt4=2;
-                }
-                else {
-                    if (backtracking>0) {failed=true; return ;}
-                    NoViableAltException nvae =
-                        new NoViableAltException("189:2: ( ( function_import_statement )=> function_import_statement | ( import_statement )=> import_statement | ( global )=> global | ( function )=> function | ( template )=>t= template | ( rule )=>r= rule | q= query )", 4, 1, input);
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:189:2: ( ( function_import_statement )=> function_import_statement | ( import_statement )=> import_statement | ( global )=> global | ( function )=> function | ( template )=>t= template | ( rule )=>r= rule | q= query )
+                int alt4 = 7;
+                switch ( this.input.LA( 1 ) ) {
+                    case IMPORT :
+                        if ( (synpred4()) ) {
+                            alt4 = 1;
+                        } else if ( (synpred5()) ) {
+                            alt4 = 2;
+                        } else {
+                            if ( this.backtracking > 0 ) {
+                                this.failed = true;
+                                return;
+                            }
+                            final NoViableAltException nvae = new NoViableAltException( "189:2: ( ( function_import_statement )=> function_import_statement | ( import_statement )=> import_statement | ( global )=> global | ( function )=> function | ( template )=>t= template | ( rule )=>r= rule | q= query )",
+                                                                                  4,
+                                                                                  1,
+                                                                                  this.input );
 
-                    throw nvae;
+                            throw nvae;
+                        }
+                        break;
+                    case GLOBAL :
+                        alt4 = 3;
+                        break;
+                    case FUNCTION :
+                        alt4 = 4;
+                        break;
+                    case TEMPLATE :
+                        alt4 = 5;
+                        break;
+                    case RULE :
+                        alt4 = 6;
+                        break;
+                    case QUERY :
+                        alt4 = 7;
+                        break;
+                    default :
+                        if ( this.backtracking > 0 ) {
+                            this.failed = true;
+                            return;
+                        }
+                        final NoViableAltException nvae = new NoViableAltException( "189:2: ( ( function_import_statement )=> function_import_statement | ( import_statement )=> import_statement | ( global )=> global | ( function )=> function | ( template )=>t= template | ( rule )=>r= rule | q= query )",
+                                                                              4,
+                                                                              0,
+                                                                              this.input );
+
+                        throw nvae;
                 }
-                break;
-            case GLOBAL:
-                alt4=3;
-                break;
-            case FUNCTION:
-                alt4=4;
-                break;
-            case TEMPLATE:
-                alt4=5;
-                break;
-            case RULE:
-                alt4=6;
-                break;
-            case QUERY:
-                alt4=7;
-                break;
-            default:
-                if (backtracking>0) {failed=true; return ;}
-                NoViableAltException nvae =
-                    new NoViableAltException("189:2: ( ( function_import_statement )=> function_import_statement | ( import_statement )=> import_statement | ( global )=> global | ( function )=> function | ( template )=>t= template | ( rule )=>r= rule | q= query )", 4, 0, input);
 
-                throw nvae;
-            }
-
-            switch (alt4) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:189:4: ( function_import_statement )=> function_import_statement
+                switch ( alt4 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:189:4: ( function_import_statement )=> function_import_statement
                     {
-                    pushFollow(FOLLOW_function_import_statement_in_statement114);
-                    function_import_statement();
-                    _fsp--;
-                    if (failed) return ;
+                        pushFollow( FOLLOW_function_import_statement_in_statement114 );
+                        function_import_statement();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
-                case 2 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:190:4: ( import_statement )=> import_statement
+                        break;
+                    case 2 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:190:4: ( import_statement )=> import_statement
                     {
-                    pushFollow(FOLLOW_import_statement_in_statement120);
-                    import_statement();
-                    _fsp--;
-                    if (failed) return ;
+                        pushFollow( FOLLOW_import_statement_in_statement120 );
+                        import_statement();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
-                case 3 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:191:4: ( global )=> global
+                        break;
+                    case 3 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:191:4: ( global )=> global
                     {
-                    pushFollow(FOLLOW_global_in_statement126);
-                    global();
-                    _fsp--;
-                    if (failed) return ;
+                        pushFollow( FOLLOW_global_in_statement126 );
+                        global();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
-                case 4 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:192:4: ( function )=> function
+                        break;
+                    case 4 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:192:4: ( function )=> function
                     {
-                    pushFollow(FOLLOW_function_in_statement132);
-                    function();
-                    _fsp--;
-                    if (failed) return ;
+                        pushFollow( FOLLOW_function_in_statement132 );
+                        function();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
-                case 5 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:193:10: ( template )=>t= template
+                        break;
+                    case 5 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:193:10: ( template )=>t= template
                     {
-                    pushFollow(FOLLOW_template_in_statement146);
-                    t=template();
-                    _fsp--;
-                    if (failed) return ;
-                    if ( backtracking==0 ) {
-                      this.packageDescr.addFactTemplate( t ); 
-                    }
+                        pushFollow( FOLLOW_template_in_statement146 );
+                        t = template();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return;
+                        }
+                        if ( this.backtracking == 0 ) {
+                            this.packageDescr.addFactTemplate( t );
+                        }
 
                     }
-                    break;
-                case 6 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:194:4: ( rule )=>r= rule
+                        break;
+                    case 6 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:194:4: ( rule )=>r= rule
                     {
-                    pushFollow(FOLLOW_rule_in_statement155);
-                    r=rule();
-                    _fsp--;
-                    if (failed) return ;
-                    if ( backtracking==0 ) {
-                       if( r != null ) this.packageDescr.addRule( r ); 
-                    }
+                        pushFollow( FOLLOW_rule_in_statement155 );
+                        r = rule();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return;
+                        }
+                        if ( this.backtracking == 0 ) {
+                            if ( r != null ) {
+                                this.packageDescr.addRule( r );
+                            }
+                        }
 
                     }
-                    break;
-                case 7 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:195:4: q= query
+                        break;
+                    case 7 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:195:4: q= query
                     {
-                    pushFollow(FOLLOW_query_in_statement167);
-                    q=query();
-                    _fsp--;
-                    if (failed) return ;
-                    if ( backtracking==0 ) {
-                       if( q != null ) this.packageDescr.addRule( q ); 
-                    }
+                        pushFollow( FOLLOW_query_in_statement167 );
+                        q = query();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return;
+                        }
+                        if ( this.backtracking == 0 ) {
+                            if ( q != null ) {
+                                this.packageDescr.addRule( q );
+                            }
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
+        return;
     }
+
     // $ANTLR end statement
 
-
     // $ANTLR start package_statement
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:199:1: package_statement returns [String packageName] : PACKAGE n= dotted_name[null] opt_semicolon ;
     public String package_statement() throws RecognitionException {
@@ -554,305 +565,346 @@
 
         String n = null;
 
+        packageName = null;
 
-        
-        		packageName = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:204:3: ( PACKAGE n= dotted_name[null] opt_semicolon )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:204:3: PACKAGE n= dotted_name[null] opt_semicolon
             {
-            match(input,PACKAGE,FOLLOW_PACKAGE_in_package_statement196); if (failed) return packageName;
-            pushFollow(FOLLOW_dotted_name_in_package_statement200);
-            n=dotted_name(null);
-            _fsp--;
-            if (failed) return packageName;
-            pushFollow(FOLLOW_opt_semicolon_in_package_statement203);
-            opt_semicolon();
-            _fsp--;
-            if (failed) return packageName;
-            if ( backtracking==0 ) {
-              
-              			packageName = n;
-              		
-            }
+                match( this.input,
+                       PACKAGE,
+                       FOLLOW_PACKAGE_in_package_statement196 );
+                if ( this.failed ) {
+                    return packageName;
+                }
+                pushFollow( FOLLOW_dotted_name_in_package_statement200 );
+                n = dotted_name( null );
+                this._fsp--;
+                if ( this.failed ) {
+                    return packageName;
+                }
+                pushFollow( FOLLOW_opt_semicolon_in_package_statement203 );
+                opt_semicolon();
+                this._fsp--;
+                if ( this.failed ) {
+                    return packageName;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    packageName = n;
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return packageName;
     }
+
     // $ANTLR end package_statement
 
-
     // $ANTLR start import_statement
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:211:1: import_statement : imp= IMPORT import_name[importDecl] opt_semicolon ;
     public void import_statement() throws RecognitionException {
-        Token imp=null;
+        Token imp = null;
 
-        
-                	ImportDescr importDecl = null;
-                
+        ImportDescr importDecl = null;
+
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:215:4: (imp= IMPORT import_name[importDecl] opt_semicolon )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:215:4: imp= IMPORT import_name[importDecl] opt_semicolon
             {
-            imp=(Token)input.LT(1);
-            match(input,IMPORT,FOLLOW_IMPORT_in_import_statement235); if (failed) return ;
-            if ( backtracking==0 ) {
-              
-              	            importDecl = factory.createImport( );
-              	            importDecl.setStartCharacter( ((CommonToken)imp).getStartIndex() );
-              		    if (packageDescr != null) {
-              			packageDescr.addImport( importDecl );
-              		    }
-              	        
-            }
-            pushFollow(FOLLOW_import_name_in_import_statement258);
-            import_name(importDecl);
-            _fsp--;
-            if (failed) return ;
-            pushFollow(FOLLOW_opt_semicolon_in_import_statement261);
-            opt_semicolon();
-            _fsp--;
-            if (failed) return ;
+                imp = (Token) this.input.LT( 1 );
+                match( this.input,
+                       IMPORT,
+                       FOLLOW_IMPORT_in_import_statement235 );
+                if ( this.failed ) {
+                    return;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    importDecl = this.factory.createImport();
+                    importDecl.setStartCharacter( ((CommonToken) imp).getStartIndex() );
+                    if ( this.packageDescr != null ) {
+                        this.packageDescr.addImport( importDecl );
+                    }
+
+                }
+                pushFollow( FOLLOW_import_name_in_import_statement258 );
+                import_name( importDecl );
+                this._fsp--;
+                if ( this.failed ) {
+                    return;
+                }
+                pushFollow( FOLLOW_opt_semicolon_in_import_statement261 );
+                opt_semicolon();
+                this._fsp--;
+                if ( this.failed ) {
+                    return;
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
+        return;
     }
+
     // $ANTLR end import_statement
 
-
     // $ANTLR start function_import_statement
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:226:1: function_import_statement : imp= IMPORT FUNCTION import_name[importDecl] opt_semicolon ;
     public void function_import_statement() throws RecognitionException {
-        Token imp=null;
+        Token imp = null;
 
-        
-                	FunctionImportDescr importDecl = null;
-                
+        FunctionImportDescr importDecl = null;
+
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:230:4: (imp= IMPORT FUNCTION import_name[importDecl] opt_semicolon )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:230:4: imp= IMPORT FUNCTION import_name[importDecl] opt_semicolon
             {
-            imp=(Token)input.LT(1);
-            match(input,IMPORT,FOLLOW_IMPORT_in_function_import_statement287); if (failed) return ;
-            match(input,FUNCTION,FOLLOW_FUNCTION_in_function_import_statement289); if (failed) return ;
-            if ( backtracking==0 ) {
-              
-              	            importDecl = factory.createFunctionImport();
-              	            importDecl.setStartCharacter( ((CommonToken)imp).getStartIndex() );
-              		    if (packageDescr != null) {
-              			packageDescr.addFunctionImport( importDecl );
-              		    }
-              	        
-            }
-            pushFollow(FOLLOW_import_name_in_function_import_statement312);
-            import_name(importDecl);
-            _fsp--;
-            if (failed) return ;
-            pushFollow(FOLLOW_opt_semicolon_in_function_import_statement315);
-            opt_semicolon();
-            _fsp--;
-            if (failed) return ;
+                imp = (Token) this.input.LT( 1 );
+                match( this.input,
+                       IMPORT,
+                       FOLLOW_IMPORT_in_function_import_statement287 );
+                if ( this.failed ) {
+                    return;
+                }
+                match( this.input,
+                       FUNCTION,
+                       FOLLOW_FUNCTION_in_function_import_statement289 );
+                if ( this.failed ) {
+                    return;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    importDecl = this.factory.createFunctionImport();
+                    importDecl.setStartCharacter( ((CommonToken) imp).getStartIndex() );
+                    if ( this.packageDescr != null ) {
+                        this.packageDescr.addFunctionImport( importDecl );
+                    }
+
+                }
+                pushFollow( FOLLOW_import_name_in_function_import_statement312 );
+                import_name( importDecl );
+                this._fsp--;
+                if ( this.failed ) {
+                    return;
+                }
+                pushFollow( FOLLOW_opt_semicolon_in_function_import_statement315 );
+                opt_semicolon();
+                this._fsp--;
+                if ( this.failed ) {
+                    return;
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
+        return;
     }
+
     // $ANTLR end function_import_statement
 
-
     // $ANTLR start import_name
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:242:1: import_name[ImportDescr importDecl] returns [String name] : id= identifier ( ( '.' identifier )=> '.' id= identifier )* ( ( '.*' )=>star= '.*' )? ;
-    public String import_name(ImportDescr importDecl) throws RecognitionException {
+    public String import_name(final ImportDescr importDecl) throws RecognitionException {
         String name = null;
 
-        Token star=null;
+        Token star = null;
         Token id = null;
 
+        name = null;
 
-        
-        		name = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:247:3: (id= identifier ( ( '.' identifier )=> '.' id= identifier )* ( ( '.*' )=>star= '.*' )? )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:247:3: id= identifier ( ( '.' identifier )=> '.' id= identifier )* ( ( '.*' )=>star= '.*' )?
             {
-            pushFollow(FOLLOW_identifier_in_import_name343);
-            id=identifier();
-            _fsp--;
-            if (failed) return name;
-            if ( backtracking==0 ) {
-               
-              		    name=id.getText(); 
-              		    importDecl.setTarget( name );
-              		    importDecl.setEndCharacter( ((CommonToken)id).getStopIndex() );
-              		
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:253:3: ( ( '.' identifier )=> '.' id= identifier )*
-            loop5:
-            do {
-                int alt5=2;
-                int LA5_0 = input.LA(1);
-                if ( (LA5_0==64) ) {
-                    alt5=1;
+                pushFollow( FOLLOW_identifier_in_import_name343 );
+                id = identifier();
+                this._fsp--;
+                if ( this.failed ) {
+                    return name;
                 }
+                if ( this.backtracking == 0 ) {
 
+                    name = id.getText();
+                    importDecl.setTarget( name );
+                    importDecl.setEndCharacter( ((CommonToken) id).getStopIndex() );
 
-                switch (alt5) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:253:5: ( '.' identifier )=> '.' id= identifier
-            	    {
-            	    match(input,64,FOLLOW_64_in_import_name355); if (failed) return name;
-            	    pushFollow(FOLLOW_identifier_in_import_name359);
-            	    id=identifier();
-            	    _fsp--;
-            	    if (failed) return name;
-            	    if ( backtracking==0 ) {
-            	       
-            	      		        name = name + "." + id.getText(); 
-            	      			importDecl.setTarget( name );
-            	      		        importDecl.setEndCharacter( ((CommonToken)id).getStopIndex() );
-            	      		    
-            	    }
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:253:3: ( ( '.' identifier )=> '.' id= identifier )*
+                loop5 : do {
+                    int alt5 = 2;
+                    final int LA5_0 = this.input.LA( 1 );
+                    if ( (LA5_0 == 64) ) {
+                        alt5 = 1;
+                    }
 
-            	    }
-            	    break;
+                    switch ( alt5 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:253:5: ( '.' identifier )=> '.' id= identifier
+                        {
+                            match( this.input,
+                                   64,
+                                   FOLLOW_64_in_import_name355 );
+                            if ( this.failed ) {
+                                return name;
+                            }
+                            pushFollow( FOLLOW_identifier_in_import_name359 );
+                            id = identifier();
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return name;
+                            }
+                            if ( this.backtracking == 0 ) {
 
-            	default :
-            	    break loop5;
-                }
-            } while (true);
+                                name = name + "." + id.getText();
+                                importDecl.setTarget( name );
+                                importDecl.setEndCharacter( ((CommonToken) id).getStopIndex() );
 
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:260:3: ( ( '.*' )=>star= '.*' )?
-            int alt6=2;
-            int LA6_0 = input.LA(1);
-            if ( (LA6_0==65) ) {
-                alt6=1;
-            }
-            switch (alt6) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:260:5: ( '.*' )=>star= '.*'
-                    {
-                    star=(Token)input.LT(1);
-                    match(input,65,FOLLOW_65_in_import_name383); if (failed) return name;
-                    if ( backtracking==0 ) {
-                       
-                      		        name = name + star.getText(); 
-                      			importDecl.setTarget( name );
-                      		        importDecl.setEndCharacter( ((CommonToken)star).getStopIndex() );
-                      		    
+                            }
+
+                        }
+                            break;
+
+                        default :
+                            break loop5;
                     }
+                } while ( true );
 
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:260:3: ( ( '.*' )=>star= '.*' )?
+                int alt6 = 2;
+                final int LA6_0 = this.input.LA( 1 );
+                if ( (LA6_0 == 65) ) {
+                    alt6 = 1;
+                }
+                switch ( alt6 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:260:5: ( '.*' )=>star= '.*'
+                    {
+                        star = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               65,
+                               FOLLOW_65_in_import_name383 );
+                        if ( this.failed ) {
+                            return name;
+                        }
+                        if ( this.backtracking == 0 ) {
+
+                            name = name + star.getText();
+                            importDecl.setTarget( name );
+                            importDecl.setEndCharacter( ((CommonToken) star).getStopIndex() );
+
+                        }
+
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return name;
     }
+
     // $ANTLR end import_name
 
-
     // $ANTLR start global
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:270:1: global : loc= GLOBAL type= dotted_name[null] id= identifier opt_semicolon ;
     public void global() throws RecognitionException {
-        Token loc=null;
+        Token loc = null;
         String type = null;
 
         Token id = null;
 
+        GlobalDescr global = null;
 
-        
-        	    GlobalDescr global = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:275:3: (loc= GLOBAL type= dotted_name[null] id= identifier opt_semicolon )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:275:3: loc= GLOBAL type= dotted_name[null] id= identifier opt_semicolon
             {
-            loc=(Token)input.LT(1);
-            match(input,GLOBAL,FOLLOW_GLOBAL_in_global419); if (failed) return ;
-            if ( backtracking==0 ) {
-              
-              		    global = factory.createGlobal();
-              	            global.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              		    packageDescr.addGlobal( global );
-              		
-            }
-            pushFollow(FOLLOW_dotted_name_in_global430);
-            type=dotted_name(null);
-            _fsp--;
-            if (failed) return ;
-            if ( backtracking==0 ) {
-              
-              		    global.setType( type );
-              		
-            }
-            pushFollow(FOLLOW_identifier_in_global442);
-            id=identifier();
-            _fsp--;
-            if (failed) return ;
-            pushFollow(FOLLOW_opt_semicolon_in_global444);
-            opt_semicolon();
-            _fsp--;
-            if (failed) return ;
-            if ( backtracking==0 ) {
-              
-              		    global.setIdentifier( id.getText() );
-              		    global.setEndCharacter( ((CommonToken)id).getStopIndex() );
-              		
-            }
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       GLOBAL,
+                       FOLLOW_GLOBAL_in_global419 );
+                if ( this.failed ) {
+                    return;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    global = this.factory.createGlobal();
+                    global.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                    this.packageDescr.addGlobal( global );
+
+                }
+                pushFollow( FOLLOW_dotted_name_in_global430 );
+                type = dotted_name( null );
+                this._fsp--;
+                if ( this.failed ) {
+                    return;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    global.setType( type );
+
+                }
+                pushFollow( FOLLOW_identifier_in_global442 );
+                id = identifier();
+                this._fsp--;
+                if ( this.failed ) {
+                    return;
+                }
+                pushFollow( FOLLOW_opt_semicolon_in_global444 );
+                opt_semicolon();
+                this._fsp--;
+                if ( this.failed ) {
+                    return;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    global.setIdentifier( id.getText() );
+                    global.setEndCharacter( ((CommonToken) id).getStopIndex() );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
+        return;
     }
+
     // $ANTLR end global
 
-
     // $ANTLR start function
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:293:1: function : loc= FUNCTION ( ( dotted_name[null] )=>retType= dotted_name[null] )? n= identifier '(' ( ( ( ( dotted_name[null] )=> dotted_name[null] )? argument ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )* )=> ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument )* )? ')' body= curly_chunk[f] ;
     public void function() throws RecognitionException {
-        Token loc=null;
+        Token loc = null;
         String retType = null;
 
         Token n = null;
@@ -863,334 +915,401 @@
 
         String body = null;
 
+        FunctionDescr f = null;
 
-        
-        		FunctionDescr f = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:298:3: (loc= FUNCTION ( ( dotted_name[null] )=>retType= dotted_name[null] )? n= identifier '(' ( ( ( ( dotted_name[null] )=> dotted_name[null] )? argument ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )* )=> ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument )* )? ')' body= curly_chunk[f] )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:298:3: loc= FUNCTION ( ( dotted_name[null] )=>retType= dotted_name[null] )? n= identifier '(' ( ( ( ( dotted_name[null] )=> dotted_name[null] )? argument ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )* )=> ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument )* )? ')' body= curly_chunk[f]
             {
-            loc=(Token)input.LT(1);
-            match(input,FUNCTION,FOLLOW_FUNCTION_in_function471); if (failed) return ;
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:298:16: ( ( dotted_name[null] )=>retType= dotted_name[null] )?
-            int alt7=2;
-            int LA7_0 = input.LA(1);
-            if ( (LA7_0==ID) ) {
-                int LA7_1 = input.LA(2);
-                if ( ((LA7_1>=PACKAGE && LA7_1<=ATTRIBUTES)||LA7_1==ENABLED||LA7_1==SALIENCE||LA7_1==DURATION||(LA7_1>=ACCUMULATE && LA7_1<=OR)||(LA7_1>=CONTAINS && LA7_1<=EXCLUDES)||LA7_1==NULL||LA7_1==LEFT_SQUARE||(LA7_1>=AND && LA7_1<=THEN)||LA7_1==64) ) {
-                    alt7=1;
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       FUNCTION,
+                       FOLLOW_FUNCTION_in_function471 );
+                if ( this.failed ) {
+                    return;
                 }
-            }
-            switch (alt7) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:298:17: ( dotted_name[null] )=>retType= dotted_name[null]
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:298:16: ( ( dotted_name[null] )=>retType= dotted_name[null] )?
+                int alt7 = 2;
+                final int LA7_0 = this.input.LA( 1 );
+                if ( (LA7_0 == ID) ) {
+                    final int LA7_1 = this.input.LA( 2 );
+                    if ( ((LA7_1 >= PACKAGE && LA7_1 <= ATTRIBUTES) || LA7_1 == ENABLED || LA7_1 == SALIENCE || LA7_1 == DURATION || (LA7_1 >= ACCUMULATE && LA7_1 <= OR) || (LA7_1 >= CONTAINS && LA7_1 <= EXCLUDES) || LA7_1 == NULL
+                          || LA7_1 == LEFT_SQUARE || (LA7_1 >= AND && LA7_1 <= THEN) || LA7_1 == 64) ) {
+                        alt7 = 1;
+                    }
+                }
+                switch ( alt7 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:298:17: ( dotted_name[null] )=>retType= dotted_name[null]
                     {
-                    pushFollow(FOLLOW_dotted_name_in_function476);
-                    retType=dotted_name(null);
-                    _fsp--;
-                    if (failed) return ;
+                        pushFollow( FOLLOW_dotted_name_in_function476 );
+                        retType = dotted_name( null );
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-            pushFollow(FOLLOW_identifier_in_function483);
-            n=identifier();
-            _fsp--;
-            if (failed) return ;
-            if ( backtracking==0 ) {
-              
-              			//System.err.println( "function :: " + n.getText() );
-              			f = factory.createFunction( n.getText(), retType );
-              			f.setLocation(offset(loc.getLine()), loc.getCharPositionInLine());
-              	        	f.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			packageDescr.addFunction( f );
-              		
-            }
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_function492); if (failed) return ;
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:307:4: ( ( ( ( dotted_name[null] )=> dotted_name[null] )? argument ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )* )=> ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument )* )?
-            int alt11=2;
-            int LA11_0 = input.LA(1);
-            if ( ((LA11_0>=PACKAGE && LA11_0<=ATTRIBUTES)||LA11_0==ENABLED||LA11_0==SALIENCE||LA11_0==DURATION||(LA11_0>=ACCUMULATE && LA11_0<=OR)||(LA11_0>=CONTAINS && LA11_0<=EXCLUDES)||LA11_0==NULL||(LA11_0>=AND && LA11_0<=THEN)) ) {
-                alt11=1;
-            }
-            switch (alt11) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:307:6: ( ( ( dotted_name[null] )=> dotted_name[null] )? argument ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )* )=> ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument )*
+                pushFollow( FOLLOW_identifier_in_function483 );
+                n = identifier();
+                this._fsp--;
+                if ( this.failed ) {
+                    return;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    //System.err.println( "function :: " + n.getText() );
+                    f = this.factory.createFunction( n.getText(),
+                                                retType );
+                    f.setLocation( offset( loc.getLine() ),
+                                   loc.getCharPositionInLine() );
+                    f.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                    this.packageDescr.addFunction( f );
+
+                }
+                match( this.input,
+                       LEFT_PAREN,
+                       FOLLOW_LEFT_PAREN_in_function492 );
+                if ( this.failed ) {
+                    return;
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:307:4: ( ( ( ( dotted_name[null] )=> dotted_name[null] )? argument ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )* )=> ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument )* )?
+                int alt11 = 2;
+                final int LA11_0 = this.input.LA( 1 );
+                if ( ((LA11_0 >= PACKAGE && LA11_0 <= ATTRIBUTES) || LA11_0 == ENABLED || LA11_0 == SALIENCE || LA11_0 == DURATION || (LA11_0 >= ACCUMULATE && LA11_0 <= OR) || (LA11_0 >= CONTAINS && LA11_0 <= EXCLUDES) || LA11_0 == NULL || (LA11_0 >= AND && LA11_0 <= THEN)) ) {
+                    alt11 = 1;
+                }
+                switch ( alt11 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:307:6: ( ( ( dotted_name[null] )=> dotted_name[null] )? argument ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )* )=> ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument )*
                     {
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:307:6: ( ( dotted_name[null] )=>paramType= dotted_name[null] )?
-                    int alt8=2;
-                    alt8 = dfa8.predict(input);
-                    switch (alt8) {
-                        case 1 :
-                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:307:7: ( dotted_name[null] )=>paramType= dotted_name[null]
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:307:6: ( ( dotted_name[null] )=>paramType= dotted_name[null] )?
+                        int alt8 = 2;
+                        alt8 = this.dfa8.predict( this.input );
+                        switch ( alt8 ) {
+                            case 1 :
+                                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:307:7: ( dotted_name[null] )=>paramType= dotted_name[null]
                             {
-                            pushFollow(FOLLOW_dotted_name_in_function502);
-                            paramType=dotted_name(null);
-                            _fsp--;
-                            if (failed) return ;
+                                pushFollow( FOLLOW_dotted_name_in_function502 );
+                                paramType = dotted_name( null );
+                                this._fsp--;
+                                if ( this.failed ) {
+                                    return;
+                                }
 
                             }
-                            break;
+                                break;
 
-                    }
+                        }
 
-                    pushFollow(FOLLOW_argument_in_function509);
-                    paramName=argument();
-                    _fsp--;
-                    if (failed) return ;
-                    if ( backtracking==0 ) {
-                      
-                      					f.addParameter( paramType, paramName );
-                      				
-                    }
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:311:5: ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument )*
-                    loop10:
-                    do {
-                        int alt10=2;
-                        int LA10_0 = input.LA(1);
-                        if ( (LA10_0==66) ) {
-                            alt10=1;
+                        pushFollow( FOLLOW_argument_in_function509 );
+                        paramName = argument();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return;
                         }
+                        if ( this.backtracking == 0 ) {
 
+                            f.addParameter( paramType,
+                                            paramName );
 
-                        switch (alt10) {
-                    	case 1 :
-                    	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:311:7: ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument
-                    	    {
-                    	    match(input,66,FOLLOW_66_in_function523); if (failed) return ;
-                    	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:311:11: ( ( dotted_name[null] )=>paramType= dotted_name[null] )?
-                    	    int alt9=2;
-                    	    alt9 = dfa9.predict(input);
-                    	    switch (alt9) {
-                    	        case 1 :
-                    	            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:311:12: ( dotted_name[null] )=>paramType= dotted_name[null]
-                    	            {
-                    	            pushFollow(FOLLOW_dotted_name_in_function528);
-                    	            paramType=dotted_name(null);
-                    	            _fsp--;
-                    	            if (failed) return ;
+                        }
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:311:5: ( ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument )*
+                        loop10 : do {
+                            int alt10 = 2;
+                            final int LA10_0 = this.input.LA( 1 );
+                            if ( (LA10_0 == 66) ) {
+                                alt10 = 1;
+                            }
 
-                    	            }
-                    	            break;
+                            switch ( alt10 ) {
+                                case 1 :
+                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:311:7: ( ',' ( ( dotted_name[null] )=> dotted_name[null] )? argument )=> ',' ( ( dotted_name[null] )=>paramType= dotted_name[null] )? paramName= argument
+                                {
+                                    match( this.input,
+                                           66,
+                                           FOLLOW_66_in_function523 );
+                                    if ( this.failed ) {
+                                        return;
+                                    }
+                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:311:11: ( ( dotted_name[null] )=>paramType= dotted_name[null] )?
+                                    int alt9 = 2;
+                                    alt9 = this.dfa9.predict( this.input );
+                                    switch ( alt9 ) {
+                                        case 1 :
+                                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:311:12: ( dotted_name[null] )=>paramType= dotted_name[null]
+                                        {
+                                            pushFollow( FOLLOW_dotted_name_in_function528 );
+                                            paramType = dotted_name( null );
+                                            this._fsp--;
+                                            if ( this.failed ) {
+                                                return;
+                                            }
 
-                    	    }
+                                        }
+                                            break;
 
-                    	    pushFollow(FOLLOW_argument_in_function535);
-                    	    paramName=argument();
-                    	    _fsp--;
-                    	    if (failed) return ;
-                    	    if ( backtracking==0 ) {
-                    	      
-                    	      						f.addParameter( paramType, paramName );
-                    	      					
-                    	    }
+                                    }
 
-                    	    }
-                    	    break;
+                                    pushFollow( FOLLOW_argument_in_function535 );
+                                    paramName = argument();
+                                    this._fsp--;
+                                    if ( this.failed ) {
+                                        return;
+                                    }
+                                    if ( this.backtracking == 0 ) {
 
-                    	default :
-                    	    break loop10;
-                        }
-                    } while (true);
+                                        f.addParameter( paramType,
+                                                        paramName );
 
+                                    }
 
+                                }
+                                    break;
+
+                                default :
+                                    break loop10;
+                            }
+                        } while ( true );
+
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_function559); if (failed) return ;
-            pushFollow(FOLLOW_curly_chunk_in_function565);
-            body=curly_chunk(f);
-            _fsp--;
-            if (failed) return ;
-            if ( backtracking==0 ) {
-              
-              			//strip out '{','}'
-              			f.setText( body.substring( 1, body.length()-1 ) );
-              		
-            }
+                match( this.input,
+                       RIGHT_PAREN,
+                       FOLLOW_RIGHT_PAREN_in_function559 );
+                if ( this.failed ) {
+                    return;
+                }
+                pushFollow( FOLLOW_curly_chunk_in_function565 );
+                body = curly_chunk( f );
+                this._fsp--;
+                if ( this.failed ) {
+                    return;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    //strip out '{','}'
+                    f.setText( body.substring( 1,
+                                               body.length() - 1 ) );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
+        return;
     }
+
     // $ANTLR end function
 
-
     // $ANTLR start query
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:327:1: query returns [QueryDescr query] : loc= QUERY queryName= name ( normal_lhs_block[lhs] ) loc= END ;
     public QueryDescr query() throws RecognitionException {
         QueryDescr query = null;
 
-        Token loc=null;
+        Token loc = null;
         String queryName = null;
 
+        query = null;
+        AndDescr lhs = null;
 
-        
-        		query = null;
-        		AndDescr lhs = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:333:3: (loc= QUERY queryName= name ( normal_lhs_block[lhs] ) loc= END )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:333:3: loc= QUERY queryName= name ( normal_lhs_block[lhs] ) loc= END
             {
-            loc=(Token)input.LT(1);
-            match(input,QUERY,FOLLOW_QUERY_in_query597); if (failed) return query;
-            pushFollow(FOLLOW_name_in_query601);
-            queryName=name();
-            _fsp--;
-            if (failed) return query;
-            if ( backtracking==0 ) {
-               
-              			query = factory.createQuery( queryName ); 
-              			query.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			query.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			lhs = new AndDescr(); query.setLhs( lhs ); 
-              			lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              		
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:341:3: ( normal_lhs_block[lhs] )
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:342:4: normal_lhs_block[lhs]
-            {
-            pushFollow(FOLLOW_normal_lhs_block_in_query614);
-            normal_lhs_block(lhs);
-            _fsp--;
-            if (failed) return query;
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       QUERY,
+                       FOLLOW_QUERY_in_query597 );
+                if ( this.failed ) {
+                    return query;
+                }
+                pushFollow( FOLLOW_name_in_query601 );
+                queryName = name();
+                this._fsp--;
+                if ( this.failed ) {
+                    return query;
+                }
+                if ( this.backtracking == 0 ) {
 
-            }
+                    query = this.factory.createQuery( queryName );
+                    query.setLocation( offset( loc.getLine() ),
+                                       loc.getCharPositionInLine() );
+                    query.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                    lhs = new AndDescr();
+                    query.setLhs( lhs );
+                    lhs.setLocation( offset( loc.getLine() ),
+                                     loc.getCharPositionInLine() );
 
-            loc=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_query631); if (failed) return query;
-            if ( backtracking==0 ) {
-              
-              			query.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-              		
-            }
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:341:3: ( normal_lhs_block[lhs] )
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:342:4: normal_lhs_block[lhs]
+                {
+                    pushFollow( FOLLOW_normal_lhs_block_in_query614 );
+                    normal_lhs_block( lhs );
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return query;
+                    }
 
+                }
+
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       END,
+                       FOLLOW_END_in_query631 );
+                if ( this.failed ) {
+                    return query;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    query.setEndCharacter( ((CommonToken) loc).getStopIndex() );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return query;
     }
+
     // $ANTLR end query
 
-
     // $ANTLR start template
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:352:1: template returns [FactTemplateDescr template] : loc= TEMPLATE templateName= identifier opt_semicolon ( ( template_slot )=>slot= template_slot )+ loc= END opt_semicolon ;
     public FactTemplateDescr template() throws RecognitionException {
         FactTemplateDescr template = null;
 
-        Token loc=null;
+        Token loc = null;
         Token templateName = null;
 
         FieldTemplateDescr slot = null;
 
+        template = null;
 
-        
-        		template = null;		
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:357:3: (loc= TEMPLATE templateName= identifier opt_semicolon ( ( template_slot )=>slot= template_slot )+ loc= END opt_semicolon )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:357:3: loc= TEMPLATE templateName= identifier opt_semicolon ( ( template_slot )=>slot= template_slot )+ loc= END opt_semicolon
             {
-            loc=(Token)input.LT(1);
-            match(input,TEMPLATE,FOLLOW_TEMPLATE_in_template661); if (failed) return template;
-            pushFollow(FOLLOW_identifier_in_template665);
-            templateName=identifier();
-            _fsp--;
-            if (failed) return template;
-            pushFollow(FOLLOW_opt_semicolon_in_template667);
-            opt_semicolon();
-            _fsp--;
-            if (failed) return template;
-            if ( backtracking==0 ) {
-              
-              			template = new FactTemplateDescr(templateName.getText());
-              			template.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );			
-              			template.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              		
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:363:3: ( ( template_slot )=>slot= template_slot )+
-            int cnt12=0;
-            loop12:
-            do {
-                int alt12=2;
-                int LA12_0 = input.LA(1);
-                if ( (LA12_0==ID) ) {
-                    alt12=1;
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       TEMPLATE,
+                       FOLLOW_TEMPLATE_in_template661 );
+                if ( this.failed ) {
+                    return template;
                 }
+                pushFollow( FOLLOW_identifier_in_template665 );
+                templateName = identifier();
+                this._fsp--;
+                if ( this.failed ) {
+                    return template;
+                }
+                pushFollow( FOLLOW_opt_semicolon_in_template667 );
+                opt_semicolon();
+                this._fsp--;
+                if ( this.failed ) {
+                    return template;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    template = new FactTemplateDescr( templateName.getText() );
+                    template.setLocation( offset( loc.getLine() ),
+                                          loc.getCharPositionInLine() );
+                    template.setStartCharacter( ((CommonToken) loc).getStartIndex() );
 
-                switch (alt12) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:364:4: ( template_slot )=>slot= template_slot
-            	    {
-            	    pushFollow(FOLLOW_template_slot_in_template682);
-            	    slot=template_slot();
-            	    _fsp--;
-            	    if (failed) return template;
-            	    if ( backtracking==0 ) {
-            	      
-            	      				template.addFieldTemplate(slot);
-            	      			
-            	    }
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:363:3: ( ( template_slot )=>slot= template_slot )+
+                int cnt12 = 0;
+                loop12 : do {
+                    int alt12 = 2;
+                    final int LA12_0 = this.input.LA( 1 );
+                    if ( (LA12_0 == ID) ) {
+                        alt12 = 1;
+                    }
 
-            	    }
-            	    break;
+                    switch ( alt12 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:364:4: ( template_slot )=>slot= template_slot
+                        {
+                            pushFollow( FOLLOW_template_slot_in_template682 );
+                            slot = template_slot();
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return template;
+                            }
+                            if ( this.backtracking == 0 ) {
 
-            	default :
-            	    if ( cnt12 >= 1 ) break loop12;
-            	    if (backtracking>0) {failed=true; return template;}
-                        EarlyExitException eee =
-                            new EarlyExitException(12, input);
-                        throw eee;
+                                template.addFieldTemplate( slot );
+
+                            }
+
+                        }
+                            break;
+
+                        default :
+                            if ( cnt12 >= 1 ) {
+                                break loop12;
+                            }
+                            if ( this.backtracking > 0 ) {
+                                this.failed = true;
+                                return template;
+                            }
+                            final EarlyExitException eee = new EarlyExitException( 12,
+                                                                             this.input );
+                            throw eee;
+                    }
+                    cnt12++;
+                } while ( true );
+
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       END,
+                       FOLLOW_END_in_template699 );
+                if ( this.failed ) {
+                    return template;
                 }
-                cnt12++;
-            } while (true);
+                pushFollow( FOLLOW_opt_semicolon_in_template701 );
+                opt_semicolon();
+                this._fsp--;
+                if ( this.failed ) {
+                    return template;
+                }
+                if ( this.backtracking == 0 ) {
 
-            loc=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_template699); if (failed) return template;
-            pushFollow(FOLLOW_opt_semicolon_in_template701);
-            opt_semicolon();
-            _fsp--;
-            if (failed) return template;
-            if ( backtracking==0 ) {
-              
-              			template.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-              		
-            }
+                    template.setEndCharacter( ((CommonToken) loc).getStopIndex() );
 
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return template;
     }
+
     // $ANTLR end template
 
-
     // $ANTLR start template_slot
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:375:1: template_slot returns [FieldTemplateDescr field] : fieldType= dotted_name[field] n= identifier opt_semicolon ;
     public FieldTemplateDescr template_slot() throws RecognitionException {
@@ -1200,257 +1319,296 @@
 
         Token n = null;
 
+        field = null;
 
-        
-        		field = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:380:11: (fieldType= dotted_name[field] n= identifier opt_semicolon )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:380:11: fieldType= dotted_name[field] n= identifier opt_semicolon
             {
-            if ( backtracking==0 ) {
-              
-              			field = factory.createFieldTemplate();
-              	         
-            }
-            pushFollow(FOLLOW_dotted_name_in_template_slot747);
-            fieldType=dotted_name(field);
-            _fsp--;
-            if (failed) return field;
-            if ( backtracking==0 ) {
-              
-              		        field.setClassType( fieldType );
-              		 
-            }
-            pushFollow(FOLLOW_identifier_in_template_slot765);
-            n=identifier();
-            _fsp--;
-            if (failed) return field;
-            pushFollow(FOLLOW_opt_semicolon_in_template_slot767);
-            opt_semicolon();
-            _fsp--;
-            if (failed) return field;
-            if ( backtracking==0 ) {
-              
-              		        field.setName( n.getText() );
-              			field.setLocation( offset(n.getLine()), n.getCharPositionInLine() );
-              			field.setEndCharacter( ((CommonToken)n).getStopIndex() );
-              		 
-            }
+                if ( this.backtracking == 0 ) {
 
+                    field = this.factory.createFieldTemplate();
+
+                }
+                pushFollow( FOLLOW_dotted_name_in_template_slot747 );
+                fieldType = dotted_name( field );
+                this._fsp--;
+                if ( this.failed ) {
+                    return field;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    field.setClassType( fieldType );
+
+                }
+                pushFollow( FOLLOW_identifier_in_template_slot765 );
+                n = identifier();
+                this._fsp--;
+                if ( this.failed ) {
+                    return field;
+                }
+                pushFollow( FOLLOW_opt_semicolon_in_template_slot767 );
+                opt_semicolon();
+                this._fsp--;
+                if ( this.failed ) {
+                    return field;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    field.setName( n.getText() );
+                    field.setLocation( offset( n.getLine() ),
+                                       n.getCharPositionInLine() );
+                    field.setEndCharacter( ((CommonToken) n).getStopIndex() );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return field;
     }
+
     // $ANTLR end template_slot
 
-
     // $ANTLR start rule
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:396:1: rule returns [RuleDescr rule] : loc= RULE ruleName= name rule_attributes[rule] ( ( WHEN ( ( ':' )=> ':' )? ( normal_lhs_block[lhs] ) )=>loc= WHEN ( ( ':' )=> ':' )? ( normal_lhs_block[lhs] ) )? rhs_chunk[rule] ;
     public RuleDescr rule() throws RecognitionException {
         RuleDescr rule = null;
 
-        Token loc=null;
+        Token loc = null;
         String ruleName = null;
 
+        rule = null;
+        final String consequence = "";
+        AndDescr lhs = null;
 
-        
-        		rule = null;
-        		String consequence = "";
-        		AndDescr lhs = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:403:3: (loc= RULE ruleName= name rule_attributes[rule] ( ( WHEN ( ( ':' )=> ':' )? ( normal_lhs_block[lhs] ) )=>loc= WHEN ( ( ':' )=> ':' )? ( normal_lhs_block[lhs] ) )? rhs_chunk[rule] )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:403:3: loc= RULE ruleName= name rule_attributes[rule] ( ( WHEN ( ( ':' )=> ':' )? ( normal_lhs_block[lhs] ) )=>loc= WHEN ( ( ':' )=> ':' )? ( normal_lhs_block[lhs] ) )? rhs_chunk[rule]
             {
-            loc=(Token)input.LT(1);
-            match(input,RULE,FOLLOW_RULE_in_rule800); if (failed) return rule;
-            pushFollow(FOLLOW_name_in_rule804);
-            ruleName=name();
-            _fsp--;
-            if (failed) return rule;
-            if ( backtracking==0 ) {
-               
-              			debug( "start rule: " + ruleName );
-              			rule = new RuleDescr( ruleName, null ); 
-              			rule.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			rule.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              		
-            }
-            pushFollow(FOLLOW_rule_attributes_in_rule813);
-            rule_attributes(rule);
-            _fsp--;
-            if (failed) return rule;
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:411:3: ( ( WHEN ( ( ':' )=> ':' )? ( normal_lhs_block[lhs] ) )=>loc= WHEN ( ( ':' )=> ':' )? ( normal_lhs_block[lhs] ) )?
-            int alt14=2;
-            int LA14_0 = input.LA(1);
-            if ( (LA14_0==WHEN) ) {
-                alt14=1;
-            }
-            switch (alt14) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:411:5: ( WHEN ( ( ':' )=> ':' )? ( normal_lhs_block[lhs] ) )=>loc= WHEN ( ( ':' )=> ':' )? ( normal_lhs_block[lhs] )
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       RULE,
+                       FOLLOW_RULE_in_rule800 );
+                if ( this.failed ) {
+                    return rule;
+                }
+                pushFollow( FOLLOW_name_in_rule804 );
+                ruleName = name();
+                this._fsp--;
+                if ( this.failed ) {
+                    return rule;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    debug( "start rule: " + ruleName );
+                    rule = new RuleDescr( ruleName,
+                                          null );
+                    rule.setLocation( offset( loc.getLine() ),
+                                      loc.getCharPositionInLine() );
+                    rule.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+
+                }
+                pushFollow( FOLLOW_rule_attributes_in_rule813 );
+                rule_attributes( rule );
+                this._fsp--;
+                if ( this.failed ) {
+                    return rule;
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:411:3: ( ( WHEN ( ( ':' )=> ':' )? ( normal_lhs_block[lhs] ) )=>loc= WHEN ( ( ':' )=> ':' )? ( normal_lhs_block[lhs] ) )?
+                int alt14 = 2;
+                final int LA14_0 = this.input.LA( 1 );
+                if ( (LA14_0 == WHEN) ) {
+                    alt14 = 1;
+                }
+                switch ( alt14 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:411:5: ( WHEN ( ( ':' )=> ':' )? ( normal_lhs_block[lhs] ) )=>loc= WHEN ( ( ':' )=> ':' )? ( normal_lhs_block[lhs] )
                     {
-                    loc=(Token)input.LT(1);
-                    match(input,WHEN,FOLLOW_WHEN_in_rule822); if (failed) return rule;
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:411:14: ( ( ':' )=> ':' )?
-                    int alt13=2;
-                    int LA13_0 = input.LA(1);
-                    if ( (LA13_0==67) ) {
-                        alt13=1;
-                    }
-                    switch (alt13) {
-                        case 1 :
-                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: ( ':' )=> ':'
+                        loc = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               WHEN,
+                               FOLLOW_WHEN_in_rule822 );
+                        if ( this.failed ) {
+                            return rule;
+                        }
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:411:14: ( ( ':' )=> ':' )?
+                        int alt13 = 2;
+                        final int LA13_0 = this.input.LA( 1 );
+                        if ( (LA13_0 == 67) ) {
+                            alt13 = 1;
+                        }
+                        switch ( alt13 ) {
+                            case 1 :
+                                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: ( ':' )=> ':'
                             {
-                            match(input,67,FOLLOW_67_in_rule824); if (failed) return rule;
+                                match( this.input,
+                                       67,
+                                       FOLLOW_67_in_rule824 );
+                                if ( this.failed ) {
+                                    return rule;
+                                }
 
                             }
-                            break;
+                                break;
 
-                    }
+                        }
 
-                    if ( backtracking==0 ) {
-                       
-                      				lhs = new AndDescr(); rule.setLhs( lhs ); 
-                      				lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-                      				lhs.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-                      			
-                    }
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:417:4: ( normal_lhs_block[lhs] )
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:419:5: normal_lhs_block[lhs]
-                    {
-                    pushFollow(FOLLOW_normal_lhs_block_in_rule842);
-                    normal_lhs_block(lhs);
-                    _fsp--;
-                    if (failed) return rule;
+                        if ( this.backtracking == 0 ) {
 
-                    }
+                            lhs = new AndDescr();
+                            rule.setLhs( lhs );
+                            lhs.setLocation( offset( loc.getLine() ),
+                                             loc.getCharPositionInLine() );
+                            lhs.setStartCharacter( ((CommonToken) loc).getStartIndex() );
 
+                        }
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:417:4: ( normal_lhs_block[lhs] )
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:419:5: normal_lhs_block[lhs]
+                        {
+                            pushFollow( FOLLOW_normal_lhs_block_in_rule842 );
+                            normal_lhs_block( lhs );
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return rule;
+                            }
 
+                        }
+
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-            pushFollow(FOLLOW_rhs_chunk_in_rule863);
-            rhs_chunk(rule);
-            _fsp--;
-            if (failed) return rule;
+                pushFollow( FOLLOW_rhs_chunk_in_rule863 );
+                rhs_chunk( rule );
+                this._fsp--;
+                if ( this.failed ) {
+                    return rule;
+                }
 
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return rule;
     }
+
     // $ANTLR end rule
 
-
     // $ANTLR start rule_attributes
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:428:1: rule_attributes[RuleDescr rule] : ( ( ATTRIBUTES ':' )=> ATTRIBUTES ':' )? ( ( ( ( ',' )=> ',' )? rule_attribute )=> ( ( ',' )=> ',' )? a= rule_attribute )* ;
-    public void rule_attributes(RuleDescr rule) throws RecognitionException {
+    public void rule_attributes(final RuleDescr rule) throws RecognitionException {
         AttributeDescr a = null;
 
-
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:430:4: ( ( ( ATTRIBUTES ':' )=> ATTRIBUTES ':' )? ( ( ( ( ',' )=> ',' )? rule_attribute )=> ( ( ',' )=> ',' )? a= rule_attribute )* )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:430:4: ( ( ATTRIBUTES ':' )=> ATTRIBUTES ':' )? ( ( ( ( ',' )=> ',' )? rule_attribute )=> ( ( ',' )=> ',' )? a= rule_attribute )*
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:430:4: ( ( ATTRIBUTES ':' )=> ATTRIBUTES ':' )?
-            int alt15=2;
-            int LA15_0 = input.LA(1);
-            if ( (LA15_0==ATTRIBUTES) ) {
-                alt15=1;
-            }
-            switch (alt15) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:430:5: ( ATTRIBUTES ':' )=> ATTRIBUTES ':'
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:430:4: ( ( ATTRIBUTES ':' )=> ATTRIBUTES ':' )?
+                int alt15 = 2;
+                final int LA15_0 = this.input.LA( 1 );
+                if ( (LA15_0 == ATTRIBUTES) ) {
+                    alt15 = 1;
+                }
+                switch ( alt15 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:430:5: ( ATTRIBUTES ':' )=> ATTRIBUTES ':'
                     {
-                    match(input,ATTRIBUTES,FOLLOW_ATTRIBUTES_in_rule_attributes884); if (failed) return ;
-                    match(input,67,FOLLOW_67_in_rule_attributes886); if (failed) return ;
+                        match( this.input,
+                               ATTRIBUTES,
+                               FOLLOW_ATTRIBUTES_in_rule_attributes884 );
+                        if ( this.failed ) {
+                            return;
+                        }
+                        match( this.input,
+                               67,
+                               FOLLOW_67_in_rule_attributes886 );
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
-
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:431:4: ( ( ( ( ',' )=> ',' )? rule_attribute )=> ( ( ',' )=> ',' )? a= rule_attribute )*
-            loop17:
-            do {
-                int alt17=2;
-                int LA17_0 = input.LA(1);
-                if ( (LA17_0==DATE_EFFECTIVE||(LA17_0>=DATE_EXPIRES && LA17_0<=ENABLED)||LA17_0==SALIENCE||(LA17_0>=NO_LOOP && LA17_0<=LOCK_ON_ACTIVE)||LA17_0==66) ) {
-                    alt17=1;
                 }
 
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:431:4: ( ( ( ( ',' )=> ',' )? rule_attribute )=> ( ( ',' )=> ',' )? a= rule_attribute )*
+                loop17 : do {
+                    int alt17 = 2;
+                    final int LA17_0 = this.input.LA( 1 );
+                    if ( (LA17_0 == DATE_EFFECTIVE || (LA17_0 >= DATE_EXPIRES && LA17_0 <= ENABLED) || LA17_0 == SALIENCE || (LA17_0 >= NO_LOOP && LA17_0 <= LOCK_ON_ACTIVE) || LA17_0 == 66) ) {
+                        alt17 = 1;
+                    }
 
-                switch (alt17) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:431:6: ( ( ( ',' )=> ',' )? rule_attribute )=> ( ( ',' )=> ',' )? a= rule_attribute
-            	    {
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:431:6: ( ( ',' )=> ',' )?
-            	    int alt16=2;
-            	    int LA16_0 = input.LA(1);
-            	    if ( (LA16_0==66) ) {
-            	        alt16=1;
-            	    }
-            	    switch (alt16) {
-            	        case 1 :
-            	            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: ( ',' )=> ','
-            	            {
-            	            match(input,66,FOLLOW_66_in_rule_attributes895); if (failed) return ;
+                    switch ( alt17 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:431:6: ( ( ( ',' )=> ',' )? rule_attribute )=> ( ( ',' )=> ',' )? a= rule_attribute
+                        {
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:431:6: ( ( ',' )=> ',' )?
+                            int alt16 = 2;
+                            final int LA16_0 = this.input.LA( 1 );
+                            if ( (LA16_0 == 66) ) {
+                                alt16 = 1;
+                            }
+                            switch ( alt16 ) {
+                                case 1 :
+                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: ( ',' )=> ','
+                                {
+                                    match( this.input,
+                                           66,
+                                           FOLLOW_66_in_rule_attributes895 );
+                                    if ( this.failed ) {
+                                        return;
+                                    }
 
-            	            }
-            	            break;
+                                }
+                                    break;
 
-            	    }
+                            }
 
-            	    pushFollow(FOLLOW_rule_attribute_in_rule_attributes900);
-            	    a=rule_attribute();
-            	    _fsp--;
-            	    if (failed) return ;
-            	    if ( backtracking==0 ) {
-            	      
-            	      					rule.addAttribute( a );
-            	      				
-            	    }
+                            pushFollow( FOLLOW_rule_attribute_in_rule_attributes900 );
+                            a = rule_attribute();
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return;
+                            }
+                            if ( this.backtracking == 0 ) {
 
-            	    }
-            	    break;
+                                rule.addAttribute( a );
 
-            	default :
-            	    break loop17;
-                }
-            } while (true);
+                            }
 
+                        }
+                            break;
 
+                        default :
+                            break loop17;
+                    }
+                } while ( true );
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
+        return;
     }
+
     // $ANTLR end rule_attributes
 
-
     // $ANTLR start rule_attribute
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:440:1: rule_attribute returns [AttributeDescr d] : ( ( salience )=>a= salience | ( no_loop )=>a= no_loop | ( agenda_group )=>a= agenda_group | ( duration )=>a= duration | ( activation_group )=>a= activation_group | ( auto_focus )=>a= auto_focus | ( date_effective )=>a= date_effective | ( date_expires )=>a= date_expires | ( enabled )=>a= enabled | ( ruleflow_group )=>a= ruleflow_group | a= lock_on_active );
     public AttributeDescr rule_attribute() throws RecognitionException {
@@ -1458,938 +1616,1106 @@
 
         AttributeDescr a = null;
 
+        d = null;
 
-        
-        		d = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:445:4: ( ( salience )=>a= salience | ( no_loop )=>a= no_loop | ( agenda_group )=>a= agenda_group | ( duration )=>a= duration | ( activation_group )=>a= activation_group | ( auto_focus )=>a= auto_focus | ( date_effective )=>a= date_effective | ( date_expires )=>a= date_expires | ( enabled )=>a= enabled | ( ruleflow_group )=>a= ruleflow_group | a= lock_on_active )
-            int alt18=11;
-            switch ( input.LA(1) ) {
-            case SALIENCE:
-                alt18=1;
-                break;
-            case NO_LOOP:
-                alt18=2;
-                break;
-            case AGENDA_GROUP:
-                alt18=3;
-                break;
-            case DURATION:
-                alt18=4;
-                break;
-            case ACTIVATION_GROUP:
-                alt18=5;
-                break;
-            case AUTO_FOCUS:
-                alt18=6;
-                break;
-            case DATE_EFFECTIVE:
-                alt18=7;
-                break;
-            case DATE_EXPIRES:
-                alt18=8;
-                break;
-            case ENABLED:
-                alt18=9;
-                break;
-            case RULEFLOW_GROUP:
-                alt18=10;
-                break;
-            case LOCK_ON_ACTIVE:
-                alt18=11;
-                break;
-            default:
-                if (backtracking>0) {failed=true; return d;}
-                NoViableAltException nvae =
-                    new NoViableAltException("440:1: rule_attribute returns [AttributeDescr d] : ( ( salience )=>a= salience | ( no_loop )=>a= no_loop | ( agenda_group )=>a= agenda_group | ( duration )=>a= duration | ( activation_group )=>a= activation_group | ( auto_focus )=>a= auto_focus | ( date_effective )=>a= date_effective | ( date_expires )=>a= date_expires | ( enabled )=>a= enabled | ( ruleflow_group )=>a= ruleflow_group | a= lock_on_active );", 18, 0, input);
+            int alt18 = 11;
+            switch ( this.input.LA( 1 ) ) {
+                case SALIENCE :
+                    alt18 = 1;
+                    break;
+                case NO_LOOP :
+                    alt18 = 2;
+                    break;
+                case AGENDA_GROUP :
+                    alt18 = 3;
+                    break;
+                case DURATION :
+                    alt18 = 4;
+                    break;
+                case ACTIVATION_GROUP :
+                    alt18 = 5;
+                    break;
+                case AUTO_FOCUS :
+                    alt18 = 6;
+                    break;
+                case DATE_EFFECTIVE :
+                    alt18 = 7;
+                    break;
+                case DATE_EXPIRES :
+                    alt18 = 8;
+                    break;
+                case ENABLED :
+                    alt18 = 9;
+                    break;
+                case RULEFLOW_GROUP :
+                    alt18 = 10;
+                    break;
+                case LOCK_ON_ACTIVE :
+                    alt18 = 11;
+                    break;
+                default :
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return d;
+                    }
+                    final NoViableAltException nvae = new NoViableAltException( "440:1: rule_attribute returns [AttributeDescr d] : ( ( salience )=>a= salience | ( no_loop )=>a= no_loop | ( agenda_group )=>a= agenda_group | ( duration )=>a= duration | ( activation_group )=>a= activation_group | ( auto_focus )=>a= auto_focus | ( date_effective )=>a= date_effective | ( date_expires )=>a= date_expires | ( enabled )=>a= enabled | ( ruleflow_group )=>a= ruleflow_group | a= lock_on_active );",
+                                                                          18,
+                                                                          0,
+                                                                          this.input );
 
-                throw nvae;
+                    throw nvae;
             }
 
-            switch (alt18) {
+            switch ( alt18 ) {
                 case 1 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:445:4: ( salience )=>a= salience
-                    {
-                    pushFollow(FOLLOW_salience_in_rule_attribute941);
-                    a=salience();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                       d = a; 
+                {
+                    pushFollow( FOLLOW_salience_in_rule_attribute941 );
+                    a = salience();
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return d;
                     }
+                    if ( this.backtracking == 0 ) {
+                        d = a;
+                    }
 
-                    }
+                }
                     break;
                 case 2 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:446:5: ( no_loop )=>a= no_loop
-                    {
-                    pushFollow(FOLLOW_no_loop_in_rule_attribute951);
-                    a=no_loop();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                       d = a; 
+                {
+                    pushFollow( FOLLOW_no_loop_in_rule_attribute951 );
+                    a = no_loop();
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return d;
                     }
+                    if ( this.backtracking == 0 ) {
+                        d = a;
+                    }
 
-                    }
+                }
                     break;
                 case 3 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:447:5: ( agenda_group )=>a= agenda_group
-                    {
-                    pushFollow(FOLLOW_agenda_group_in_rule_attribute962);
-                    a=agenda_group();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                       d = a; 
+                {
+                    pushFollow( FOLLOW_agenda_group_in_rule_attribute962 );
+                    a = agenda_group();
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return d;
                     }
+                    if ( this.backtracking == 0 ) {
+                        d = a;
+                    }
 
-                    }
+                }
                     break;
                 case 4 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:448:5: ( duration )=>a= duration
-                    {
-                    pushFollow(FOLLOW_duration_in_rule_attribute975);
-                    a=duration();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                       d = a; 
+                {
+                    pushFollow( FOLLOW_duration_in_rule_attribute975 );
+                    a = duration();
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return d;
                     }
+                    if ( this.backtracking == 0 ) {
+                        d = a;
+                    }
 
-                    }
+                }
                     break;
                 case 5 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:449:5: ( activation_group )=>a= activation_group
-                    {
-                    pushFollow(FOLLOW_activation_group_in_rule_attribute989);
-                    a=activation_group();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                       d = a; 
+                {
+                    pushFollow( FOLLOW_activation_group_in_rule_attribute989 );
+                    a = activation_group();
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return d;
                     }
+                    if ( this.backtracking == 0 ) {
+                        d = a;
+                    }
 
-                    }
+                }
                     break;
                 case 6 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:450:5: ( auto_focus )=>a= auto_focus
-                    {
-                    pushFollow(FOLLOW_auto_focus_in_rule_attribute1000);
-                    a=auto_focus();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                       d = a; 
+                {
+                    pushFollow( FOLLOW_auto_focus_in_rule_attribute1000 );
+                    a = auto_focus();
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return d;
                     }
+                    if ( this.backtracking == 0 ) {
+                        d = a;
+                    }
 
-                    }
+                }
                     break;
                 case 7 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:451:5: ( date_effective )=>a= date_effective
-                    {
-                    pushFollow(FOLLOW_date_effective_in_rule_attribute1011);
-                    a=date_effective();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                      d = a; 
+                {
+                    pushFollow( FOLLOW_date_effective_in_rule_attribute1011 );
+                    a = date_effective();
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return d;
                     }
+                    if ( this.backtracking == 0 ) {
+                        d = a;
+                    }
 
-                    }
+                }
                     break;
                 case 8 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:452:5: ( date_expires )=>a= date_expires
-                    {
-                    pushFollow(FOLLOW_date_expires_in_rule_attribute1021);
-                    a=date_expires();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                      d = a; 
+                {
+                    pushFollow( FOLLOW_date_expires_in_rule_attribute1021 );
+                    a = date_expires();
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return d;
                     }
+                    if ( this.backtracking == 0 ) {
+                        d = a;
+                    }
 
-                    }
+                }
                     break;
                 case 9 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:453:5: ( enabled )=>a= enabled
-                    {
-                    pushFollow(FOLLOW_enabled_in_rule_attribute1031);
-                    a=enabled();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                      d=a;
+                {
+                    pushFollow( FOLLOW_enabled_in_rule_attribute1031 );
+                    a = enabled();
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return d;
                     }
+                    if ( this.backtracking == 0 ) {
+                        d = a;
+                    }
 
-                    }
+                }
                     break;
                 case 10 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:454:5: ( ruleflow_group )=>a= ruleflow_group
-                    {
-                    pushFollow(FOLLOW_ruleflow_group_in_rule_attribute1041);
-                    a=ruleflow_group();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                       d = a; 
+                {
+                    pushFollow( FOLLOW_ruleflow_group_in_rule_attribute1041 );
+                    a = ruleflow_group();
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return d;
                     }
+                    if ( this.backtracking == 0 ) {
+                        d = a;
+                    }
 
-                    }
+                }
                     break;
                 case 11 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:455:5: a= lock_on_active
-                    {
-                    pushFollow(FOLLOW_lock_on_active_in_rule_attribute1051);
-                    a=lock_on_active();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                       d = a; 
+                {
+                    pushFollow( FOLLOW_lock_on_active_in_rule_attribute1051 );
+                    a = lock_on_active();
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return d;
                     }
+                    if ( this.backtracking == 0 ) {
+                        d = a;
+                    }
 
-                    }
+                }
                     break;
 
             }
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end rule_attribute
 
-
     // $ANTLR start date_effective
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:459:1: date_effective returns [AttributeDescr d] : loc= DATE_EFFECTIVE val= STRING ;
     public AttributeDescr date_effective() throws RecognitionException {
         AttributeDescr d = null;
 
-        Token loc=null;
-        Token val=null;
+        Token loc = null;
+        Token val = null;
 
-        
-        		d = null;
-        	
+        d = null;
+
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:464:3: (loc= DATE_EFFECTIVE val= STRING )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:464:3: loc= DATE_EFFECTIVE val= STRING
             {
-            loc=(Token)input.LT(1);
-            match(input,DATE_EFFECTIVE,FOLLOW_DATE_EFFECTIVE_in_date_effective1082); if (failed) return d;
-            val=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_date_effective1086); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              			d = new AttributeDescr( "date-effective", getString( val ) );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			d.setEndCharacter( ((CommonToken)val).getStopIndex() );
-              		
-            }
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       DATE_EFFECTIVE,
+                       FOLLOW_DATE_EFFECTIVE_in_date_effective1082 );
+                if ( this.failed ) {
+                    return d;
+                }
+                val = (Token) this.input.LT( 1 );
+                match( this.input,
+                       STRING,
+                       FOLLOW_STRING_in_date_effective1086 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    d = new AttributeDescr( "date-effective",
+                                            getString( val ) );
+                    d.setLocation( offset( loc.getLine() ),
+                                   loc.getCharPositionInLine() );
+                    d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                    d.setEndCharacter( ((CommonToken) val).getStopIndex() );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end date_effective
 
-
     // $ANTLR start date_expires
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:474:1: date_expires returns [AttributeDescr d] : loc= DATE_EXPIRES val= STRING ;
     public AttributeDescr date_expires() throws RecognitionException {
         AttributeDescr d = null;
 
-        Token loc=null;
-        Token val=null;
+        Token loc = null;
+        Token val = null;
 
-        
-        		d = null;
-        	
+        d = null;
+
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:479:3: (loc= DATE_EXPIRES val= STRING )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:479:3: loc= DATE_EXPIRES val= STRING
             {
-            loc=(Token)input.LT(1);
-            match(input,DATE_EXPIRES,FOLLOW_DATE_EXPIRES_in_date_expires1119); if (failed) return d;
-            val=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_date_expires1123); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              			d = new AttributeDescr( "date-expires", getString( val ) );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			d.setEndCharacter( ((CommonToken)val).getStopIndex() );
-              		
-            }
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       DATE_EXPIRES,
+                       FOLLOW_DATE_EXPIRES_in_date_expires1119 );
+                if ( this.failed ) {
+                    return d;
+                }
+                val = (Token) this.input.LT( 1 );
+                match( this.input,
+                       STRING,
+                       FOLLOW_STRING_in_date_expires1123 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    d = new AttributeDescr( "date-expires",
+                                            getString( val ) );
+                    d.setLocation( offset( loc.getLine() ),
+                                   loc.getCharPositionInLine() );
+                    d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                    d.setEndCharacter( ((CommonToken) val).getStopIndex() );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end date_expires
 
-
     // $ANTLR start enabled
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:490:1: enabled returns [AttributeDescr d] : loc= ENABLED t= BOOL ;
     public AttributeDescr enabled() throws RecognitionException {
         AttributeDescr d = null;
 
-        Token loc=null;
-        Token t=null;
+        Token loc = null;
+        Token t = null;
 
-        
-        		d = null;
-        	
+        d = null;
+
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:495:4: (loc= ENABLED t= BOOL )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:495:4: loc= ENABLED t= BOOL
             {
-            loc=(Token)input.LT(1);
-            match(input,ENABLED,FOLLOW_ENABLED_in_enabled1158); if (failed) return d;
-            t=(Token)input.LT(1);
-            match(input,BOOL,FOLLOW_BOOL_in_enabled1162); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              				d = new AttributeDescr( "enabled", t.getText() );
-              				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
-              			
-            }
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       ENABLED,
+                       FOLLOW_ENABLED_in_enabled1158 );
+                if ( this.failed ) {
+                    return d;
+                }
+                t = (Token) this.input.LT( 1 );
+                match( this.input,
+                       BOOL,
+                       FOLLOW_BOOL_in_enabled1162 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    d = new AttributeDescr( "enabled",
+                                            t.getText() );
+                    d.setLocation( offset( loc.getLine() ),
+                                   loc.getCharPositionInLine() );
+                    d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                    d.setEndCharacter( ((CommonToken) t).getStopIndex() );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end enabled
 
-
     // $ANTLR start salience
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:508:1: salience returns [AttributeDescr d ] : loc= SALIENCE i= INT ;
     public AttributeDescr salience() throws RecognitionException {
         AttributeDescr d = null;
 
-        Token loc=null;
-        Token i=null;
+        Token loc = null;
+        Token i = null;
 
-        
-        		d = null;
-        	
+        d = null;
+
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:513:3: (loc= SALIENCE i= INT )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:513:3: loc= SALIENCE i= INT
             {
-            loc=(Token)input.LT(1);
-            match(input,SALIENCE,FOLLOW_SALIENCE_in_salience1207); if (failed) return d;
-            i=(Token)input.LT(1);
-            match(input,INT,FOLLOW_INT_in_salience1211); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              			d = new AttributeDescr( "salience", i.getText() );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			d.setEndCharacter( ((CommonToken)i).getStopIndex() );
-              		
-            }
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       SALIENCE,
+                       FOLLOW_SALIENCE_in_salience1207 );
+                if ( this.failed ) {
+                    return d;
+                }
+                i = (Token) this.input.LT( 1 );
+                match( this.input,
+                       INT,
+                       FOLLOW_INT_in_salience1211 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    d = new AttributeDescr( "salience",
+                                            i.getText() );
+                    d.setLocation( offset( loc.getLine() ),
+                                   loc.getCharPositionInLine() );
+                    d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                    d.setEndCharacter( ((CommonToken) i).getStopIndex() );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end salience
 
-
     // $ANTLR start no_loop
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:522:1: no_loop returns [AttributeDescr d] : ( ( ( NO_LOOP ) )=> (loc= NO_LOOP ) | (loc= NO_LOOP t= BOOL ) );
     public AttributeDescr no_loop() throws RecognitionException {
         AttributeDescr d = null;
 
-        Token loc=null;
-        Token t=null;
+        Token loc = null;
+        Token t = null;
 
-        
-        		d = null;
-        	
+        d = null;
+
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:527:3: ( ( ( NO_LOOP ) )=> (loc= NO_LOOP ) | (loc= NO_LOOP t= BOOL ) )
-            int alt19=2;
-            int LA19_0 = input.LA(1);
-            if ( (LA19_0==NO_LOOP) ) {
-                int LA19_1 = input.LA(2);
-                if ( (LA19_1==BOOL) ) {
-                    alt19=2;
-                }
-                else if ( (LA19_1==EOF||LA19_1==WHEN||LA19_1==DATE_EFFECTIVE||(LA19_1>=DATE_EXPIRES && LA19_1<=ENABLED)||LA19_1==SALIENCE||(LA19_1>=NO_LOOP && LA19_1<=LOCK_ON_ACTIVE)||LA19_1==THEN||LA19_1==66) ) {
-                    alt19=1;
-                }
-                else {
-                    if (backtracking>0) {failed=true; return d;}
-                    NoViableAltException nvae =
-                        new NoViableAltException("522:1: no_loop returns [AttributeDescr d] : ( ( ( NO_LOOP ) )=> (loc= NO_LOOP ) | (loc= NO_LOOP t= BOOL ) );", 19, 1, input);
+            int alt19 = 2;
+            final int LA19_0 = this.input.LA( 1 );
+            if ( (LA19_0 == NO_LOOP) ) {
+                final int LA19_1 = this.input.LA( 2 );
+                if ( (LA19_1 == BOOL) ) {
+                    alt19 = 2;
+                } else if ( (LA19_1 == EOF || LA19_1 == WHEN || LA19_1 == DATE_EFFECTIVE || (LA19_1 >= DATE_EXPIRES && LA19_1 <= ENABLED) || LA19_1 == SALIENCE || (LA19_1 >= NO_LOOP && LA19_1 <= LOCK_ON_ACTIVE) || LA19_1 == THEN || LA19_1 == 66) ) {
+                    alt19 = 1;
+                } else {
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return d;
+                    }
+                    final NoViableAltException nvae = new NoViableAltException( "522:1: no_loop returns [AttributeDescr d] : ( ( ( NO_LOOP ) )=> (loc= NO_LOOP ) | (loc= NO_LOOP t= BOOL ) );",
+                                                                          19,
+                                                                          1,
+                                                                          this.input );
 
                     throw nvae;
                 }
-            }
-            else {
-                if (backtracking>0) {failed=true; return d;}
-                NoViableAltException nvae =
-                    new NoViableAltException("522:1: no_loop returns [AttributeDescr d] : ( ( ( NO_LOOP ) )=> (loc= NO_LOOP ) | (loc= NO_LOOP t= BOOL ) );", 19, 0, input);
+            } else {
+                if ( this.backtracking > 0 ) {
+                    this.failed = true;
+                    return d;
+                }
+                final NoViableAltException nvae = new NoViableAltException( "522:1: no_loop returns [AttributeDescr d] : ( ( ( NO_LOOP ) )=> (loc= NO_LOOP ) | (loc= NO_LOOP t= BOOL ) );",
+                                                                      19,
+                                                                      0,
+                                                                      this.input );
 
                 throw nvae;
             }
-            switch (alt19) {
+            switch ( alt19 ) {
                 case 1 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:527:3: ( ( NO_LOOP ) )=> (loc= NO_LOOP )
-                    {
+                {
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:527:3: (loc= NO_LOOP )
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:528:4: loc= NO_LOOP
                     {
-                    loc=(Token)input.LT(1);
-                    match(input,NO_LOOP,FOLLOW_NO_LOOP_in_no_loop1249); if (failed) return d;
-                    if ( backtracking==0 ) {
-                      
-                      				d = new AttributeDescr( "no-loop", "true" );
-                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-                      				d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-                      			
-                    }
+                        loc = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               NO_LOOP,
+                               FOLLOW_NO_LOOP_in_no_loop1249 );
+                        if ( this.failed ) {
+                            return d;
+                        }
+                        if ( this.backtracking == 0 ) {
 
-                    }
+                            d = new AttributeDescr( "no-loop",
+                                                    "true" );
+                            d.setLocation( offset( loc.getLine() ),
+                                           loc.getCharPositionInLine() );
+                            d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                            d.setEndCharacter( ((CommonToken) loc).getStopIndex() );
 
+                        }
 
                     }
+
+                }
                     break;
                 case 2 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:537:3: (loc= NO_LOOP t= BOOL )
-                    {
+                {
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:537:3: (loc= NO_LOOP t= BOOL )
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:538:4: loc= NO_LOOP t= BOOL
                     {
-                    loc=(Token)input.LT(1);
-                    match(input,NO_LOOP,FOLLOW_NO_LOOP_in_no_loop1277); if (failed) return d;
-                    t=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_no_loop1281); if (failed) return d;
-                    if ( backtracking==0 ) {
-                      
-                      				d = new AttributeDescr( "no-loop", t.getText() );
-                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-                      				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
-                      			
-                    }
+                        loc = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               NO_LOOP,
+                               FOLLOW_NO_LOOP_in_no_loop1277 );
+                        if ( this.failed ) {
+                            return d;
+                        }
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               BOOL,
+                               FOLLOW_BOOL_in_no_loop1281 );
+                        if ( this.failed ) {
+                            return d;
+                        }
+                        if ( this.backtracking == 0 ) {
 
-                    }
+                            d = new AttributeDescr( "no-loop",
+                                                    t.getText() );
+                            d.setLocation( offset( loc.getLine() ),
+                                           loc.getCharPositionInLine() );
+                            d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                            d.setEndCharacter( ((CommonToken) t).getStopIndex() );
 
+                        }
 
                     }
+
+                }
                     break;
 
             }
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end no_loop
 
-
     // $ANTLR start auto_focus
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:550:1: auto_focus returns [AttributeDescr d] : ( ( ( AUTO_FOCUS ) )=> (loc= AUTO_FOCUS ) | (loc= AUTO_FOCUS t= BOOL ) );
     public AttributeDescr auto_focus() throws RecognitionException {
         AttributeDescr d = null;
 
-        Token loc=null;
-        Token t=null;
+        Token loc = null;
+        Token t = null;
 
-        
-        		d = null;
-        	
+        d = null;
+
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:555:3: ( ( ( AUTO_FOCUS ) )=> (loc= AUTO_FOCUS ) | (loc= AUTO_FOCUS t= BOOL ) )
-            int alt20=2;
-            int LA20_0 = input.LA(1);
-            if ( (LA20_0==AUTO_FOCUS) ) {
-                int LA20_1 = input.LA(2);
-                if ( (LA20_1==BOOL) ) {
-                    alt20=2;
-                }
-                else if ( (LA20_1==EOF||LA20_1==WHEN||LA20_1==DATE_EFFECTIVE||(LA20_1>=DATE_EXPIRES && LA20_1<=ENABLED)||LA20_1==SALIENCE||(LA20_1>=NO_LOOP && LA20_1<=LOCK_ON_ACTIVE)||LA20_1==THEN||LA20_1==66) ) {
-                    alt20=1;
-                }
-                else {
-                    if (backtracking>0) {failed=true; return d;}
-                    NoViableAltException nvae =
-                        new NoViableAltException("550:1: auto_focus returns [AttributeDescr d] : ( ( ( AUTO_FOCUS ) )=> (loc= AUTO_FOCUS ) | (loc= AUTO_FOCUS t= BOOL ) );", 20, 1, input);
+            int alt20 = 2;
+            final int LA20_0 = this.input.LA( 1 );
+            if ( (LA20_0 == AUTO_FOCUS) ) {
+                final int LA20_1 = this.input.LA( 2 );
+                if ( (LA20_1 == BOOL) ) {
+                    alt20 = 2;
+                } else if ( (LA20_1 == EOF || LA20_1 == WHEN || LA20_1 == DATE_EFFECTIVE || (LA20_1 >= DATE_EXPIRES && LA20_1 <= ENABLED) || LA20_1 == SALIENCE || (LA20_1 >= NO_LOOP && LA20_1 <= LOCK_ON_ACTIVE) || LA20_1 == THEN || LA20_1 == 66) ) {
+                    alt20 = 1;
+                } else {
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return d;
+                    }
+                    final NoViableAltException nvae = new NoViableAltException( "550:1: auto_focus returns [AttributeDescr d] : ( ( ( AUTO_FOCUS ) )=> (loc= AUTO_FOCUS ) | (loc= AUTO_FOCUS t= BOOL ) );",
+                                                                          20,
+                                                                          1,
+                                                                          this.input );
 
                     throw nvae;
                 }
-            }
-            else {
-                if (backtracking>0) {failed=true; return d;}
-                NoViableAltException nvae =
-                    new NoViableAltException("550:1: auto_focus returns [AttributeDescr d] : ( ( ( AUTO_FOCUS ) )=> (loc= AUTO_FOCUS ) | (loc= AUTO_FOCUS t= BOOL ) );", 20, 0, input);
+            } else {
+                if ( this.backtracking > 0 ) {
+                    this.failed = true;
+                    return d;
+                }
+                final NoViableAltException nvae = new NoViableAltException( "550:1: auto_focus returns [AttributeDescr d] : ( ( ( AUTO_FOCUS ) )=> (loc= AUTO_FOCUS ) | (loc= AUTO_FOCUS t= BOOL ) );",
+                                                                      20,
+                                                                      0,
+                                                                      this.input );
 
                 throw nvae;
             }
-            switch (alt20) {
+            switch ( alt20 ) {
                 case 1 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:555:3: ( ( AUTO_FOCUS ) )=> (loc= AUTO_FOCUS )
-                    {
+                {
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:555:3: (loc= AUTO_FOCUS )
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:556:4: loc= AUTO_FOCUS
                     {
-                    loc=(Token)input.LT(1);
-                    match(input,AUTO_FOCUS,FOLLOW_AUTO_FOCUS_in_auto_focus1330); if (failed) return d;
-                    if ( backtracking==0 ) {
-                      
-                      				d = new AttributeDescr( "auto-focus", "true" );
-                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-                      				d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-                      			
-                    }
+                        loc = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               AUTO_FOCUS,
+                               FOLLOW_AUTO_FOCUS_in_auto_focus1330 );
+                        if ( this.failed ) {
+                            return d;
+                        }
+                        if ( this.backtracking == 0 ) {
 
-                    }
+                            d = new AttributeDescr( "auto-focus",
+                                                    "true" );
+                            d.setLocation( offset( loc.getLine() ),
+                                           loc.getCharPositionInLine() );
+                            d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                            d.setEndCharacter( ((CommonToken) loc).getStopIndex() );
 
+                        }
 
                     }
+
+                }
                     break;
                 case 2 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:565:3: (loc= AUTO_FOCUS t= BOOL )
-                    {
+                {
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:565:3: (loc= AUTO_FOCUS t= BOOL )
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:566:4: loc= AUTO_FOCUS t= BOOL
                     {
-                    loc=(Token)input.LT(1);
-                    match(input,AUTO_FOCUS,FOLLOW_AUTO_FOCUS_in_auto_focus1358); if (failed) return d;
-                    t=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_auto_focus1362); if (failed) return d;
-                    if ( backtracking==0 ) {
-                      
-                      				d = new AttributeDescr( "auto-focus", t.getText() );
-                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-                      				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
-                      			
-                    }
+                        loc = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               AUTO_FOCUS,
+                               FOLLOW_AUTO_FOCUS_in_auto_focus1358 );
+                        if ( this.failed ) {
+                            return d;
+                        }
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               BOOL,
+                               FOLLOW_BOOL_in_auto_focus1362 );
+                        if ( this.failed ) {
+                            return d;
+                        }
+                        if ( this.backtracking == 0 ) {
 
-                    }
+                            d = new AttributeDescr( "auto-focus",
+                                                    t.getText() );
+                            d.setLocation( offset( loc.getLine() ),
+                                           loc.getCharPositionInLine() );
+                            d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                            d.setEndCharacter( ((CommonToken) t).getStopIndex() );
 
+                        }
 
                     }
+
+                }
                     break;
 
             }
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end auto_focus
 
-
     // $ANTLR start activation_group
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:578:1: activation_group returns [AttributeDescr d] : loc= ACTIVATION_GROUP n= STRING ;
     public AttributeDescr activation_group() throws RecognitionException {
         AttributeDescr d = null;
 
-        Token loc=null;
-        Token n=null;
+        Token loc = null;
+        Token n = null;
 
-        
-        		d = null;
-        	
+        d = null;
+
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:583:3: (loc= ACTIVATION_GROUP n= STRING )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:583:3: loc= ACTIVATION_GROUP n= STRING
             {
-            loc=(Token)input.LT(1);
-            match(input,ACTIVATION_GROUP,FOLLOW_ACTIVATION_GROUP_in_activation_group1407); if (failed) return d;
-            n=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_activation_group1411); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              			d = new AttributeDescr( "activation-group", getString( n ) );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
-              		
-            }
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       ACTIVATION_GROUP,
+                       FOLLOW_ACTIVATION_GROUP_in_activation_group1407 );
+                if ( this.failed ) {
+                    return d;
+                }
+                n = (Token) this.input.LT( 1 );
+                match( this.input,
+                       STRING,
+                       FOLLOW_STRING_in_activation_group1411 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    d = new AttributeDescr( "activation-group",
+                                            getString( n ) );
+                    d.setLocation( offset( loc.getLine() ),
+                                   loc.getCharPositionInLine() );
+                    d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                    d.setEndCharacter( ((CommonToken) n).getStopIndex() );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end activation_group
 
-
     // $ANTLR start ruleflow_group
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:592:1: ruleflow_group returns [AttributeDescr d] : loc= RULEFLOW_GROUP n= STRING ;
     public AttributeDescr ruleflow_group() throws RecognitionException {
         AttributeDescr d = null;
 
-        Token loc=null;
-        Token n=null;
+        Token loc = null;
+        Token n = null;
 
-        
-        		d = null;
-        	
+        d = null;
+
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:597:3: (loc= RULEFLOW_GROUP n= STRING )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:597:3: loc= RULEFLOW_GROUP n= STRING
             {
-            loc=(Token)input.LT(1);
-            match(input,RULEFLOW_GROUP,FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1443); if (failed) return d;
-            n=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_ruleflow_group1447); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              			d = new AttributeDescr( "ruleflow-group", getString( n ) );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
-              		
-            }
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       RULEFLOW_GROUP,
+                       FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1443 );
+                if ( this.failed ) {
+                    return d;
+                }
+                n = (Token) this.input.LT( 1 );
+                match( this.input,
+                       STRING,
+                       FOLLOW_STRING_in_ruleflow_group1447 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    d = new AttributeDescr( "ruleflow-group",
+                                            getString( n ) );
+                    d.setLocation( offset( loc.getLine() ),
+                                   loc.getCharPositionInLine() );
+                    d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                    d.setEndCharacter( ((CommonToken) n).getStopIndex() );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end ruleflow_group
 
-
     // $ANTLR start agenda_group
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:606:1: agenda_group returns [AttributeDescr d] : loc= AGENDA_GROUP n= STRING ;
     public AttributeDescr agenda_group() throws RecognitionException {
         AttributeDescr d = null;
 
-        Token loc=null;
-        Token n=null;
+        Token loc = null;
+        Token n = null;
 
-        
-        		d = null;
-        	
+        d = null;
+
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:611:3: (loc= AGENDA_GROUP n= STRING )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:611:3: loc= AGENDA_GROUP n= STRING
             {
-            loc=(Token)input.LT(1);
-            match(input,AGENDA_GROUP,FOLLOW_AGENDA_GROUP_in_agenda_group1479); if (failed) return d;
-            n=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_agenda_group1483); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              			d = new AttributeDescr( "agenda-group", getString( n ) );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
-              		
-            }
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       AGENDA_GROUP,
+                       FOLLOW_AGENDA_GROUP_in_agenda_group1479 );
+                if ( this.failed ) {
+                    return d;
+                }
+                n = (Token) this.input.LT( 1 );
+                match( this.input,
+                       STRING,
+                       FOLLOW_STRING_in_agenda_group1483 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    d = new AttributeDescr( "agenda-group",
+                                            getString( n ) );
+                    d.setLocation( offset( loc.getLine() ),
+                                   loc.getCharPositionInLine() );
+                    d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                    d.setEndCharacter( ((CommonToken) n).getStopIndex() );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end agenda_group
 
-
     // $ANTLR start duration
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:621:1: duration returns [AttributeDescr d] : loc= DURATION i= INT ;
     public AttributeDescr duration() throws RecognitionException {
         AttributeDescr d = null;
 
-        Token loc=null;
-        Token i=null;
+        Token loc = null;
+        Token i = null;
 
-        
-        		d = null;
-        	
+        d = null;
+
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:626:3: (loc= DURATION i= INT )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:626:3: loc= DURATION i= INT
             {
-            loc=(Token)input.LT(1);
-            match(input,DURATION,FOLLOW_DURATION_in_duration1518); if (failed) return d;
-            i=(Token)input.LT(1);
-            match(input,INT,FOLLOW_INT_in_duration1522); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              			d = new AttributeDescr( "duration", i.getText() );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			d.setEndCharacter( ((CommonToken)i).getStopIndex() );
-              		
-            }
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       DURATION,
+                       FOLLOW_DURATION_in_duration1518 );
+                if ( this.failed ) {
+                    return d;
+                }
+                i = (Token) this.input.LT( 1 );
+                match( this.input,
+                       INT,
+                       FOLLOW_INT_in_duration1522 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    d = new AttributeDescr( "duration",
+                                            i.getText() );
+                    d.setLocation( offset( loc.getLine() ),
+                                   loc.getCharPositionInLine() );
+                    d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                    d.setEndCharacter( ((CommonToken) i).getStopIndex() );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end duration
 
-
     // $ANTLR start lock_on_active
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:637:1: lock_on_active returns [AttributeDescr d] : ( ( ( LOCK_ON_ACTIVE ) )=> (loc= LOCK_ON_ACTIVE ) | (loc= LOCK_ON_ACTIVE t= BOOL ) );
     public AttributeDescr lock_on_active() throws RecognitionException {
         AttributeDescr d = null;
 
-        Token loc=null;
-        Token t=null;
+        Token loc = null;
+        Token t = null;
 
-        
-        		d = null;
-        	
+        d = null;
+
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:642:3: ( ( ( LOCK_ON_ACTIVE ) )=> (loc= LOCK_ON_ACTIVE ) | (loc= LOCK_ON_ACTIVE t= BOOL ) )
-            int alt21=2;
-            int LA21_0 = input.LA(1);
-            if ( (LA21_0==LOCK_ON_ACTIVE) ) {
-                int LA21_1 = input.LA(2);
-                if ( (LA21_1==BOOL) ) {
-                    alt21=2;
-                }
-                else if ( (LA21_1==EOF||LA21_1==WHEN||LA21_1==DATE_EFFECTIVE||(LA21_1>=DATE_EXPIRES && LA21_1<=ENABLED)||LA21_1==SALIENCE||(LA21_1>=NO_LOOP && LA21_1<=LOCK_ON_ACTIVE)||LA21_1==THEN||LA21_1==66) ) {
-                    alt21=1;
-                }
-                else {
-                    if (backtracking>0) {failed=true; return d;}
-                    NoViableAltException nvae =
-                        new NoViableAltException("637:1: lock_on_active returns [AttributeDescr d] : ( ( ( LOCK_ON_ACTIVE ) )=> (loc= LOCK_ON_ACTIVE ) | (loc= LOCK_ON_ACTIVE t= BOOL ) );", 21, 1, input);
+            int alt21 = 2;
+            final int LA21_0 = this.input.LA( 1 );
+            if ( (LA21_0 == LOCK_ON_ACTIVE) ) {
+                final int LA21_1 = this.input.LA( 2 );
+                if ( (LA21_1 == BOOL) ) {
+                    alt21 = 2;
+                } else if ( (LA21_1 == EOF || LA21_1 == WHEN || LA21_1 == DATE_EFFECTIVE || (LA21_1 >= DATE_EXPIRES && LA21_1 <= ENABLED) || LA21_1 == SALIENCE || (LA21_1 >= NO_LOOP && LA21_1 <= LOCK_ON_ACTIVE) || LA21_1 == THEN || LA21_1 == 66) ) {
+                    alt21 = 1;
+                } else {
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return d;
+                    }
+                    final NoViableAltException nvae = new NoViableAltException( "637:1: lock_on_active returns [AttributeDescr d] : ( ( ( LOCK_ON_ACTIVE ) )=> (loc= LOCK_ON_ACTIVE ) | (loc= LOCK_ON_ACTIVE t= BOOL ) );",
+                                                                          21,
+                                                                          1,
+                                                                          this.input );
 
                     throw nvae;
                 }
-            }
-            else {
-                if (backtracking>0) {failed=true; return d;}
-                NoViableAltException nvae =
-                    new NoViableAltException("637:1: lock_on_active returns [AttributeDescr d] : ( ( ( LOCK_ON_ACTIVE ) )=> (loc= LOCK_ON_ACTIVE ) | (loc= LOCK_ON_ACTIVE t= BOOL ) );", 21, 0, input);
+            } else {
+                if ( this.backtracking > 0 ) {
+                    this.failed = true;
+                    return d;
+                }
+                final NoViableAltException nvae = new NoViableAltException( "637:1: lock_on_active returns [AttributeDescr d] : ( ( ( LOCK_ON_ACTIVE ) )=> (loc= LOCK_ON_ACTIVE ) | (loc= LOCK_ON_ACTIVE t= BOOL ) );",
+                                                                      21,
+                                                                      0,
+                                                                      this.input );
 
                 throw nvae;
             }
-            switch (alt21) {
+            switch ( alt21 ) {
                 case 1 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:642:3: ( ( LOCK_ON_ACTIVE ) )=> (loc= LOCK_ON_ACTIVE )
-                    {
+                {
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:642:3: (loc= LOCK_ON_ACTIVE )
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:643:4: loc= LOCK_ON_ACTIVE
                     {
-                    loc=(Token)input.LT(1);
-                    match(input,LOCK_ON_ACTIVE,FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1564); if (failed) return d;
-                    if ( backtracking==0 ) {
-                      
-                      				d = new AttributeDescr( "lock-on-active", "true" );
-                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-                      				d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-                      			
-                    }
+                        loc = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               LOCK_ON_ACTIVE,
+                               FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1564 );
+                        if ( this.failed ) {
+                            return d;
+                        }
+                        if ( this.backtracking == 0 ) {
 
-                    }
+                            d = new AttributeDescr( "lock-on-active",
+                                                    "true" );
+                            d.setLocation( offset( loc.getLine() ),
+                                           loc.getCharPositionInLine() );
+                            d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                            d.setEndCharacter( ((CommonToken) loc).getStopIndex() );
 
+                        }
 
                     }
+
+                }
                     break;
                 case 2 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:652:3: (loc= LOCK_ON_ACTIVE t= BOOL )
-                    {
+                {
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:652:3: (loc= LOCK_ON_ACTIVE t= BOOL )
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:653:4: loc= LOCK_ON_ACTIVE t= BOOL
                     {
-                    loc=(Token)input.LT(1);
-                    match(input,LOCK_ON_ACTIVE,FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1592); if (failed) return d;
-                    t=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_lock_on_active1596); if (failed) return d;
-                    if ( backtracking==0 ) {
-                      
-                      				d = new AttributeDescr( "lock-on-active", t.getText() );
-                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-                      				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
-                      			
-                    }
+                        loc = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               LOCK_ON_ACTIVE,
+                               FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1592 );
+                        if ( this.failed ) {
+                            return d;
+                        }
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               BOOL,
+                               FOLLOW_BOOL_in_lock_on_active1596 );
+                        if ( this.failed ) {
+                            return d;
+                        }
+                        if ( this.backtracking == 0 ) {
 
-                    }
+                            d = new AttributeDescr( "lock-on-active",
+                                                    t.getText() );
+                            d.setLocation( offset( loc.getLine() ),
+                                           loc.getCharPositionInLine() );
+                            d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                            d.setEndCharacter( ((CommonToken) t).getStopIndex() );
 
+                        }
 
                     }
+
+                }
                     break;
 
             }
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end lock_on_active
 
-
     // $ANTLR start normal_lhs_block
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:665:1: normal_lhs_block[AndDescr descr] : ( ( lhs[descr] )=>d= lhs[descr] )* ;
-    public void normal_lhs_block(AndDescr descr) throws RecognitionException {
+    public void normal_lhs_block(final AndDescr descr) throws RecognitionException {
         BaseDescr d = null;
 
-
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:667:3: ( ( ( lhs[descr] )=>d= lhs[descr] )* )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:667:3: ( ( lhs[descr] )=>d= lhs[descr] )*
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:667:3: ( ( lhs[descr] )=>d= lhs[descr] )*
-            loop22:
-            do {
-                int alt22=2;
-                int LA22_0 = input.LA(1);
-                if ( (LA22_0==ID||LA22_0==LEFT_PAREN||(LA22_0>=EXISTS && LA22_0<=FORALL)) ) {
-                    alt22=1;
-                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:667:3: ( ( lhs[descr] )=>d= lhs[descr] )*
+                loop22 : do {
+                    int alt22 = 2;
+                    final int LA22_0 = this.input.LA( 1 );
+                    if ( (LA22_0 == ID || LA22_0 == LEFT_PAREN || (LA22_0 >= EXISTS && LA22_0 <= FORALL)) ) {
+                        alt22 = 1;
+                    }
 
+                    switch ( alt22 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:667:5: ( lhs[descr] )=>d= lhs[descr]
+                        {
+                            pushFollow( FOLLOW_lhs_in_normal_lhs_block1634 );
+                            d = lhs( descr );
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return;
+                            }
+                            if ( this.backtracking == 0 ) {
+                                if ( d != null ) {
+                                    descr.addDescr( d );
+                                }
+                            }
 
-                switch (alt22) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:667:5: ( lhs[descr] )=>d= lhs[descr]
-            	    {
-            	    pushFollow(FOLLOW_lhs_in_normal_lhs_block1634);
-            	    d=lhs(descr);
-            	    _fsp--;
-            	    if (failed) return ;
-            	    if ( backtracking==0 ) {
-            	       if(d != null) descr.addDescr( d ); 
-            	    }
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            break loop22;
+                    }
+                } while ( true );
 
-            	default :
-            	    break loop22;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
+        return;
     }
+
     // $ANTLR end normal_lhs_block
 
-
     // $ANTLR start lhs
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:673:1: lhs[ConditionalElementDescr ce] returns [BaseDescr d] : l= lhs_or ;
-    public BaseDescr lhs(ConditionalElementDescr ce) throws RecognitionException {
+    public BaseDescr lhs(final ConditionalElementDescr ce) throws RecognitionException {
         BaseDescr d = null;
 
         BaseDescr l = null;
 
+        d = null;
 
-        
-        		d=null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:677:4: (l= lhs_or )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:677:4: l= lhs_or
             {
-            pushFollow(FOLLOW_lhs_or_in_lhs1671);
-            l=lhs_or();
-            _fsp--;
-            if (failed) return d;
-            if ( backtracking==0 ) {
-               d = l; 
-            }
+                pushFollow( FOLLOW_lhs_or_in_lhs1671 );
+                l = lhs_or();
+                this._fsp--;
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
+                    d = l;
+                }
 
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end lhs
 
-
     // $ANTLR start lhs_column
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:681:1: lhs_column returns [BaseDescr d] : ( ( fact_binding )=>f= fact_binding | f= fact );
     public BaseDescr lhs_column() throws RecognitionException {
@@ -2397,78 +2723,86 @@
 
         BaseDescr f = null;
 
+        d = null;
 
-        
-        		d=null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:685:4: ( ( fact_binding )=>f= fact_binding | f= fact )
-            int alt23=2;
-            int LA23_0 = input.LA(1);
-            if ( (LA23_0==ID) ) {
-                int LA23_1 = input.LA(2);
-                if ( (LA23_1==67) ) {
-                    alt23=1;
-                }
-                else if ( (LA23_1==LEFT_PAREN||LA23_1==LEFT_SQUARE||LA23_1==64) ) {
-                    alt23=2;
-                }
-                else {
-                    if (backtracking>0) {failed=true; return d;}
-                    NoViableAltException nvae =
-                        new NoViableAltException("681:1: lhs_column returns [BaseDescr d] : ( ( fact_binding )=>f= fact_binding | f= fact );", 23, 1, input);
+            int alt23 = 2;
+            final int LA23_0 = this.input.LA( 1 );
+            if ( (LA23_0 == ID) ) {
+                final int LA23_1 = this.input.LA( 2 );
+                if ( (LA23_1 == 67) ) {
+                    alt23 = 1;
+                } else if ( (LA23_1 == LEFT_PAREN || LA23_1 == LEFT_SQUARE || LA23_1 == 64) ) {
+                    alt23 = 2;
+                } else {
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return d;
+                    }
+                    final NoViableAltException nvae = new NoViableAltException( "681:1: lhs_column returns [BaseDescr d] : ( ( fact_binding )=>f= fact_binding | f= fact );",
+                                                                          23,
+                                                                          1,
+                                                                          this.input );
 
                     throw nvae;
                 }
-            }
-            else {
-                if (backtracking>0) {failed=true; return d;}
-                NoViableAltException nvae =
-                    new NoViableAltException("681:1: lhs_column returns [BaseDescr d] : ( ( fact_binding )=>f= fact_binding | f= fact );", 23, 0, input);
+            } else {
+                if ( this.backtracking > 0 ) {
+                    this.failed = true;
+                    return d;
+                }
+                final NoViableAltException nvae = new NoViableAltException( "681:1: lhs_column returns [BaseDescr d] : ( ( fact_binding )=>f= fact_binding | f= fact );",
+                                                                      23,
+                                                                      0,
+                                                                      this.input );
 
                 throw nvae;
             }
-            switch (alt23) {
+            switch ( alt23 ) {
                 case 1 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:685:4: ( fact_binding )=>f= fact_binding
-                    {
-                    pushFollow(FOLLOW_fact_binding_in_lhs_column1699);
-                    f=fact_binding();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                       d = f; 
+                {
+                    pushFollow( FOLLOW_fact_binding_in_lhs_column1699 );
+                    f = fact_binding();
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return d;
                     }
+                    if ( this.backtracking == 0 ) {
+                        d = f;
+                    }
 
-                    }
+                }
                     break;
                 case 2 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:686:4: f= fact
-                    {
-                    pushFollow(FOLLOW_fact_in_lhs_column1708);
-                    f=fact();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                       d = f; 
+                {
+                    pushFollow( FOLLOW_fact_in_lhs_column1708 );
+                    f = fact();
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return d;
                     }
+                    if ( this.backtracking == 0 ) {
+                        d = f;
+                    }
 
-                    }
+                }
                     break;
 
             }
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end lhs_column
 
-
     // $ANTLR start from_statement
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:689:1: from_statement returns [FromDescr d] : ds= from_source[d] ;
     public FromDescr from_statement() throws RecognitionException {
@@ -2476,1745 +2810,2012 @@
 
         DeclarativeInvokerDescr ds = null;
 
+        d = this.factory.createFrom();
 
-        
-        		d=factory.createFrom();
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:694:2: (ds= from_source[d] )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:694:2: ds= from_source[d]
             {
-            pushFollow(FOLLOW_from_source_in_from_statement1735);
-            ds=from_source(d);
-            _fsp--;
-            if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              			d.setDataSource(ds);
-              		
-              		
-            }
+                pushFollow( FOLLOW_from_source_in_from_statement1735 );
+                ds = from_source( d );
+                this._fsp--;
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    d.setDataSource( ds );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end from_statement
 
-
     // $ANTLR start from_source
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:704:1: from_source[FromDescr from] returns [DeclarativeInvokerDescr ds] : ident= identifier ( ( paren_chunk[from] )=>args= paren_chunk[from] )? ( ( expression_chain[from, ad] )=> expression_chain[from, ad] )? ;
-    public DeclarativeInvokerDescr from_source(FromDescr from) throws RecognitionException {
+    public DeclarativeInvokerDescr from_source(final FromDescr from) throws RecognitionException {
         DeclarativeInvokerDescr ds = null;
 
         Token ident = null;
 
         String args = null;
 
+        ds = null;
+        AccessorDescr ad = null;
 
-        
-        		ds = null;
-        		AccessorDescr ad = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:710:3: (ident= identifier ( ( paren_chunk[from] )=>args= paren_chunk[from] )? ( ( expression_chain[from, ad] )=> expression_chain[from, ad] )? )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:710:3: ident= identifier ( ( paren_chunk[from] )=>args= paren_chunk[from] )? ( ( expression_chain[from, ad] )=> expression_chain[from, ad] )?
             {
-            pushFollow(FOLLOW_identifier_in_from_source1777);
-            ident=identifier();
-            _fsp--;
-            if (failed) return ds;
-            if ( backtracking==0 ) {
-              
-              			ad = new AccessorDescr(ident.getText());	
-              			ad.setLocation( offset(ident.getLine()), ident.getCharPositionInLine() );
-              			ad.setStartCharacter( ((CommonToken)ident).getStartIndex() );
-              			ad.setEndCharacter( ((CommonToken)ident).getStopIndex() );
-              			ds = ad;
-              		
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:718:3: ( ( paren_chunk[from] )=>args= paren_chunk[from] )?
-            int alt24=2;
-            int LA24_0 = input.LA(1);
-            if ( (LA24_0==LEFT_PAREN) ) {
-                if ( (synpred38()) ) {
-                    alt24=1;
+                pushFollow( FOLLOW_identifier_in_from_source1777 );
+                ident = identifier();
+                this._fsp--;
+                if ( this.failed ) {
+                    return ds;
                 }
-            }
-            switch (alt24) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:718:4: ( paren_chunk[from] )=>args= paren_chunk[from]
+                if ( this.backtracking == 0 ) {
+
+                    ad = new AccessorDescr( ident.getText() );
+                    ad.setLocation( offset( ident.getLine() ),
+                                    ident.getCharPositionInLine() );
+                    ad.setStartCharacter( ((CommonToken) ident).getStartIndex() );
+                    ad.setEndCharacter( ((CommonToken) ident).getStopIndex() );
+                    ds = ad;
+
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:718:3: ( ( paren_chunk[from] )=>args= paren_chunk[from] )?
+                int alt24 = 2;
+                final int LA24_0 = this.input.LA( 1 );
+                if ( (LA24_0 == LEFT_PAREN) ) {
+                    if ( (synpred38()) ) {
+                        alt24 = 1;
+                    }
+                }
+                switch ( alt24 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:718:4: ( paren_chunk[from] )=>args= paren_chunk[from]
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_from_source1788);
-                    args=paren_chunk(from);
-                    _fsp--;
-                    if (failed) return ds;
-                    if ( backtracking==0 ) {
-                      
-                      			if( args != null ) {
-                      				ad.setVariableName( null );
-                      				FunctionCallDescr fc = new FunctionCallDescr(ident.getText());
-                      				fc.setLocation( offset(ident.getLine()), ident.getCharPositionInLine() );			
-                      				fc.setArguments(args);
-                      				fc.setStartCharacter( ((CommonToken)ident).getStartIndex() );
-                      				fc.setEndCharacter( ((CommonToken)ident).getStopIndex() );
-                      				ad.addInvoker(fc);
-                      			}
-                      		
-                    }
+                        pushFollow( FOLLOW_paren_chunk_in_from_source1788 );
+                        args = paren_chunk( from );
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return ds;
+                        }
+                        if ( this.backtracking == 0 ) {
 
+                            if ( args != null ) {
+                                ad.setVariableName( null );
+                                final FunctionCallDescr fc = new FunctionCallDescr( ident.getText() );
+                                fc.setLocation( offset( ident.getLine() ),
+                                                ident.getCharPositionInLine() );
+                                fc.setArguments( args );
+                                fc.setStartCharacter( ((CommonToken) ident).getStartIndex() );
+                                fc.setEndCharacter( ((CommonToken) ident).getStopIndex() );
+                                ad.addInvoker( fc );
+                            }
+
+                        }
+
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:731:3: ( ( expression_chain[from, ad] )=> expression_chain[from, ad] )?
-            int alt25=2;
-            int LA25_0 = input.LA(1);
-            if ( (LA25_0==64) ) {
-                alt25=1;
-            }
-            switch (alt25) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: ( expression_chain[from, ad] )=> expression_chain[from, ad]
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:731:3: ( ( expression_chain[from, ad] )=> expression_chain[from, ad] )?
+                int alt25 = 2;
+                final int LA25_0 = this.input.LA( 1 );
+                if ( (LA25_0 == 64) ) {
+                    alt25 = 1;
+                }
+                switch ( alt25 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: ( expression_chain[from, ad] )=> expression_chain[from, ad]
                     {
-                    pushFollow(FOLLOW_expression_chain_in_from_source1802);
-                    expression_chain(from,  ad);
-                    _fsp--;
-                    if (failed) return ds;
+                        pushFollow( FOLLOW_expression_chain_in_from_source1802 );
+                        expression_chain( from,
+                                          ad );
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return ds;
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return ds;
     }
+
     // $ANTLR end from_source
 
-
     // $ANTLR start expression_chain
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:734:1: expression_chain[FromDescr from, AccessorDescr as] : ( '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( ( expression_chain[from, as] )=> expression_chain[from, as] )? ) ;
-    public void expression_chain(FromDescr from, AccessorDescr as) throws RecognitionException {
+    public void expression_chain(final FromDescr from,
+                                 final AccessorDescr as) throws RecognitionException {
         Token field = null;
 
         String sqarg = null;
 
         String paarg = null;
 
+        FieldAccessDescr fa = null;
+        MethodAccessDescr ma = null;
 
-        
-          		FieldAccessDescr fa = null;
-        	    	MethodAccessDescr ma = null;	
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:740:2: ( ( '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( ( expression_chain[from, as] )=> expression_chain[from, as] )? ) )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:740:2: ( '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( ( expression_chain[from, as] )=> expression_chain[from, as] )? )
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:740:2: ( '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( ( expression_chain[from, as] )=> expression_chain[from, as] )? )
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:740:4: '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( ( expression_chain[from, as] )=> expression_chain[from, as] )?
-            {
-            match(input,64,FOLLOW_64_in_expression_chain1827); if (failed) return ;
-            pushFollow(FOLLOW_identifier_in_expression_chain1831);
-            field=identifier();
-            _fsp--;
-            if (failed) return ;
-            if ( backtracking==0 ) {
-              
-              	        fa = new FieldAccessDescr(field.getText());	
-              		fa.setLocation( offset(field.getLine()), field.getCharPositionInLine() );
-              		fa.setStartCharacter( ((CommonToken)field).getStartIndex() );
-              		fa.setEndCharacter( ((CommonToken)field).getStopIndex() );
-              	    
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:747:4: ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )?
-            int alt26=3;
-            int LA26_0 = input.LA(1);
-            if ( (LA26_0==LEFT_SQUARE) ) {
-                alt26=1;
-            }
-            else if ( (LA26_0==LEFT_PAREN) ) {
-                if ( (synpred41()) ) {
-                    alt26=2;
-                }
-            }
-            switch (alt26) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:748:6: ( LEFT_SQUARE )=>sqarg= square_chunk[from]
-                    {
-                    pushFollow(FOLLOW_square_chunk_in_expression_chain1862);
-                    sqarg=square_chunk(from);
-                    _fsp--;
-                    if (failed) return ;
-                    if ( backtracking==0 ) {
-                      
-                      	          fa.setArgument( sqarg );	
-                      	      
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:740:2: ( '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( ( expression_chain[from, as] )=> expression_chain[from, as] )? )
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:740:4: '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( ( expression_chain[from, as] )=> expression_chain[from, as] )?
+                {
+                    match( this.input,
+                           64,
+                           FOLLOW_64_in_expression_chain1827 );
+                    if ( this.failed ) {
+                        return;
                     }
+                    pushFollow( FOLLOW_identifier_in_expression_chain1831 );
+                    field = identifier();
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return;
+                    }
+                    if ( this.backtracking == 0 ) {
 
+                        fa = new FieldAccessDescr( field.getText() );
+                        fa.setLocation( offset( field.getLine() ),
+                                        field.getCharPositionInLine() );
+                        fa.setStartCharacter( ((CommonToken) field).getStartIndex() );
+                        fa.setEndCharacter( ((CommonToken) field).getStopIndex() );
+
                     }
-                    break;
-                case 2 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:753:6: ( LEFT_PAREN )=>paarg= paren_chunk[from]
-                    {
-                    pushFollow(FOLLOW_paren_chunk_in_expression_chain1896);
-                    paarg=paren_chunk(from);
-                    _fsp--;
-                    if (failed) return ;
-                    if ( backtracking==0 ) {
-                      
-                      	    	  ma = new MethodAccessDescr( field.getText(), paarg );	
-                      		  ma.setLocation( offset(field.getLine()), field.getCharPositionInLine() );
-                      		  ma.setStartCharacter( ((CommonToken)field).getStartIndex() );
-                      		
+                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:747:4: ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )?
+                    int alt26 = 3;
+                    final int LA26_0 = this.input.LA( 1 );
+                    if ( (LA26_0 == LEFT_SQUARE) ) {
+                        alt26 = 1;
+                    } else if ( (LA26_0 == LEFT_PAREN) ) {
+                        if ( (synpred41()) ) {
+                            alt26 = 2;
+                        }
                     }
+                    switch ( alt26 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:748:6: ( LEFT_SQUARE )=>sqarg= square_chunk[from]
+                        {
+                            pushFollow( FOLLOW_square_chunk_in_expression_chain1862 );
+                            sqarg = square_chunk( from );
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return;
+                            }
+                            if ( this.backtracking == 0 ) {
 
+                                fa.setArgument( sqarg );
+
+                            }
+
+                        }
+                            break;
+                        case 2 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:753:6: ( LEFT_PAREN )=>paarg= paren_chunk[from]
+                        {
+                            pushFollow( FOLLOW_paren_chunk_in_expression_chain1896 );
+                            paarg = paren_chunk( from );
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return;
+                            }
+                            if ( this.backtracking == 0 ) {
+
+                                ma = new MethodAccessDescr( field.getText(),
+                                                            paarg );
+                                ma.setLocation( offset( field.getLine() ),
+                                                field.getCharPositionInLine() );
+                                ma.setStartCharacter( ((CommonToken) field).getStartIndex() );
+
+                            }
+
+                        }
+                            break;
+
                     }
-                    break;
 
-            }
+                    if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
-              
-              	      if( ma != null ) {
-              	          as.addInvoker( ma );
-              	      } else {
-              	          as.addInvoker( fa );
-              	      }
-              	  
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:767:4: ( ( expression_chain[from, as] )=> expression_chain[from, as] )?
-            int alt27=2;
-            int LA27_0 = input.LA(1);
-            if ( (LA27_0==64) ) {
-                alt27=1;
-            }
-            switch (alt27) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: ( expression_chain[from, as] )=> expression_chain[from, as]
-                    {
-                    pushFollow(FOLLOW_expression_chain_in_expression_chain1917);
-                    expression_chain(from,  as);
-                    _fsp--;
-                    if (failed) return ;
+                        if ( ma != null ) {
+                            as.addInvoker( ma );
+                        } else {
+                            as.addInvoker( fa );
+                        }
 
                     }
-                    break;
+                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:767:4: ( ( expression_chain[from, as] )=> expression_chain[from, as] )?
+                    int alt27 = 2;
+                    final int LA27_0 = this.input.LA( 1 );
+                    if ( (LA27_0 == 64) ) {
+                        alt27 = 1;
+                    }
+                    switch ( alt27 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: ( expression_chain[from, as] )=> expression_chain[from, as]
+                        {
+                            pushFollow( FOLLOW_expression_chain_in_expression_chain1917 );
+                            expression_chain( from,
+                                              as );
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return;
+                            }
 
-            }
+                        }
+                            break;
 
+                    }
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
+        return;
     }
+
     // $ANTLR end expression_chain
 
-
     // $ANTLR start accumulate_statement
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:771:1: accumulate_statement returns [AccumulateDescr d] : loc= ACCUMULATE '(' column= lhs_column ',' INIT text= paren_chunk[null] ',' ACTION text= paren_chunk[null] ',' RESULT text= paren_chunk[null] loc= ')' ;
     public AccumulateDescr accumulate_statement() throws RecognitionException {
         AccumulateDescr d = null;
 
-        Token loc=null;
+        Token loc = null;
         BaseDescr column = null;
 
         String text = null;
 
+        d = this.factory.createAccumulate();
 
-        
-        		d = factory.createAccumulate();
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:776:10: (loc= ACCUMULATE '(' column= lhs_column ',' INIT text= paren_chunk[null] ',' ACTION text= paren_chunk[null] ',' RESULT text= paren_chunk[null] loc= ')' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:776:10: loc= ACCUMULATE '(' column= lhs_column ',' INIT text= paren_chunk[null] ',' ACTION text= paren_chunk[null] ',' RESULT text= paren_chunk[null] loc= ')'
             {
-            loc=(Token)input.LT(1);
-            match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_accumulate_statement1958); if (failed) return d;
-            if ( backtracking==0 ) {
-               
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              		
-            }
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_accumulate_statement1968); if (failed) return d;
-            pushFollow(FOLLOW_lhs_column_in_accumulate_statement1972);
-            column=lhs_column();
-            _fsp--;
-            if (failed) return d;
-            match(input,66,FOLLOW_66_in_accumulate_statement1974); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              		        d.setSourceColumn( (ColumnDescr)column );
-              		
-            }
-            match(input,INIT,FOLLOW_INIT_in_accumulate_statement1983); if (failed) return d;
-            pushFollow(FOLLOW_paren_chunk_in_accumulate_statement1987);
-            text=paren_chunk(null);
-            _fsp--;
-            if (failed) return d;
-            match(input,66,FOLLOW_66_in_accumulate_statement1990); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              		        d.setInitCode( text.substring(1, text.length()-1) );
-              		
-            }
-            match(input,ACTION,FOLLOW_ACTION_in_accumulate_statement1999); if (failed) return d;
-            pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2003);
-            text=paren_chunk(null);
-            _fsp--;
-            if (failed) return d;
-            match(input,66,FOLLOW_66_in_accumulate_statement2006); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              		        d.setActionCode( text.substring(1, text.length()-1) );
-              		
-            }
-            match(input,RESULT,FOLLOW_RESULT_in_accumulate_statement2015); if (failed) return d;
-            pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2019);
-            text=paren_chunk(null);
-            _fsp--;
-            if (failed) return d;
-            loc=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_statement2024); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              		        d.setResultCode( text.substring(1, text.length()-1) );
-              			d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-              		
-            }
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       ACCUMULATE,
+                       FOLLOW_ACCUMULATE_in_accumulate_statement1958 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    d.setLocation( offset( loc.getLine() ),
+                                   loc.getCharPositionInLine() );
+                    d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+
+                }
+                match( this.input,
+                       LEFT_PAREN,
+                       FOLLOW_LEFT_PAREN_in_accumulate_statement1968 );
+                if ( this.failed ) {
+                    return d;
+                }
+                pushFollow( FOLLOW_lhs_column_in_accumulate_statement1972 );
+                column = lhs_column();
+                this._fsp--;
+                if ( this.failed ) {
+                    return d;
+                }
+                match( this.input,
+                       66,
+                       FOLLOW_66_in_accumulate_statement1974 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    d.setSourceColumn( (ColumnDescr) column );
+
+                }
+                match( this.input,
+                       INIT,
+                       FOLLOW_INIT_in_accumulate_statement1983 );
+                if ( this.failed ) {
+                    return d;
+                }
+                pushFollow( FOLLOW_paren_chunk_in_accumulate_statement1987 );
+                text = paren_chunk( null );
+                this._fsp--;
+                if ( this.failed ) {
+                    return d;
+                }
+                match( this.input,
+                       66,
+                       FOLLOW_66_in_accumulate_statement1990 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    d.setInitCode( text.substring( 1,
+                                                   text.length() - 1 ) );
+
+                }
+                match( this.input,
+                       ACTION,
+                       FOLLOW_ACTION_in_accumulate_statement1999 );
+                if ( this.failed ) {
+                    return d;
+                }
+                pushFollow( FOLLOW_paren_chunk_in_accumulate_statement2003 );
+                text = paren_chunk( null );
+                this._fsp--;
+                if ( this.failed ) {
+                    return d;
+                }
+                match( this.input,
+                       66,
+                       FOLLOW_66_in_accumulate_statement2006 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    d.setActionCode( text.substring( 1,
+                                                     text.length() - 1 ) );
+
+                }
+                match( this.input,
+                       RESULT,
+                       FOLLOW_RESULT_in_accumulate_statement2015 );
+                if ( this.failed ) {
+                    return d;
+                }
+                pushFollow( FOLLOW_paren_chunk_in_accumulate_statement2019 );
+                text = paren_chunk( null );
+                this._fsp--;
+                if ( this.failed ) {
+                    return d;
+                }
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       RIGHT_PAREN,
+                       FOLLOW_RIGHT_PAREN_in_accumulate_statement2024 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    d.setResultCode( text.substring( 1,
+                                                     text.length() - 1 ) );
+                    d.setEndCharacter( ((CommonToken) loc).getStopIndex() );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end accumulate_statement
 
-
     // $ANTLR start collect_statement
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:800:1: collect_statement returns [CollectDescr d] : loc= COLLECT '(' column= lhs_column loc= ')' ;
     public CollectDescr collect_statement() throws RecognitionException {
         CollectDescr d = null;
 
-        Token loc=null;
+        Token loc = null;
         BaseDescr column = null;
 
+        d = this.factory.createCollect();
 
-        
-        		d = factory.createCollect();
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:805:10: (loc= COLLECT '(' column= lhs_column loc= ')' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:805:10: loc= COLLECT '(' column= lhs_column loc= ')'
             {
-            loc=(Token)input.LT(1);
-            match(input,COLLECT,FOLLOW_COLLECT_in_collect_statement2067); if (failed) return d;
-            if ( backtracking==0 ) {
-               
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              		
-            }
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_collect_statement2077); if (failed) return d;
-            pushFollow(FOLLOW_lhs_column_in_collect_statement2081);
-            column=lhs_column();
-            _fsp--;
-            if (failed) return d;
-            loc=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_collect_statement2085); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              		        d.setSourceColumn( (ColumnDescr)column );
-              			d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-              		
-            }
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       COLLECT,
+                       FOLLOW_COLLECT_in_collect_statement2067 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    d.setLocation( offset( loc.getLine() ),
+                                   loc.getCharPositionInLine() );
+                    d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+
+                }
+                match( this.input,
+                       LEFT_PAREN,
+                       FOLLOW_LEFT_PAREN_in_collect_statement2077 );
+                if ( this.failed ) {
+                    return d;
+                }
+                pushFollow( FOLLOW_lhs_column_in_collect_statement2081 );
+                column = lhs_column();
+                this._fsp--;
+                if ( this.failed ) {
+                    return d;
+                }
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       RIGHT_PAREN,
+                       FOLLOW_RIGHT_PAREN_in_collect_statement2085 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    d.setSourceColumn( (ColumnDescr) column );
+                    d.setEndCharacter( ((CommonToken) loc).getStopIndex() );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end collect_statement
 
-
     // $ANTLR start fact_binding
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:817:1: fact_binding returns [BaseDescr d] : id= ID ':' fe= fact_expression[id.getText()] ;
     public BaseDescr fact_binding() throws RecognitionException {
         BaseDescr d = null;
 
-        Token id=null;
+        Token id = null;
         BaseDescr fe = null;
 
+        d = null;
+        final boolean multi = false;
 
-        
-        		d=null;
-        		boolean multi=false;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:823:4: (id= ID ':' fe= fact_expression[id.getText()] )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:823:4: id= ID ':' fe= fact_expression[id.getText()]
             {
-            id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_fact_binding2119); if (failed) return d;
-            match(input,67,FOLLOW_67_in_fact_binding2121); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-               		        // handling incomplete parsing
-               		        d = new ColumnDescr( );
-               		        ((ColumnDescr) d).setIdentifier( id.getText() );
-               		
-            }
-            pushFollow(FOLLOW_fact_expression_in_fact_binding2134);
-            fe=fact_expression(id.getText());
-            _fsp--;
-            if (failed) return d;
-            if ( backtracking==0 ) {
-              
-               		        // override previously instantiated column
-               			d=fe;
-               			if( d != null ) {
-                 			    d.setStartCharacter( ((CommonToken)id).getStartIndex() );
-                 			}
-               		
-            }
+                id = (Token) this.input.LT( 1 );
+                match( this.input,
+                       ID,
+                       FOLLOW_ID_in_fact_binding2119 );
+                if ( this.failed ) {
+                    return d;
+                }
+                match( this.input,
+                       67,
+                       FOLLOW_67_in_fact_binding2121 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    // handling incomplete parsing
+                    d = new ColumnDescr();
+                    ((ColumnDescr) d).setIdentifier( id.getText() );
+
+                }
+                pushFollow( FOLLOW_fact_expression_in_fact_binding2134 );
+                fe = fact_expression( id.getText() );
+                this._fsp--;
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    // override previously instantiated column
+                    d = fe;
+                    if ( d != null ) {
+                        d.setStartCharacter( ((CommonToken) id).getStartIndex() );
+                    }
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end fact_binding
 
-
     // $ANTLR start fact_expression
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:839:2: fact_expression[String id] returns [BaseDescr pd] : ( ( '(' fact_expression[id] ')' )=> '(' fe= fact_expression[id] ')' | f= fact ( ( (OR|'||') fact )=> (OR|'||')f= fact )* );
-    public BaseDescr fact_expression(String id) throws RecognitionException {
+    public BaseDescr fact_expression(final String id) throws RecognitionException {
         BaseDescr pd = null;
 
         BaseDescr fe = null;
 
         BaseDescr f = null;
 
+        pd = null;
+        boolean multi = false;
 
-        
-         		pd = null;
-         		boolean multi = false;
-         	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:844:5: ( ( '(' fact_expression[id] ')' )=> '(' fe= fact_expression[id] ')' | f= fact ( ( (OR|'||') fact )=> (OR|'||')f= fact )* )
-            int alt29=2;
-            int LA29_0 = input.LA(1);
-            if ( (LA29_0==LEFT_PAREN) ) {
-                alt29=1;
-            }
-            else if ( (LA29_0==ID) ) {
-                alt29=2;
-            }
-            else {
-                if (backtracking>0) {failed=true; return pd;}
-                NoViableAltException nvae =
-                    new NoViableAltException("839:2: fact_expression[String id] returns [BaseDescr pd] : ( ( '(' fact_expression[id] ')' )=> '(' fe= fact_expression[id] ')' | f= fact ( ( (OR|'||') fact )=> (OR|'||')f= fact )* );", 29, 0, input);
+            int alt29 = 2;
+            final int LA29_0 = this.input.LA( 1 );
+            if ( (LA29_0 == LEFT_PAREN) ) {
+                alt29 = 1;
+            } else if ( (LA29_0 == ID) ) {
+                alt29 = 2;
+            } else {
+                if ( this.backtracking > 0 ) {
+                    this.failed = true;
+                    return pd;
+                }
+                final NoViableAltException nvae = new NoViableAltException( "839:2: fact_expression[String id] returns [BaseDescr pd] : ( ( '(' fact_expression[id] ')' )=> '(' fe= fact_expression[id] ')' | f= fact ( ( (OR|'||') fact )=> (OR|'||')f= fact )* );",
+                                                                      29,
+                                                                      0,
+                                                                      this.input );
 
                 throw nvae;
             }
-            switch (alt29) {
+            switch ( alt29 ) {
                 case 1 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:844:5: ( '(' fact_expression[id] ')' )=> '(' fe= fact_expression[id] ')'
-                    {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact_expression2166); if (failed) return pd;
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression2170);
-                    fe=fact_expression(id);
-                    _fsp--;
-                    if (failed) return pd;
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact_expression2173); if (failed) return pd;
-                    if ( backtracking==0 ) {
-                       pd=fe; 
+                {
+                    match( this.input,
+                           LEFT_PAREN,
+                           FOLLOW_LEFT_PAREN_in_fact_expression2166 );
+                    if ( this.failed ) {
+                        return pd;
                     }
+                    pushFollow( FOLLOW_fact_expression_in_fact_expression2170 );
+                    fe = fact_expression( id );
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return pd;
+                    }
+                    match( this.input,
+                           RIGHT_PAREN,
+                           FOLLOW_RIGHT_PAREN_in_fact_expression2173 );
+                    if ( this.failed ) {
+                        return pd;
+                    }
+                    if ( this.backtracking == 0 ) {
+                        pd = fe;
+                    }
 
-                    }
+                }
                     break;
                 case 2 :
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:845:6: f= fact ( ( (OR|'||') fact )=> (OR|'||')f= fact )*
-                    {
-                    pushFollow(FOLLOW_fact_in_fact_expression2184);
-                    f=fact();
-                    _fsp--;
-                    if (failed) return pd;
-                    if ( backtracking==0 ) {
-                      
-                       			((ColumnDescr)f).setIdentifier( id );
-                       			pd = f;
-                       		
+                {
+                    pushFollow( FOLLOW_fact_in_fact_expression2184 );
+                    f = fact();
+                    this._fsp--;
+                    if ( this.failed ) {
+                        return pd;
                     }
+                    if ( this.backtracking == 0 ) {
+
+                        ((ColumnDescr) f).setIdentifier( id );
+                        pd = f;
+
+                    }
                     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:850:4: ( ( (OR|'||') fact )=> (OR|'||')f= fact )*
-                    loop28:
-                    do {
-                        int alt28=2;
-                        int LA28_0 = input.LA(1);
-                        if ( (LA28_0==OR||LA28_0==68) ) {
+                    loop28 : do {
+                        int alt28 = 2;
+                        final int LA28_0 = this.input.LA( 1 );
+                        if ( (LA28_0 == OR || LA28_0 == 68) ) {
                             if ( (synpred44()) ) {
-                                alt28=1;
+                                alt28 = 1;
                             }
 
-
                         }
 
+                        switch ( alt28 ) {
+                            case 1 :
+                                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:850:6: ( (OR|'||') fact )=> (OR|'||')f= fact
+                            {
+                                if ( this.input.LA( 1 ) == OR || this.input.LA( 1 ) == 68 ) {
+                                    this.input.consume();
+                                    this.errorRecovery = false;
+                                    this.failed = false;
+                                } else {
+                                    if ( this.backtracking > 0 ) {
+                                        this.failed = true;
+                                        return pd;
+                                    }
+                                    final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                             this.input );
+                                    recoverFromMismatchedSet( this.input,
+                                                              mse,
+                                                              FOLLOW_set_in_fact_expression2197 );
+                                    throw mse;
+                                }
 
-                        switch (alt28) {
-                    	case 1 :
-                    	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:850:6: ( (OR|'||') fact )=> (OR|'||')f= fact
-                    	    {
-                    	    if ( input.LA(1)==OR||input.LA(1)==68 ) {
-                    	        input.consume();
-                    	        errorRecovery=false;failed=false;
-                    	    }
-                    	    else {
-                    	        if (backtracking>0) {failed=true; return pd;}
-                    	        MismatchedSetException mse =
-                    	            new MismatchedSetException(null,input);
-                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_fact_expression2197);    throw mse;
-                    	    }
+                                if ( this.backtracking == 0 ) {
+                                    if ( !multi ) {
+                                        final BaseDescr first = pd;
+                                        pd = new OrDescr();
+                                        ((OrDescr) pd).addDescr( first );
+                                        multi = true;
+                                    }
 
-                    	    if ( backtracking==0 ) {
-                    	      	if ( ! multi ) {
-                    	       					BaseDescr first = pd;
-                    	       					pd = new OrDescr();
-                    	       					((OrDescr)pd).addDescr( first );
-                    	       					multi=true;
-                    	       				}
-                    	       			
-                    	    }
-                    	    pushFollow(FOLLOW_fact_in_fact_expression2214);
-                    	    f=fact();
-                    	    _fsp--;
-                    	    if (failed) return pd;
-                    	    if ( backtracking==0 ) {
-                    	      
-                    	       				((ColumnDescr)f).setIdentifier( id );
-                    	       				((OrDescr)pd).addDescr( f );
-                    	       			
-                    	    }
+                                }
+                                pushFollow( FOLLOW_fact_in_fact_expression2214 );
+                                f = fact();
+                                this._fsp--;
+                                if ( this.failed ) {
+                                    return pd;
+                                }
+                                if ( this.backtracking == 0 ) {
 
-                    	    }
-                    	    break;
+                                    ((ColumnDescr) f).setIdentifier( id );
+                                    ((OrDescr) pd).addDescr( f );
 
-                    	default :
-                    	    break loop28;
+                                }
+
+                            }
+                                break;
+
+                            default :
+                                break loop28;
                         }
-                    } while (true);
+                    } while ( true );
 
-
-                    }
+                }
                     break;
 
             }
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return pd;
     }
+
     // $ANTLR end fact_expression
 
-
     // $ANTLR start fact
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:866:1: fact returns [BaseDescr d] : id= dotted_name[d] loc= LEFT_PAREN ( ( constraints[column] )=> constraints[column] )? endLoc= RIGHT_PAREN ;
     public BaseDescr fact() throws RecognitionException {
         BaseDescr d = null;
 
-        Token loc=null;
-        Token endLoc=null;
+        Token loc = null;
+        Token endLoc = null;
         String id = null;
 
+        d = null;
+        ColumnDescr column = null;
 
-        
-        		d=null;
-        		ColumnDescr column = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:872:11: (id= dotted_name[d] loc= LEFT_PAREN ( ( constraints[column] )=> constraints[column] )? endLoc= RIGHT_PAREN )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:872:11: id= dotted_name[d] loc= LEFT_PAREN ( ( constraints[column] )=> constraints[column] )? endLoc= RIGHT_PAREN
             {
-            if ( backtracking==0 ) {
-              
-               			column = new ColumnDescr( );
-               			d = column; 
-               	        
-            }
-            pushFollow(FOLLOW_dotted_name_in_fact2275);
-            id=dotted_name(d);
-            _fsp--;
-            if (failed) return d;
-            if ( backtracking==0 ) {
-               
-               		        column.setObjectType( id );
-               		        column.setEndCharacter( -1 );
-               		
-            }
-            loc=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact2289); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-               				column.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-               			        column.setLeftParentCharacter( ((CommonToken)loc).getStartIndex() );
-               			
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:885:4: ( ( constraints[column] )=> constraints[column] )?
-            int alt30=2;
-            int LA30_0 = input.LA(1);
-            if ( ((LA30_0>=PACKAGE && LA30_0<=ATTRIBUTES)||LA30_0==ENABLED||LA30_0==SALIENCE||LA30_0==DURATION||(LA30_0>=ACCUMULATE && LA30_0<=LEFT_PAREN)||(LA30_0>=CONTAINS && LA30_0<=EXCLUDES)||LA30_0==NULL||(LA30_0>=AND && LA30_0<=THEN)) ) {
-                alt30=1;
-            }
-            switch (alt30) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:885:6: ( constraints[column] )=> constraints[column]
+                if ( this.backtracking == 0 ) {
+
+                    column = new ColumnDescr();
+                    d = column;
+
+                }
+                pushFollow( FOLLOW_dotted_name_in_fact2275 );
+                id = dotted_name( d );
+                this._fsp--;
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    column.setObjectType( id );
+                    column.setEndCharacter( -1 );
+
+                }
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       LEFT_PAREN,
+                       FOLLOW_LEFT_PAREN_in_fact2289 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    column.setLocation( offset( loc.getLine() ),
+                                        loc.getCharPositionInLine() );
+                    column.setLeftParentCharacter( ((CommonToken) loc).getStartIndex() );
+
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:885:4: ( ( constraints[column] )=> constraints[column] )?
+                int alt30 = 2;
+                final int LA30_0 = this.input.LA( 1 );
+                if ( ((LA30_0 >= PACKAGE && LA30_0 <= ATTRIBUTES) || LA30_0 == ENABLED || LA30_0 == SALIENCE || LA30_0 == DURATION || (LA30_0 >= ACCUMULATE && LA30_0 <= LEFT_PAREN) || (LA30_0 >= CONTAINS && LA30_0 <= EXCLUDES) || LA30_0 == NULL || (LA30_0 >= AND && LA30_0 <= THEN)) ) {
+                    alt30 = 1;
+                }
+                switch ( alt30 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:885:6: ( constraints[column] )=> constraints[column]
                     {
-                    pushFollow(FOLLOW_constraints_in_fact2299);
-                    constraints(column);
-                    _fsp--;
-                    if (failed) return d;
+                        pushFollow( FOLLOW_constraints_in_fact2299 );
+                        constraints( column );
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return d;
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-            endLoc=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact2312); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              		        if( endLoc.getType() == RIGHT_PAREN ) {
-              				column.setEndLocation( offset(endLoc.getLine()), endLoc.getCharPositionInLine() );	
-              				column.setEndCharacter( ((CommonToken)endLoc).getStopIndex() );
-               			        column.setRightParentCharacter( ((CommonToken)endLoc).getStartIndex() );
-              			}
-               		
-            }
+                endLoc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       RIGHT_PAREN,
+                       FOLLOW_RIGHT_PAREN_in_fact2312 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    if ( endLoc.getType() == RIGHT_PAREN ) {
+                        column.setEndLocation( offset( endLoc.getLine() ),
+                                               endLoc.getCharPositionInLine() );
+                        column.setEndCharacter( ((CommonToken) endLoc).getStopIndex() );
+                        column.setRightParentCharacter( ((CommonToken) endLoc).getStartIndex() );
+                    }
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end fact
 
-
     // $ANTLR start constraints
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:897:1: constraints[ColumnDescr column] : ( ( constraint[column] )=> constraint[column] | predicate[column] ) ( ( ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )=> ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )* ;
-    public void constraints(ColumnDescr column) throws RecognitionException {
+    public void constraints(final ColumnDescr column) throws RecognitionException {
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:898:4: ( ( ( constraint[column] )=> constraint[column] | predicate[column] ) ( ( ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )=> ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )* )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:898:4: ( ( constraint[column] )=> constraint[column] | predicate[column] ) ( ( ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )=> ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )*
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:898:4: ( ( constraint[column] )=> constraint[column] | predicate[column] )
-            int alt31=2;
-            int LA31_0 = input.LA(1);
-            if ( ((LA31_0>=PACKAGE && LA31_0<=ATTRIBUTES)||LA31_0==ENABLED||LA31_0==SALIENCE||LA31_0==DURATION||(LA31_0>=ACCUMULATE && LA31_0<=OR)||(LA31_0>=CONTAINS && LA31_0<=EXCLUDES)||LA31_0==NULL||(LA31_0>=AND && LA31_0<=THEN)) ) {
-                alt31=1;
-            }
-            else if ( (LA31_0==LEFT_PAREN) ) {
-                alt31=2;
-            }
-            else {
-                if (backtracking>0) {failed=true; return ;}
-                NoViableAltException nvae =
-                    new NoViableAltException("898:4: ( ( constraint[column] )=> constraint[column] | predicate[column] )", 31, 0, input);
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:898:4: ( ( constraint[column] )=> constraint[column] | predicate[column] )
+                int alt31 = 2;
+                final int LA31_0 = this.input.LA( 1 );
+                if ( ((LA31_0 >= PACKAGE && LA31_0 <= ATTRIBUTES) || LA31_0 == ENABLED || LA31_0 == SALIENCE || LA31_0 == DURATION || (LA31_0 >= ACCUMULATE && LA31_0 <= OR) || (LA31_0 >= CONTAINS && LA31_0 <= EXCLUDES) || LA31_0 == NULL || (LA31_0 >= AND && LA31_0 <= THEN)) ) {
+                    alt31 = 1;
+                } else if ( (LA31_0 == LEFT_PAREN) ) {
+                    alt31 = 2;
+                } else {
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return;
+                    }
+                    final NoViableAltException nvae = new NoViableAltException( "898:4: ( ( constraint[column] )=> constraint[column] | predicate[column] )",
+                                                                          31,
+                                                                          0,
+                                                                          this.input );
 
-                throw nvae;
-            }
-            switch (alt31) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:898:5: ( constraint[column] )=> constraint[column]
+                    throw nvae;
+                }
+                switch ( alt31 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:898:5: ( constraint[column] )=> constraint[column]
                     {
-                    pushFollow(FOLLOW_constraint_in_constraints2333);
-                    constraint(column);
-                    _fsp--;
-                    if (failed) return ;
+                        pushFollow( FOLLOW_constraint_in_constraints2333 );
+                        constraint( column );
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
-                case 2 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:898:24: predicate[column]
+                        break;
+                    case 2 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:898:24: predicate[column]
                     {
-                    pushFollow(FOLLOW_predicate_in_constraints2336);
-                    predicate(column);
-                    _fsp--;
-                    if (failed) return ;
+                        pushFollow( FOLLOW_predicate_in_constraints2336 );
+                        predicate( column );
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
-
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:899:3: ( ( ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )=> ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )*
-            loop33:
-            do {
-                int alt33=2;
-                int LA33_0 = input.LA(1);
-                if ( (LA33_0==66) ) {
-                    alt33=1;
                 }
 
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:899:3: ( ( ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )=> ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )*
+                loop33 : do {
+                    int alt33 = 2;
+                    final int LA33_0 = this.input.LA( 1 );
+                    if ( (LA33_0 == 66) ) {
+                        alt33 = 1;
+                    }
 
-                switch (alt33) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:899:5: ( ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )=> ',' ( ( constraint[column] )=> constraint[column] | predicate[column] )
-            	    {
-            	    match(input,66,FOLLOW_66_in_constraints2344); if (failed) return ;
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:899:9: ( ( constraint[column] )=> constraint[column] | predicate[column] )
-            	    int alt32=2;
-            	    int LA32_0 = input.LA(1);
-            	    if ( ((LA32_0>=PACKAGE && LA32_0<=ATTRIBUTES)||LA32_0==ENABLED||LA32_0==SALIENCE||LA32_0==DURATION||(LA32_0>=ACCUMULATE && LA32_0<=OR)||(LA32_0>=CONTAINS && LA32_0<=EXCLUDES)||LA32_0==NULL||(LA32_0>=AND && LA32_0<=THEN)) ) {
-            	        alt32=1;
-            	    }
-            	    else if ( (LA32_0==LEFT_PAREN) ) {
-            	        alt32=2;
-            	    }
-            	    else {
-            	        if (backtracking>0) {failed=true; return ;}
-            	        NoViableAltException nvae =
-            	            new NoViableAltException("899:9: ( ( constraint[column] )=> constraint[column] | predicate[column] )", 32, 0, input);
+                    switch ( alt33 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:899:5: ( ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )=> ',' ( ( constraint[column] )=> constraint[column] | predicate[column] )
+                        {
+                            match( this.input,
+                                   66,
+                                   FOLLOW_66_in_constraints2344 );
+                            if ( this.failed ) {
+                                return;
+                            }
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:899:9: ( ( constraint[column] )=> constraint[column] | predicate[column] )
+                            int alt32 = 2;
+                            final int LA32_0 = this.input.LA( 1 );
+                            if ( ((LA32_0 >= PACKAGE && LA32_0 <= ATTRIBUTES) || LA32_0 == ENABLED || LA32_0 == SALIENCE || LA32_0 == DURATION || (LA32_0 >= ACCUMULATE && LA32_0 <= OR) || (LA32_0 >= CONTAINS && LA32_0 <= EXCLUDES) || LA32_0 == NULL || (LA32_0 >= AND && LA32_0 <= THEN)) ) {
+                                alt32 = 1;
+                            } else if ( (LA32_0 == LEFT_PAREN) ) {
+                                alt32 = 2;
+                            } else {
+                                if ( this.backtracking > 0 ) {
+                                    this.failed = true;
+                                    return;
+                                }
+                                final NoViableAltException nvae = new NoViableAltException( "899:9: ( ( constraint[column] )=> constraint[column] | predicate[column] )",
+                                                                                      32,
+                                                                                      0,
+                                                                                      this.input );
 
-            	        throw nvae;
-            	    }
-            	    switch (alt32) {
-            	        case 1 :
-            	            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:899:10: ( constraint[column] )=> constraint[column]
-            	            {
-            	            pushFollow(FOLLOW_constraint_in_constraints2347);
-            	            constraint(column);
-            	            _fsp--;
-            	            if (failed) return ;
+                                throw nvae;
+                            }
+                            switch ( alt32 ) {
+                                case 1 :
+                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:899:10: ( constraint[column] )=> constraint[column]
+                                {
+                                    pushFollow( FOLLOW_constraint_in_constraints2347 );
+                                    constraint( column );
+                                    this._fsp--;
+                                    if ( this.failed ) {
+                                        return;
+                                    }
 
-            	            }
-            	            break;
-            	        case 2 :
-            	            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:899:29: predicate[column]
-            	            {
-            	            pushFollow(FOLLOW_predicate_in_constraints2350);
-            	            predicate(column);
-            	            _fsp--;
-            	            if (failed) return ;
+                                }
+                                    break;
+                                case 2 :
+                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:899:29: predicate[column]
+                                {
+                                    pushFollow( FOLLOW_predicate_in_constraints2350 );
+                                    predicate( column );
+                                    this._fsp--;
+                                    if ( this.failed ) {
+                                        return;
+                                    }
 
-            	            }
-            	            break;
+                                }
+                                    break;
 
-            	    }
+                            }
 
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            break loop33;
+                    }
+                } while ( true );
 
-            	default :
-            	    break loop33;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
+        return;
     }
+
     // $ANTLR end constraints
 
-
     // $ANTLR start constraint
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:902:1: constraint[ColumnDescr column] : ( ( ID ':' )=>fb= ID ':' )? f= identifier ( ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* ) )=> (rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* ) | ( '->' predicate[column] )=> '->' predicate[column] )? ;
-    public void constraint(ColumnDescr column) throws RecognitionException {
-        Token fb=null;
-        Token con=null;
+    public void constraint(final ColumnDescr column) throws RecognitionException {
+        Token fb = null;
+        Token con = null;
         Token f = null;
 
         RestrictionDescr rd = null;
 
+        FieldBindingDescr fbd = null;
+        FieldConstraintDescr fc = null;
 
-        
-        		FieldBindingDescr fbd = null;
-        		FieldConstraintDescr fc = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:908:3: ( ( ( ID ':' )=>fb= ID ':' )? f= identifier ( ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* ) )=> (rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* ) | ( '->' predicate[column] )=> '->' predicate[column] )? )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:908:3: ( ( ID ':' )=>fb= ID ':' )? f= identifier ( ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* ) )=> (rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* ) | ( '->' predicate[column] )=> '->' predicate[column] )?
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:908:3: ( ( ID ':' )=>fb= ID ':' )?
-            int alt34=2;
-            int LA34_0 = input.LA(1);
-            if ( (LA34_0==ID) ) {
-                int LA34_1 = input.LA(2);
-                if ( (LA34_1==67) ) {
-                    alt34=1;
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:908:3: ( ( ID ':' )=>fb= ID ':' )?
+                int alt34 = 2;
+                final int LA34_0 = this.input.LA( 1 );
+                if ( (LA34_0 == ID) ) {
+                    final int LA34_1 = this.input.LA( 2 );
+                    if ( (LA34_1 == 67) ) {
+                        alt34 = 1;
+                    }
                 }
-            }
-            switch (alt34) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:908:5: ( ID ':' )=>fb= ID ':'
+                switch ( alt34 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:908:5: ( ID ':' )=>fb= ID ':'
                     {
-                    fb=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_constraint2379); if (failed) return ;
-                    match(input,67,FOLLOW_67_in_constraint2381); if (failed) return ;
-                    if ( backtracking==0 ) {
-                       
-                      			fbd = new FieldBindingDescr();
-                      			fbd.setIdentifier( fb.getText() );
-                      			fbd.setLocation( offset(fb.getLine()), fb.getCharPositionInLine() );
-                      			fbd.setStartCharacter( ((CommonToken)fb).getStartIndex() );
-                      			column.addDescr( fbd );
-                      
-                      		    
-                    }
+                        fb = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               ID,
+                               FOLLOW_ID_in_constraint2379 );
+                        if ( this.failed ) {
+                            return;
+                        }
+                        match( this.input,
+                               67,
+                               FOLLOW_67_in_constraint2381 );
+                        if ( this.failed ) {
+                            return;
+                        }
+                        if ( this.backtracking == 0 ) {
 
-                    }
-                    break;
+                            fbd = new FieldBindingDescr();
+                            fbd.setIdentifier( fb.getText() );
+                            fbd.setLocation( offset( fb.getLine() ),
+                                             fb.getCharPositionInLine() );
+                            fbd.setStartCharacter( ((CommonToken) fb).getStartIndex() );
+                            column.addDescr( fbd );
 
-            }
+                        }
 
-            pushFollow(FOLLOW_identifier_in_constraint2402);
-            f=identifier();
-            _fsp--;
-            if (failed) return ;
-            if ( backtracking==0 ) {
-              
-              		    if( f != null ) {
-              		    
-              			if ( fbd != null ) {
-              			    fbd.setFieldName( f.getText() );
-               			    fbd.setEndCharacter( ((CommonToken)f).getStopIndex() );
-              			} 
-              			fc = new FieldConstraintDescr(f.getText());
-              			fc.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
-              			fc.setStartCharacter( ((CommonToken)f).getStartIndex() );
-              			
-              			// it must be a field constraint, as it is not a binding
-              			if( fb == null ) {
-              			    column.addDescr( fc );
-              			}
-              		    }
-              		
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:936:3: ( ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* ) )=> (rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* ) | ( '->' predicate[column] )=> '->' predicate[column] )?
-            int alt36=3;
-            int LA36_0 = input.LA(1);
-            if ( ((LA36_0>=CONTAINS && LA36_0<=EXCLUDES)||(LA36_0>=72 && LA36_0<=77)) ) {
-                alt36=1;
-            }
-            else if ( (LA36_0==71) ) {
-                alt36=2;
-            }
-            switch (alt36) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:937:4: ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* ) )=> (rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* )
-                    {
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:937:4: (rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* )
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:937:6: rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )*
-                    {
-                    pushFollow(FOLLOW_constraint_expression_in_constraint2420);
-                    rd=constraint_expression();
-                    _fsp--;
-                    if (failed) return ;
-                    if ( backtracking==0 ) {
-                      
-                      					fc.addRestriction(rd);
-                      					// we must add now as we didn't before
-                      					if( fb != null) {
-                      					    column.addDescr( fc );
-                      					}
-                      				
                     }
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:945:5: ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )*
-                    loop35:
-                    do {
-                        int alt35=2;
-                        int LA35_0 = input.LA(1);
-                        if ( ((LA35_0>=69 && LA35_0<=70)) ) {
-                            alt35=1;
-                        }
+                        break;
 
+                }
 
-                        switch (alt35) {
-                    	case 1 :
-                    	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:946:6: ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression
-                    	    {
-                    	    con=(Token)input.LT(1);
-                    	    if ( (input.LA(1)>=69 && input.LA(1)<=70) ) {
-                    	        input.consume();
-                    	        errorRecovery=false;failed=false;
-                    	    }
-                    	    else {
-                    	        if (backtracking>0) {failed=true; return ;}
-                    	        MismatchedSetException mse =
-                    	            new MismatchedSetException(null,input);
-                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_constraint2442);    throw mse;
-                    	    }
+                pushFollow( FOLLOW_identifier_in_constraint2402 );
+                f = identifier();
+                this._fsp--;
+                if ( this.failed ) {
+                    return;
+                }
+                if ( this.backtracking == 0 ) {
 
-                    	    if ( backtracking==0 ) {
-                    	      
-                    	      						if (con.getText().equals("&") ) {								
-                    	      							fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND));	
-                    	      						} else {
-                    	      							fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR));	
-                    	      						}							
-                    	      					
-                    	    }
-                    	    pushFollow(FOLLOW_constraint_expression_in_constraint2461);
-                    	    rd=constraint_expression();
-                    	    _fsp--;
-                    	    if (failed) return ;
-                    	    if ( backtracking==0 ) {
-                    	      
-                    	      					        if( rd != null ) {
-                    	      							fc.addRestriction(rd);
-                    	      					        }
-                    	      					
-                    	    }
+                    if ( f != null ) {
 
-                    	    }
-                    	    break;
+                        if ( fbd != null ) {
+                            fbd.setFieldName( f.getText() );
+                            fbd.setEndCharacter( ((CommonToken) f).getStopIndex() );
+                        }
+                        fc = new FieldConstraintDescr( f.getText() );
+                        fc.setLocation( offset( f.getLine() ),
+                                        f.getCharPositionInLine() );
+                        fc.setStartCharacter( ((CommonToken) f).getStartIndex() );
 
-                    	default :
-                    	    break loop35;
+                        // it must be a field constraint, as it is not a binding
+                        if ( fb == null ) {
+                            column.addDescr( fc );
                         }
-                    } while (true);
+                    }
 
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:936:3: ( ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* ) )=> (rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* ) | ( '->' predicate[column] )=> '->' predicate[column] )?
+                int alt36 = 3;
+                final int LA36_0 = this.input.LA( 1 );
+                if ( ((LA36_0 >= CONTAINS && LA36_0 <= EXCLUDES) || (LA36_0 >= 72 && LA36_0 <= 77)) ) {
+                    alt36 = 1;
+                } else if ( (LA36_0 == 71) ) {
+                    alt36 = 2;
+                }
+                switch ( alt36 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:937:4: ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* ) )=> (rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* )
+                    {
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:937:4: (rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* )
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:937:6: rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )*
+                        {
+                            pushFollow( FOLLOW_constraint_expression_in_constraint2420 );
+                            rd = constraint_expression();
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return;
+                            }
+                            if ( this.backtracking == 0 ) {
 
-                    }
+                                fc.addRestriction( rd );
+                                // we must add now as we didn't before
+                                if ( fb != null ) {
+                                    column.addDescr( fc );
+                                }
 
+                            }
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:945:5: ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )*
+                            loop35 : do {
+                                int alt35 = 2;
+                                final int LA35_0 = this.input.LA( 1 );
+                                if ( ((LA35_0 >= 69 && LA35_0 <= 70)) ) {
+                                    alt35 = 1;
+                                }
 
+                                switch ( alt35 ) {
+                                    case 1 :
+                                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:946:6: ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression
+                                    {
+                                        con = (Token) this.input.LT( 1 );
+                                        if ( (this.input.LA( 1 ) >= 69 && this.input.LA( 1 ) <= 70) ) {
+                                            this.input.consume();
+                                            this.errorRecovery = false;
+                                            this.failed = false;
+                                        } else {
+                                            if ( this.backtracking > 0 ) {
+                                                this.failed = true;
+                                                return;
+                                            }
+                                            final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                                     this.input );
+                                            recoverFromMismatchedSet( this.input,
+                                                                      mse,
+                                                                      FOLLOW_set_in_constraint2442 );
+                                            throw mse;
+                                        }
+
+                                        if ( this.backtracking == 0 ) {
+
+                                            if ( con.getText().equals( "&" ) ) {
+                                                fc.addRestriction( new RestrictionConnectiveDescr( RestrictionConnectiveDescr.AND ) );
+                                            } else {
+                                                fc.addRestriction( new RestrictionConnectiveDescr( RestrictionConnectiveDescr.OR ) );
+                                            }
+
+                                        }
+                                        pushFollow( FOLLOW_constraint_expression_in_constraint2461 );
+                                        rd = constraint_expression();
+                                        this._fsp--;
+                                        if ( this.failed ) {
+                                            return;
+                                        }
+                                        if ( this.backtracking == 0 ) {
+
+                                            if ( rd != null ) {
+                                                fc.addRestriction( rd );
+                                            }
+
+                                        }
+
+                                    }
+                                        break;
+
+                                    default :
+                                        break loop35;
+                                }
+                            } while ( true );
+
+                        }
+
                     }
-                    break;
-                case 2 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:963:4: ( '->' predicate[column] )=> '->' predicate[column]
+                        break;
+                    case 2 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:963:4: ( '->' predicate[column] )=> '->' predicate[column]
                     {
-                    match(input,71,FOLLOW_71_in_constraint2489); if (failed) return ;
-                    pushFollow(FOLLOW_predicate_in_constraint2491);
-                    predicate(column);
-                    _fsp--;
-                    if (failed) return ;
+                        match( this.input,
+                               71,
+                               FOLLOW_71_in_constraint2489 );
+                        if ( this.failed ) {
+                            return;
+                        }
+                        pushFollow( FOLLOW_predicate_in_constraint2491 );
+                        predicate( column );
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return;
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
+        return;
     }
+
     // $ANTLR end constraint
 
-
     // $ANTLR start constraint_expression
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:967:1: constraint_expression returns [RestrictionDescr rd] : op= ('=='|'>'|'>='|'<'|'<='|'!='|CONTAINS|MATCHES|EXCLUDES) ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint ) ;
     public RestrictionDescr constraint_expression() throws RecognitionException {
         RestrictionDescr rd = null;
 
-        Token op=null;
-        Token bvc=null;
+        Token op = null;
+        Token bvc = null;
         String lc = null;
 
         String rvc = null;
 
-
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:969:3: (op= ('=='|'>'|'>='|'<'|'<='|'!='|CONTAINS|MATCHES|EXCLUDES) ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint ) )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:969:3: op= ('=='|'>'|'>='|'<'|'<='|'!='|CONTAINS|MATCHES|EXCLUDES) ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint )
             {
-            op=(Token)input.LT(1);
-            if ( (input.LA(1)>=CONTAINS && input.LA(1)<=EXCLUDES)||(input.LA(1)>=72 && input.LA(1)<=77) ) {
-                input.consume();
-                errorRecovery=false;failed=false;
-            }
-            else {
-                if (backtracking>0) {failed=true; return rd;}
-                MismatchedSetException mse =
-                    new MismatchedSetException(null,input);
-                recoverFromMismatchedSet(input,mse,FOLLOW_set_in_constraint_expression2528);    throw mse;
-            }
-
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:979:3: ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint )
-            int alt37=4;
-            switch ( input.LA(1) ) {
-            case ID:
-                int LA37_1 = input.LA(2);
-                if ( (LA37_1==64) ) {
-                    alt37=2;
+                op = (Token) this.input.LT( 1 );
+                if ( (this.input.LA( 1 ) >= CONTAINS && this.input.LA( 1 ) <= EXCLUDES) || (this.input.LA( 1 ) >= 72 && this.input.LA( 1 ) <= 77) ) {
+                    this.input.consume();
+                    this.errorRecovery = false;
+                    this.failed = false;
+                } else {
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return rd;
+                    }
+                    final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                             this.input );
+                    recoverFromMismatchedSet( this.input,
+                                              mse,
+                                              FOLLOW_set_in_constraint_expression2528 );
+                    throw mse;
                 }
-                else if ( (LA37_1==EOF||LA37_1==RIGHT_PAREN||LA37_1==66||(LA37_1>=69 && LA37_1<=70)) ) {
-                    alt37=1;
-                }
-                else {
-                    if (backtracking>0) {failed=true; return rd;}
-                    NoViableAltException nvae =
-                        new NoViableAltException("979:3: ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint )", 37, 1, input);
 
-                    throw nvae;
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:979:3: ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint )
+                int alt37 = 4;
+                switch ( this.input.LA( 1 ) ) {
+                    case ID :
+                        final int LA37_1 = this.input.LA( 2 );
+                        if ( (LA37_1 == 64) ) {
+                            alt37 = 2;
+                        } else if ( (LA37_1 == EOF || LA37_1 == RIGHT_PAREN || LA37_1 == 66 || (LA37_1 >= 69 && LA37_1 <= 70)) ) {
+                            alt37 = 1;
+                        } else {
+                            if ( this.backtracking > 0 ) {
+                                this.failed = true;
+                                return rd;
+                            }
+                            final NoViableAltException nvae = new NoViableAltException( "979:3: ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint )",
+                                                                                  37,
+                                                                                  1,
+                                                                                  this.input );
+
+                            throw nvae;
+                        }
+                        break;
+                    case STRING :
+                    case BOOL :
+                    case INT :
+                    case FLOAT :
+                    case NULL :
+                        alt37 = 3;
+                        break;
+                    case LEFT_PAREN :
+                        alt37 = 4;
+                        break;
+                    default :
+                        if ( this.backtracking > 0 ) {
+                            this.failed = true;
+                            return rd;
+                        }
+                        final NoViableAltException nvae = new NoViableAltException( "979:3: ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint )",
+                                                                              37,
+                                                                              0,
+                                                                              this.input );
+
+                        throw nvae;
                 }
-                break;
-            case STRING:
-            case BOOL:
-            case INT:
-            case FLOAT:
-            case NULL:
-                alt37=3;
-                break;
-            case LEFT_PAREN:
-                alt37=4;
-                break;
-            default:
-                if (backtracking>0) {failed=true; return rd;}
-                NoViableAltException nvae =
-                    new NoViableAltException("979:3: ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint )", 37, 0, input);
 
-                throw nvae;
-            }
-
-            switch (alt37) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:979:5: ( ID )=>bvc= ID
+                switch ( alt37 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:979:5: ( ID )=>bvc= ID
                     {
-                    bvc=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_constraint_expression2595); if (failed) return rd;
-                    if ( backtracking==0 ) {
-                      
-                      				rd = new VariableRestrictionDescr(op.getText(), bvc.getText());
-                      			
-                    }
+                        bvc = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               ID,
+                               FOLLOW_ID_in_constraint_expression2595 );
+                        if ( this.failed ) {
+                            return rd;
+                        }
+                        if ( this.backtracking == 0 ) {
 
+                            rd = new VariableRestrictionDescr( op.getText(),
+                                                               bvc.getText() );
+
+                        }
+
                     }
-                    break;
-                case 2 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:984:4: ( enum_constraint )=>lc= enum_constraint
+                        break;
+                    case 2 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:984:4: ( enum_constraint )=>lc= enum_constraint
                     {
-                    pushFollow(FOLLOW_enum_constraint_in_constraint_expression2611);
-                    lc=enum_constraint();
-                    _fsp--;
-                    if (failed) return rd;
-                    if ( backtracking==0 ) {
-                       
-                      				rd  = new LiteralRestrictionDescr(op.getText(), lc, true);
-                      			
-                    }
+                        pushFollow( FOLLOW_enum_constraint_in_constraint_expression2611 );
+                        lc = enum_constraint();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return rd;
+                        }
+                        if ( this.backtracking == 0 ) {
 
+                            rd = new LiteralRestrictionDescr( op.getText(),
+                                                              lc,
+                                                              true );
+
+                        }
+
                     }
-                    break;
-                case 3 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:989:4: ( literal_constraint )=>lc= literal_constraint
+                        break;
+                    case 3 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:989:4: ( literal_constraint )=>lc= literal_constraint
                     {
-                    pushFollow(FOLLOW_literal_constraint_in_constraint_expression2634);
-                    lc=literal_constraint();
-                    _fsp--;
-                    if (failed) return rd;
-                    if ( backtracking==0 ) {
-                       
-                      				rd  = new LiteralRestrictionDescr(op.getText(), lc);
-                      			
-                    }
+                        pushFollow( FOLLOW_literal_constraint_in_constraint_expression2634 );
+                        lc = literal_constraint();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return rd;
+                        }
+                        if ( this.backtracking == 0 ) {
 
+                            rd = new LiteralRestrictionDescr( op.getText(),
+                                                              lc );
+
+                        }
+
                     }
-                    break;
-                case 4 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:993:5: rvc= retval_constraint
+                        break;
+                    case 4 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:993:5: rvc= retval_constraint
                     {
-                    pushFollow(FOLLOW_retval_constraint_in_constraint_expression2648);
-                    rvc=retval_constraint();
-                    _fsp--;
-                    if (failed) return rd;
-                    if ( backtracking==0 ) {
-                       
-                      				rd = new ReturnValueRestrictionDescr(op.getText(), rvc);							
-                      			
-                    }
+                        pushFollow( FOLLOW_retval_constraint_in_constraint_expression2648 );
+                        rvc = retval_constraint();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return rd;
+                        }
+                        if ( this.backtracking == 0 ) {
 
+                            rd = new ReturnValueRestrictionDescr( op.getText(),
+                                                                  rvc );
+
+                        }
+
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return rd;
     }
+
     // $ANTLR end constraint_expression
 
-
     // $ANTLR start literal_constraint
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1000:1: literal_constraint returns [String text] : ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= NULL ) ;
     public String literal_constraint() throws RecognitionException {
         String text = null;
 
-        Token t=null;
+        Token t = null;
 
-        
-        		text = null;
-        	
+        text = null;
+
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1004:4: ( ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= NULL ) )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1004:4: ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= NULL )
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1004:4: ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= NULL )
-            int alt38=5;
-            switch ( input.LA(1) ) {
-            case STRING:
-                alt38=1;
-                break;
-            case INT:
-                alt38=2;
-                break;
-            case FLOAT:
-                alt38=3;
-                break;
-            case BOOL:
-                alt38=4;
-                break;
-            case NULL:
-                alt38=5;
-                break;
-            default:
-                if (backtracking>0) {failed=true; return text;}
-                NoViableAltException nvae =
-                    new NoViableAltException("1004:4: ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= NULL )", 38, 0, input);
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1004:4: ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= NULL )
+                int alt38 = 5;
+                switch ( this.input.LA( 1 ) ) {
+                    case STRING :
+                        alt38 = 1;
+                        break;
+                    case INT :
+                        alt38 = 2;
+                        break;
+                    case FLOAT :
+                        alt38 = 3;
+                        break;
+                    case BOOL :
+                        alt38 = 4;
+                        break;
+                    case NULL :
+                        alt38 = 5;
+                        break;
+                    default :
+                        if ( this.backtracking > 0 ) {
+                            this.failed = true;
+                            return text;
+                        }
+                        final NoViableAltException nvae = new NoViableAltException( "1004:4: ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= NULL )",
+                                                                              38,
+                                                                              0,
+                                                                              this.input );
 
-                throw nvae;
-            }
+                        throw nvae;
+                }
 
-            switch (alt38) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1004:6: ( STRING )=>t= STRING
+                switch ( alt38 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1004:6: ( STRING )=>t= STRING
                     {
-                    t=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_literal_constraint2687); if (failed) return text;
-                    if ( backtracking==0 ) {
-                       text = getString( t ); 
-                    }
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               STRING,
+                               FOLLOW_STRING_in_literal_constraint2687 );
+                        if ( this.failed ) {
+                            return text;
+                        }
+                        if ( this.backtracking == 0 ) {
+                            text = getString( t );
+                        }
 
                     }
-                    break;
-                case 2 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1005:5: ( INT )=>t= INT
+                        break;
+                    case 2 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1005:5: ( INT )=>t= INT
                     {
-                    t=(Token)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_literal_constraint2698); if (failed) return text;
-                    if ( backtracking==0 ) {
-                       text = t.getText(); 
-                    }
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               INT,
+                               FOLLOW_INT_in_literal_constraint2698 );
+                        if ( this.failed ) {
+                            return text;
+                        }
+                        if ( this.backtracking == 0 ) {
+                            text = t.getText();
+                        }
 
                     }
-                    break;
-                case 3 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1006:5: ( FLOAT )=>t= FLOAT
+                        break;
+                    case 3 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1006:5: ( FLOAT )=>t= FLOAT
                     {
-                    t=(Token)input.LT(1);
-                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint2711); if (failed) return text;
-                    if ( backtracking==0 ) {
-                       text = t.getText(); 
-                    }
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               FLOAT,
+                               FOLLOW_FLOAT_in_literal_constraint2711 );
+                        if ( this.failed ) {
+                            return text;
+                        }
+                        if ( this.backtracking == 0 ) {
+                            text = t.getText();
+                        }
 
                     }
-                    break;
-                case 4 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1007:5: ( BOOL )=>t= BOOL
+                        break;
+                    case 4 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1007:5: ( BOOL )=>t= BOOL
                     {
-                    t=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint2722); if (failed) return text;
-                    if ( backtracking==0 ) {
-                       text = t.getText(); 
-                    }
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               BOOL,
+                               FOLLOW_BOOL_in_literal_constraint2722 );
+                        if ( this.failed ) {
+                            return text;
+                        }
+                        if ( this.backtracking == 0 ) {
+                            text = t.getText();
+                        }
 
                     }
-                    break;
-                case 5 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1008:5: t= NULL
+                        break;
+                    case 5 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1008:5: t= NULL
                     {
-                    t=(Token)input.LT(1);
-                    match(input,NULL,FOLLOW_NULL_in_literal_constraint2734); if (failed) return text;
-                    if ( backtracking==0 ) {
-                       text = null; 
-                    }
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               NULL,
+                               FOLLOW_NULL_in_literal_constraint2734 );
+                        if ( this.failed ) {
+                            return text;
+                        }
+                        if ( this.backtracking == 0 ) {
+                            text = null;
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return text;
     }
+
     // $ANTLR end literal_constraint
 
-
     // $ANTLR start enum_constraint
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1012:1: enum_constraint returns [String text] : id= ID ( ( '.' identifier )=> '.' ident= identifier )+ ;
     public String enum_constraint() throws RecognitionException {
         String text = null;
 
-        Token id=null;
+        Token id = null;
         Token ident = null;
 
+        text = null;
 
-        
-        		text = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1017:3: (id= ID ( ( '.' identifier )=> '.' ident= identifier )+ )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1017:3: id= ID ( ( '.' identifier )=> '.' ident= identifier )+
             {
-            id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_enum_constraint2769); if (failed) return text;
-            if ( backtracking==0 ) {
-               text=id.getText(); 
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1017:32: ( ( '.' identifier )=> '.' ident= identifier )+
-            int cnt39=0;
-            loop39:
-            do {
-                int alt39=2;
-                int LA39_0 = input.LA(1);
-                if ( (LA39_0==64) ) {
-                    alt39=1;
+                id = (Token) this.input.LT( 1 );
+                match( this.input,
+                       ID,
+                       FOLLOW_ID_in_enum_constraint2769 );
+                if ( this.failed ) {
+                    return text;
                 }
+                if ( this.backtracking == 0 ) {
+                    text = id.getText();
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1017:32: ( ( '.' identifier )=> '.' ident= identifier )+
+                int cnt39 = 0;
+                loop39 : do {
+                    int alt39 = 2;
+                    final int LA39_0 = this.input.LA( 1 );
+                    if ( (LA39_0 == 64) ) {
+                        alt39 = 1;
+                    }
 
+                    switch ( alt39 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1017:34: ( '.' identifier )=> '.' ident= identifier
+                        {
+                            match( this.input,
+                                   64,
+                                   FOLLOW_64_in_enum_constraint2775 );
+                            if ( this.failed ) {
+                                return text;
+                            }
+                            pushFollow( FOLLOW_identifier_in_enum_constraint2779 );
+                            ident = identifier();
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return text;
+                            }
+                            if ( this.backtracking == 0 ) {
+                                text += "." + ident.getText();
+                            }
 
-                switch (alt39) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1017:34: ( '.' identifier )=> '.' ident= identifier
-            	    {
-            	    match(input,64,FOLLOW_64_in_enum_constraint2775); if (failed) return text;
-            	    pushFollow(FOLLOW_identifier_in_enum_constraint2779);
-            	    ident=identifier();
-            	    _fsp--;
-            	    if (failed) return text;
-            	    if ( backtracking==0 ) {
-            	       text += "." + ident.getText(); 
-            	    }
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            if ( cnt39 >= 1 ) {
+                                break loop39;
+                            }
+                            if ( this.backtracking > 0 ) {
+                                this.failed = true;
+                                return text;
+                            }
+                            final EarlyExitException eee = new EarlyExitException( 39,
+                                                                             this.input );
+                            throw eee;
+                    }
+                    cnt39++;
+                } while ( true );
 
-            	default :
-            	    if ( cnt39 >= 1 ) break loop39;
-            	    if (backtracking>0) {failed=true; return text;}
-                        EarlyExitException eee =
-                            new EarlyExitException(39, input);
-                        throw eee;
-                }
-                cnt39++;
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return text;
     }
+
     // $ANTLR end enum_constraint
 
-
     // $ANTLR start predicate
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1021:1: predicate[ColumnDescr column] : text= paren_chunk[d] ;
-    public void predicate(ColumnDescr column) throws RecognitionException {
+    public void predicate(final ColumnDescr column) throws RecognitionException {
         String text = null;
 
+        PredicateDescr d = null;
 
-        
-        		PredicateDescr d = null;
-                
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1026:3: (text= paren_chunk[d] )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1026:3: text= paren_chunk[d]
             {
-            if ( backtracking==0 ) {
-              
-              			d = new PredicateDescr( );
-              		
-            }
-            pushFollow(FOLLOW_paren_chunk_in_predicate2821);
-            text=paren_chunk(d);
-            _fsp--;
-            if (failed) return ;
-            if ( backtracking==0 ) {
-              
-              		        if( text != null ) {
-              			        String body = text.substring(1, text.length()-1);
-              			        d.setContent( body );
-              				column.addDescr( d );
-              		        }
-              		
-            }
+                if ( this.backtracking == 0 ) {
 
+                    d = new PredicateDescr();
+
+                }
+                pushFollow( FOLLOW_paren_chunk_in_predicate2821 );
+                text = paren_chunk( d );
+                this._fsp--;
+                if ( this.failed ) {
+                    return;
+                }
+                if ( this.backtracking == 0 ) {
+
+                    if ( text != null ) {
+                        final String body = text.substring( 1,
+                                                      text.length() - 1 );
+                        d.setContent( body );
+                        column.addDescr( d );
+                    }
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
+        return;
     }
+
     // $ANTLR end predicate
 
-
     // $ANTLR start paren_chunk
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1039:1: paren_chunk[BaseDescr descr] returns [String text] : loc= LEFT_PAREN ( (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN) | ( paren_chunk[null] )=>chunk= paren_chunk[null] )* loc= RIGHT_PAREN ;
-    public String paren_chunk(BaseDescr descr) throws RecognitionException {
+    public String paren_chunk(final BaseDescr descr) throws RecognitionException {
         String text = null;
 
-        Token loc=null;
+        Token loc = null;
         String chunk = null;
 
+        StringBuffer buf = null;
+        Integer channel = null;
 
-        
-                   StringBuffer buf = null;
-                   Integer channel = null;
-                
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1045:10: (loc= LEFT_PAREN ( (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN) | ( paren_chunk[null] )=>chunk= paren_chunk[null] )* loc= RIGHT_PAREN )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1045:10: loc= LEFT_PAREN ( (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN) | ( paren_chunk[null] )=>chunk= paren_chunk[null] )* loc= RIGHT_PAREN
             {
-            if ( backtracking==0 ) {
-              
-              	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
-              		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
-              		    buf = new StringBuffer();
-              	        
-            }
-            loc=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_paren_chunk2870); if (failed) return text;
-            if ( backtracking==0 ) {
-              
-              		    buf.append( loc.getText());
-               
-              		
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1055:3: ( (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN) | ( paren_chunk[null] )=>chunk= paren_chunk[null] )*
-            loop40:
-            do {
-                int alt40=3;
-                int LA40_0 = input.LA(1);
-                if ( ((LA40_0>=PACKAGE && LA40_0<=OR)||(LA40_0>=CONTAINS && LA40_0<=78)) ) {
-                    alt40=1;
+                if ( this.backtracking == 0 ) {
+
+                    channel = ((SwitchingCommonTokenStream) this.input).getTokenTypeChannel( WS );
+                    ((SwitchingCommonTokenStream) this.input).setTokenTypeChannel( WS,
+                                                                              Token.DEFAULT_CHANNEL );
+                    buf = new StringBuffer();
+
                 }
-                else if ( (LA40_0==LEFT_PAREN) ) {
-                    alt40=2;
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       LEFT_PAREN,
+                       FOLLOW_LEFT_PAREN_in_paren_chunk2870 );
+                if ( this.failed ) {
+                    return text;
                 }
+                if ( this.backtracking == 0 ) {
 
+                    buf.append( loc.getText() );
 
-                switch (alt40) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1056:4: (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN)
-            	    {
-            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=OR)||(input.LA(1)>=CONTAINS && input.LA(1)<=78) ) {
-            	        input.consume();
-            	        errorRecovery=false;failed=false;
-            	    }
-            	    else {
-            	        if (backtracking>0) {failed=true; return text;}
-            	        MismatchedSetException mse =
-            	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk2886);    throw mse;
-            	    }
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1055:3: ( (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN) | ( paren_chunk[null] )=>chunk= paren_chunk[null] )*
+                loop40 : do {
+                    int alt40 = 3;
+                    final int LA40_0 = this.input.LA( 1 );
+                    if ( ((LA40_0 >= PACKAGE && LA40_0 <= OR) || (LA40_0 >= CONTAINS && LA40_0 <= 78)) ) {
+                        alt40 = 1;
+                    } else if ( (LA40_0 == LEFT_PAREN) ) {
+                        alt40 = 2;
+                    }
 
-            	    if ( backtracking==0 ) {
-            	      
-            	      			    buf.append( input.LT(-1).getText() );
-            	      			  
-            	    }
+                    switch ( alt40 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1056:4: (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN)
+                        {
+                            if ( (this.input.LA( 1 ) >= PACKAGE && this.input.LA( 1 ) <= OR) || (this.input.LA( 1 ) >= CONTAINS && this.input.LA( 1 ) <= 78) ) {
+                                this.input.consume();
+                                this.errorRecovery = false;
+                                this.failed = false;
+                            } else {
+                                if ( this.backtracking > 0 ) {
+                                    this.failed = true;
+                                    return text;
+                                }
+                                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                         this.input );
+                                recoverFromMismatchedSet( this.input,
+                                                          mse,
+                                                          FOLLOW_set_in_paren_chunk2886 );
+                                throw mse;
+                            }
 
-            	    }
-            	    break;
-            	case 2 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1061:4: ( paren_chunk[null] )=>chunk= paren_chunk[null]
-            	    {
-            	    pushFollow(FOLLOW_paren_chunk_in_paren_chunk2910);
-            	    chunk=paren_chunk(null);
-            	    _fsp--;
-            	    if (failed) return text;
-            	    if ( backtracking==0 ) {
-            	      
-            	      			    buf.append( chunk );
-            	      			  
-            	    }
+                            if ( this.backtracking == 0 ) {
 
-            	    }
-            	    break;
+                                buf.append( this.input.LT( -1 ).getText() );
 
-            	default :
-            	    break loop40;
+                            }
+
+                        }
+                            break;
+                        case 2 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1061:4: ( paren_chunk[null] )=>chunk= paren_chunk[null]
+                        {
+                            pushFollow( FOLLOW_paren_chunk_in_paren_chunk2910 );
+                            chunk = paren_chunk( null );
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return text;
+                            }
+                            if ( this.backtracking == 0 ) {
+
+                                buf.append( chunk );
+
+                            }
+
+                        }
+                            break;
+
+                        default :
+                            break loop40;
+                    }
+                } while ( true );
+
+                if ( this.backtracking == 0 ) {
+
+                    if ( channel != null ) {
+                        ((SwitchingCommonTokenStream) this.input).setTokenTypeChannel( WS,
+                                                                                  channel.intValue() );
+                    } else {
+                        ((SwitchingCommonTokenStream) this.input).setTokenTypeChannel( WS,
+                                                                                  Token.HIDDEN_CHANNEL );
+                    }
+
                 }
-            } while (true);
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       RIGHT_PAREN,
+                       FOLLOW_RIGHT_PAREN_in_paren_chunk2947 );
+                if ( this.failed ) {
+                    return text;
+                }
+                if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
-              
-              		    if( channel != null ) {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
-              		    } else {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
-              		    }
-              		
-            }
-            loc=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk2947); if (failed) return text;
-            if ( backtracking==0 ) {
-              
-                                  buf.append( loc.getText() );
-              		    text = buf.toString();
-              		    if( descr != null ) {
-              		        descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-              		    }
-                              
-            }
+                    buf.append( loc.getText() );
+                    text = buf.toString();
+                    if ( descr != null ) {
+                        descr.setEndCharacter( ((CommonToken) loc).getStopIndex() );
+                    }
 
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return text;
     }
+
     // $ANTLR end paren_chunk
 
-
     // $ANTLR start curly_chunk
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1083:1: curly_chunk[BaseDescr descr] returns [String text] : loc= LEFT_CURLY ( (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY) | ( curly_chunk[descr] )=>chunk= curly_chunk[descr] )* loc= RIGHT_CURLY ;
-    public String curly_chunk(BaseDescr descr) throws RecognitionException {
+    public String curly_chunk(final BaseDescr descr) throws RecognitionException {
         String text = null;
 
-        Token loc=null;
+        Token loc = null;
         String chunk = null;
 
+        StringBuffer buf = null;
+        Integer channel = null;
 
-        
-                   StringBuffer buf = null;
-                   Integer channel = null;
-                
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1089:3: (loc= LEFT_CURLY ( (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY) | ( curly_chunk[descr] )=>chunk= curly_chunk[descr] )* loc= RIGHT_CURLY )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1089:3: loc= LEFT_CURLY ( (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY) | ( curly_chunk[descr] )=>chunk= curly_chunk[descr] )* loc= RIGHT_CURLY
             {
-            loc=(Token)input.LT(1);
-            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_curly_chunk2998); if (failed) return text;
-            if ( backtracking==0 ) {
-              
-              	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
-              		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
-              		    buf = new StringBuffer();
-              		    
-              		    buf.append( loc.getText() );
-              		
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1097:3: ( (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY) | ( curly_chunk[descr] )=>chunk= curly_chunk[descr] )*
-            loop41:
-            do {
-                int alt41=3;
-                int LA41_0 = input.LA(1);
-                if ( ((LA41_0>=PACKAGE && LA41_0<=NULL)||(LA41_0>=LEFT_SQUARE && LA41_0<=78)) ) {
-                    alt41=1;
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       LEFT_CURLY,
+                       FOLLOW_LEFT_CURLY_in_curly_chunk2998 );
+                if ( this.failed ) {
+                    return text;
                 }
-                else if ( (LA41_0==LEFT_CURLY) ) {
-                    alt41=2;
+                if ( this.backtracking == 0 ) {
+
+                    channel = ((SwitchingCommonTokenStream) this.input).getTokenTypeChannel( WS );
+                    ((SwitchingCommonTokenStream) this.input).setTokenTypeChannel( WS,
+                                                                              Token.DEFAULT_CHANNEL );
+                    buf = new StringBuffer();
+
+                    buf.append( loc.getText() );
+
                 }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1097:3: ( (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY) | ( curly_chunk[descr] )=>chunk= curly_chunk[descr] )*
+                loop41 : do {
+                    int alt41 = 3;
+                    final int LA41_0 = this.input.LA( 1 );
+                    if ( ((LA41_0 >= PACKAGE && LA41_0 <= NULL) || (LA41_0 >= LEFT_SQUARE && LA41_0 <= 78)) ) {
+                        alt41 = 1;
+                    } else if ( (LA41_0 == LEFT_CURLY) ) {
+                        alt41 = 2;
+                    }
 
+                    switch ( alt41 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1098:4: (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY)
+                        {
+                            if ( (this.input.LA( 1 ) >= PACKAGE && this.input.LA( 1 ) <= NULL) || (this.input.LA( 1 ) >= LEFT_SQUARE && this.input.LA( 1 ) <= 78) ) {
+                                this.input.consume();
+                                this.errorRecovery = false;
+                                this.failed = false;
+                            } else {
+                                if ( this.backtracking > 0 ) {
+                                    this.failed = true;
+                                    return text;
+                                }
+                                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                         this.input );
+                                recoverFromMismatchedSet( this.input,
+                                                          mse,
+                                                          FOLLOW_set_in_curly_chunk3014 );
+                                throw mse;
+                            }
 
-                switch (alt41) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1098:4: (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY)
-            	    {
-            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=NULL)||(input.LA(1)>=LEFT_SQUARE && input.LA(1)<=78) ) {
-            	        input.consume();
-            	        errorRecovery=false;failed=false;
-            	    }
-            	    else {
-            	        if (backtracking>0) {failed=true; return text;}
-            	        MismatchedSetException mse =
-            	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk3014);    throw mse;
-            	    }
+                            if ( this.backtracking == 0 ) {
 
-            	    if ( backtracking==0 ) {
-            	      
-            	      			    buf.append( input.LT(-1).getText() );
-            	      			  
-            	    }
+                                buf.append( this.input.LT( -1 ).getText() );
 
-            	    }
-            	    break;
-            	case 2 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1103:4: ( curly_chunk[descr] )=>chunk= curly_chunk[descr]
-            	    {
-            	    pushFollow(FOLLOW_curly_chunk_in_curly_chunk3038);
-            	    chunk=curly_chunk(descr);
-            	    _fsp--;
-            	    if (failed) return text;
-            	    if ( backtracking==0 ) {
-            	      
-            	      			    buf.append( chunk );
-            	      			  
-            	    }
+                            }
 
-            	    }
-            	    break;
+                        }
+                            break;
+                        case 2 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1103:4: ( curly_chunk[descr] )=>chunk= curly_chunk[descr]
+                        {
+                            pushFollow( FOLLOW_curly_chunk_in_curly_chunk3038 );
+                            chunk = curly_chunk( descr );
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return text;
+                            }
+                            if ( this.backtracking == 0 ) {
 
-            	default :
-            	    break loop41;
+                                buf.append( chunk );
+
+                            }
+
+                        }
+                            break;
+
+                        default :
+                            break loop41;
+                    }
+                } while ( true );
+
+                if ( this.backtracking == 0 ) {
+
+                    if ( channel != null ) {
+                        ((SwitchingCommonTokenStream) this.input).setTokenTypeChannel( WS,
+                                                                                  channel.intValue() );
+                    } else {
+                        ((SwitchingCommonTokenStream) this.input).setTokenTypeChannel( WS,
+                                                                                  Token.HIDDEN_CHANNEL );
+                    }
+
                 }
-            } while (true);
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       RIGHT_CURLY,
+                       FOLLOW_RIGHT_CURLY_in_curly_chunk3075 );
+                if ( this.failed ) {
+                    return text;
+                }
+                if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
-              
-              		    if( channel != null ) {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
-              		    } else {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
-              		    }
-              		
-            }
-            loc=(Token)input.LT(1);
-            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk3075); if (failed) return text;
-            if ( backtracking==0 ) {
-              
-                                  buf.append( loc.getText() );
-              		    text = buf.toString();
-              		    if( descr != null ) {
-              		        descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-              		    }
-                              
-            }
+                    buf.append( loc.getText() );
+                    text = buf.toString();
+                    if ( descr != null ) {
+                        descr.setEndCharacter( ((CommonToken) loc).getStopIndex() );
+                    }
 
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return text;
     }
+
     // $ANTLR end curly_chunk
 
-
     // $ANTLR start square_chunk
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1125:1: square_chunk[BaseDescr descr] returns [String text] : loc= LEFT_SQUARE ( (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE) | ( square_chunk[null] )=>chunk= square_chunk[null] )* loc= RIGHT_SQUARE ;
-    public String square_chunk(BaseDescr descr) throws RecognitionException {
+    public String square_chunk(final BaseDescr descr) throws RecognitionException {
         String text = null;
 
-        Token loc=null;
+        Token loc = null;
         String chunk = null;
 
+        StringBuffer buf = null;
+        Integer channel = null;
 
-        
-                   StringBuffer buf = null;
-                   Integer channel = null;
-                
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1131:10: (loc= LEFT_SQUARE ( (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE) | ( square_chunk[null] )=>chunk= square_chunk[null] )* loc= RIGHT_SQUARE )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1131:10: loc= LEFT_SQUARE ( (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE) | ( square_chunk[null] )=>chunk= square_chunk[null] )* loc= RIGHT_SQUARE
             {
-            if ( backtracking==0 ) {
-              
-              	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
-              		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
-              		    buf = new StringBuffer();
-              	        
-            }
-            loc=(Token)input.LT(1);
-            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_square_chunk3138); if (failed) return text;
-            if ( backtracking==0 ) {
-              
-              		    buf.append( loc.getText());
-               
-              		
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1141:3: ( (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE) | ( square_chunk[null] )=>chunk= square_chunk[null] )*
-            loop42:
-            do {
-                int alt42=3;
-                int LA42_0 = input.LA(1);
-                if ( ((LA42_0>=PACKAGE && LA42_0<=RIGHT_CURLY)||(LA42_0>=AND && LA42_0<=78)) ) {
-                    alt42=1;
+                if ( this.backtracking == 0 ) {
+
+                    channel = ((SwitchingCommonTokenStream) this.input).getTokenTypeChannel( WS );
+                    ((SwitchingCommonTokenStream) this.input).setTokenTypeChannel( WS,
+                                                                              Token.DEFAULT_CHANNEL );
+                    buf = new StringBuffer();
+
                 }
-                else if ( (LA42_0==LEFT_SQUARE) ) {
-                    alt42=2;
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       LEFT_SQUARE,
+                       FOLLOW_LEFT_SQUARE_in_square_chunk3138 );
+                if ( this.failed ) {
+                    return text;
                 }
+                if ( this.backtracking == 0 ) {
 
+                    buf.append( loc.getText() );
 
-                switch (alt42) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1142:4: (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE)
-            	    {
-            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=RIGHT_CURLY)||(input.LA(1)>=AND && input.LA(1)<=78) ) {
-            	        input.consume();
-            	        errorRecovery=false;failed=false;
-            	    }
-            	    else {
-            	        if (backtracking>0) {failed=true; return text;}
-            	        MismatchedSetException mse =
-            	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk3154);    throw mse;
-            	    }
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1141:3: ( (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE) | ( square_chunk[null] )=>chunk= square_chunk[null] )*
+                loop42 : do {
+                    int alt42 = 3;
+                    final int LA42_0 = this.input.LA( 1 );
+                    if ( ((LA42_0 >= PACKAGE && LA42_0 <= RIGHT_CURLY) || (LA42_0 >= AND && LA42_0 <= 78)) ) {
+                        alt42 = 1;
+                    } else if ( (LA42_0 == LEFT_SQUARE) ) {
+                        alt42 = 2;
+                    }
 
-            	    if ( backtracking==0 ) {
-            	      
-            	      			    buf.append( input.LT(-1).getText() );
-            	      			  
-            	    }
+                    switch ( alt42 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1142:4: (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE)
+                        {
+                            if ( (this.input.LA( 1 ) >= PACKAGE && this.input.LA( 1 ) <= RIGHT_CURLY) || (this.input.LA( 1 ) >= AND && this.input.LA( 1 ) <= 78) ) {
+                                this.input.consume();
+                                this.errorRecovery = false;
+                                this.failed = false;
+                            } else {
+                                if ( this.backtracking > 0 ) {
+                                    this.failed = true;
+                                    return text;
+                                }
+                                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                         this.input );
+                                recoverFromMismatchedSet( this.input,
+                                                          mse,
+                                                          FOLLOW_set_in_square_chunk3154 );
+                                throw mse;
+                            }
 
-            	    }
-            	    break;
-            	case 2 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1147:4: ( square_chunk[null] )=>chunk= square_chunk[null]
-            	    {
-            	    pushFollow(FOLLOW_square_chunk_in_square_chunk3178);
-            	    chunk=square_chunk(null);
-            	    _fsp--;
-            	    if (failed) return text;
-            	    if ( backtracking==0 ) {
-            	      
-            	      			    buf.append( chunk );
-            	      			  
-            	    }
+                            if ( this.backtracking == 0 ) {
 
-            	    }
-            	    break;
+                                buf.append( this.input.LT( -1 ).getText() );
 
-            	default :
-            	    break loop42;
+                            }
+
+                        }
+                            break;
+                        case 2 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1147:4: ( square_chunk[null] )=>chunk= square_chunk[null]
+                        {
+                            pushFollow( FOLLOW_square_chunk_in_square_chunk3178 );
+                            chunk = square_chunk( null );
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return text;
+                            }
+                            if ( this.backtracking == 0 ) {
+
+                                buf.append( chunk );
+
+                            }
+
+                        }
+                            break;
+
+                        default :
+                            break loop42;
+                    }
+                } while ( true );
+
+                if ( this.backtracking == 0 ) {
+
+                    if ( channel != null ) {
+                        ((SwitchingCommonTokenStream) this.input).setTokenTypeChannel( WS,
+                                                                                  channel.intValue() );
+                    } else {
+                        ((SwitchingCommonTokenStream) this.input).setTokenTypeChannel( WS,
+                                                                                  Token.HIDDEN_CHANNEL );
+                    }
+
                 }
-            } while (true);
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       RIGHT_SQUARE,
+                       FOLLOW_RIGHT_SQUARE_in_square_chunk3215 );
+                if ( this.failed ) {
+                    return text;
+                }
+                if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
-              
-              		    if( channel != null ) {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
-              		    } else {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
-              		    }
-              		
-            }
-            loc=(Token)input.LT(1);
-            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk3215); if (failed) return text;
-            if ( backtracking==0 ) {
-              
-                                  buf.append( loc.getText() );
-              		    text = buf.toString();
-              		    if( descr != null ) {
-              		        descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-              		    }
-                              
-            }
+                    buf.append( loc.getText() );
+                    text = buf.toString();
+                    if ( descr != null ) {
+                        descr.setEndCharacter( ((CommonToken) loc).getStopIndex() );
+                    }
 
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return text;
     }
+
     // $ANTLR end square_chunk
 
-
     // $ANTLR start retval_constraint
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1169:1: retval_constraint returns [String text] : c= paren_chunk[null] ;
     public String retval_constraint() throws RecognitionException {
@@ -4222,36 +4823,36 @@
 
         String c = null;
 
+        text = null;
 
-        
-        		text = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1174:3: (c= paren_chunk[null] )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1174:3: c= paren_chunk[null]
             {
-            pushFollow(FOLLOW_paren_chunk_in_retval_constraint3260);
-            c=paren_chunk(null);
-            _fsp--;
-            if (failed) return text;
-            if ( backtracking==0 ) {
-               text = c.substring(1, c.length()-1); 
-            }
+                pushFollow( FOLLOW_paren_chunk_in_retval_constraint3260 );
+                c = paren_chunk( null );
+                this._fsp--;
+                if ( this.failed ) {
+                    return text;
+                }
+                if ( this.backtracking == 0 ) {
+                    text = c.substring( 1,
+                                        c.length() - 1 );
+                }
 
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return text;
     }
+
     // $ANTLR end retval_constraint
 
-
     // $ANTLR start lhs_or
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1177:1: lhs_or returns [BaseDescr d] : left= lhs_and ( ( (OR|'||') lhs_and )=> (OR|'||')right= lhs_and )* ;
     public BaseDescr lhs_or() throws RecognitionException {
@@ -4261,86 +4862,90 @@
 
         BaseDescr right = null;
 
+        d = null;
+        OrDescr or = null;
 
-        
-        		d = null;
-        		OrDescr or = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1183:3: (left= lhs_and ( ( (OR|'||') lhs_and )=> (OR|'||')right= lhs_and )* )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1183:3: left= lhs_and ( ( (OR|'||') lhs_and )=> (OR|'||')right= lhs_and )*
             {
-            pushFollow(FOLLOW_lhs_and_in_lhs_or3288);
-            left=lhs_and();
-            _fsp--;
-            if (failed) return d;
-            if ( backtracking==0 ) {
-              d = left; 
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1184:3: ( ( (OR|'||') lhs_and )=> (OR|'||')right= lhs_and )*
-            loop43:
-            do {
-                int alt43=2;
-                int LA43_0 = input.LA(1);
-                if ( (LA43_0==OR||LA43_0==68) ) {
-                    alt43=1;
+                pushFollow( FOLLOW_lhs_and_in_lhs_or3288 );
+                left = lhs_and();
+                this._fsp--;
+                if ( this.failed ) {
+                    return d;
                 }
+                if ( this.backtracking == 0 ) {
+                    d = left;
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1184:3: ( ( (OR|'||') lhs_and )=> (OR|'||')right= lhs_and )*
+                loop43 : do {
+                    int alt43 = 2;
+                    final int LA43_0 = this.input.LA( 1 );
+                    if ( (LA43_0 == OR || LA43_0 == 68) ) {
+                        alt43 = 1;
+                    }
 
+                    switch ( alt43 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1184:5: ( (OR|'||') lhs_and )=> (OR|'||')right= lhs_and
+                        {
+                            if ( this.input.LA( 1 ) == OR || this.input.LA( 1 ) == 68 ) {
+                                this.input.consume();
+                                this.errorRecovery = false;
+                                this.failed = false;
+                            } else {
+                                if ( this.backtracking > 0 ) {
+                                    this.failed = true;
+                                    return d;
+                                }
+                                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                         this.input );
+                                recoverFromMismatchedSet( this.input,
+                                                          mse,
+                                                          FOLLOW_set_in_lhs_or3297 );
+                                throw mse;
+                            }
 
-                switch (alt43) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1184:5: ( (OR|'||') lhs_and )=> (OR|'||')right= lhs_and
-            	    {
-            	    if ( input.LA(1)==OR||input.LA(1)==68 ) {
-            	        input.consume();
-            	        errorRecovery=false;failed=false;
-            	    }
-            	    else {
-            	        if (backtracking>0) {failed=true; return d;}
-            	        MismatchedSetException mse =
-            	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_or3297);    throw mse;
-            	    }
+                            pushFollow( FOLLOW_lhs_and_in_lhs_or3307 );
+                            right = lhs_and();
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return d;
+                            }
+                            if ( this.backtracking == 0 ) {
 
-            	    pushFollow(FOLLOW_lhs_and_in_lhs_or3307);
-            	    right=lhs_and();
-            	    _fsp--;
-            	    if (failed) return d;
-            	    if ( backtracking==0 ) {
-            	      
-            	      				if ( or == null ) {
-            	      					or = new OrDescr();
-            	      					or.addDescr( left );
-            	      					d = or;
-            	      				}
-            	      				
-            	      				or.addDescr( right );
-            	      			
-            	    }
+                                if ( or == null ) {
+                                    or = new OrDescr();
+                                    or.addDescr( left );
+                                    d = or;
+                                }
 
-            	    }
-            	    break;
+                                or.addDescr( right );
 
-            	default :
-            	    break loop43;
-                }
-            } while (true);
+                            }
 
+                        }
+                            break;
 
+                        default :
+                            break loop43;
+                    }
+                } while ( true );
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end lhs_or
 
-
     // $ANTLR start lhs_and
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1198:1: lhs_and returns [BaseDescr d] : left= lhs_unary ( ( (AND|'&&') lhs_unary )=> (AND|'&&')right= lhs_unary )* ;
     public BaseDescr lhs_and() throws RecognitionException {
@@ -4350,86 +4955,90 @@
 
         BaseDescr right = null;
 
+        d = null;
+        AndDescr and = null;
 
-        
-        		d = null;
-        		AndDescr and = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1204:3: (left= lhs_unary ( ( (AND|'&&') lhs_unary )=> (AND|'&&')right= lhs_unary )* )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1204:3: left= lhs_unary ( ( (AND|'&&') lhs_unary )=> (AND|'&&')right= lhs_unary )*
             {
-            pushFollow(FOLLOW_lhs_unary_in_lhs_and3343);
-            left=lhs_unary();
-            _fsp--;
-            if (failed) return d;
-            if ( backtracking==0 ) {
-               d = left; 
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1205:3: ( ( (AND|'&&') lhs_unary )=> (AND|'&&')right= lhs_unary )*
-            loop44:
-            do {
-                int alt44=2;
-                int LA44_0 = input.LA(1);
-                if ( (LA44_0==AND||LA44_0==78) ) {
-                    alt44=1;
+                pushFollow( FOLLOW_lhs_unary_in_lhs_and3343 );
+                left = lhs_unary();
+                this._fsp--;
+                if ( this.failed ) {
+                    return d;
                 }
+                if ( this.backtracking == 0 ) {
+                    d = left;
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1205:3: ( ( (AND|'&&') lhs_unary )=> (AND|'&&')right= lhs_unary )*
+                loop44 : do {
+                    int alt44 = 2;
+                    final int LA44_0 = this.input.LA( 1 );
+                    if ( (LA44_0 == AND || LA44_0 == 78) ) {
+                        alt44 = 1;
+                    }
 
+                    switch ( alt44 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1205:5: ( (AND|'&&') lhs_unary )=> (AND|'&&')right= lhs_unary
+                        {
+                            if ( this.input.LA( 1 ) == AND || this.input.LA( 1 ) == 78 ) {
+                                this.input.consume();
+                                this.errorRecovery = false;
+                                this.failed = false;
+                            } else {
+                                if ( this.backtracking > 0 ) {
+                                    this.failed = true;
+                                    return d;
+                                }
+                                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                         this.input );
+                                recoverFromMismatchedSet( this.input,
+                                                          mse,
+                                                          FOLLOW_set_in_lhs_and3352 );
+                                throw mse;
+                            }
 
-                switch (alt44) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1205:5: ( (AND|'&&') lhs_unary )=> (AND|'&&')right= lhs_unary
-            	    {
-            	    if ( input.LA(1)==AND||input.LA(1)==78 ) {
-            	        input.consume();
-            	        errorRecovery=false;failed=false;
-            	    }
-            	    else {
-            	        if (backtracking>0) {failed=true; return d;}
-            	        MismatchedSetException mse =
-            	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_and3352);    throw mse;
-            	    }
+                            pushFollow( FOLLOW_lhs_unary_in_lhs_and3362 );
+                            right = lhs_unary();
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return d;
+                            }
+                            if ( this.backtracking == 0 ) {
 
-            	    pushFollow(FOLLOW_lhs_unary_in_lhs_and3362);
-            	    right=lhs_unary();
-            	    _fsp--;
-            	    if (failed) return d;
-            	    if ( backtracking==0 ) {
-            	      
-            	      				if ( and == null ) {
-            	      					and = new AndDescr();
-            	      					and.addDescr( left );
-            	      					d = and;
-            	      				}
-            	      				
-            	      				and.addDescr( right );
-            	      			
-            	    }
+                                if ( and == null ) {
+                                    and = new AndDescr();
+                                    and.addDescr( left );
+                                    d = and;
+                                }
 
-            	    }
-            	    break;
+                                and.addDescr( right );
 
-            	default :
-            	    break loop44;
-                }
-            } while (true);
+                            }
 
+                        }
+                            break;
 
+                        default :
+                            break loop44;
+                    }
+                } while ( true );
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end lhs_and
 
-
     // $ANTLR start lhs_unary
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1219:1: lhs_unary returns [BaseDescr d] : ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )? )=>u= lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs_or ')' ) opt_semicolon ;
     public BaseDescr lhs_unary() throws RecognitionException {
@@ -4443,761 +5052,902 @@
 
         FromDescr fm = null;
 
+        d = null;
 
-        
-        		d = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1223:4: ( ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )? )=>u= lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs_or ')' ) opt_semicolon )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1223:4: ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )? )=>u= lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs_or ')' ) opt_semicolon
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1223:4: ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )? )=>u= lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs_or ')' )
-            int alt47=6;
-            switch ( input.LA(1) ) {
-            case EXISTS:
-                alt47=1;
-                break;
-            case NOT:
-                alt47=2;
-                break;
-            case EVAL:
-                alt47=3;
-                break;
-            case ID:
-                alt47=4;
-                break;
-            case FORALL:
-                alt47=5;
-                break;
-            case LEFT_PAREN:
-                alt47=6;
-                break;
-            default:
-                if (backtracking>0) {failed=true; return d;}
-                NoViableAltException nvae =
-                    new NoViableAltException("1223:4: ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )? )=>u= lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs_or ')' )", 47, 0, input);
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1223:4: ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )? )=>u= lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs_or ')' )
+                int alt47 = 6;
+                switch ( this.input.LA( 1 ) ) {
+                    case EXISTS :
+                        alt47 = 1;
+                        break;
+                    case NOT :
+                        alt47 = 2;
+                        break;
+                    case EVAL :
+                        alt47 = 3;
+                        break;
+                    case ID :
+                        alt47 = 4;
+                        break;
+                    case FORALL :
+                        alt47 = 5;
+                        break;
+                    case LEFT_PAREN :
+                        alt47 = 6;
+                        break;
+                    default :
+                        if ( this.backtracking > 0 ) {
+                            this.failed = true;
+                            return d;
+                        }
+                        final NoViableAltException nvae = new NoViableAltException( "1223:4: ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )? )=>u= lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs_or ')' )",
+                                                                              47,
+                                                                              0,
+                                                                              this.input );
 
-                throw nvae;
-            }
+                        throw nvae;
+                }
 
-            switch (alt47) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1223:6: ( lhs_exist )=>u= lhs_exist
+                switch ( alt47 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1223:6: ( lhs_exist )=>u= lhs_exist
                     {
-                    pushFollow(FOLLOW_lhs_exist_in_lhs_unary3399);
-                    u=lhs_exist();
-                    _fsp--;
-                    if (failed) return d;
+                        pushFollow( FOLLOW_lhs_exist_in_lhs_unary3399 );
+                        u = lhs_exist();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return d;
+                        }
 
                     }
-                    break;
-                case 2 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1224:5: ( lhs_not )=>u= lhs_not
+                        break;
+                    case 2 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1224:5: ( lhs_not )=>u= lhs_not
                     {
-                    pushFollow(FOLLOW_lhs_not_in_lhs_unary3407);
-                    u=lhs_not();
-                    _fsp--;
-                    if (failed) return d;
+                        pushFollow( FOLLOW_lhs_not_in_lhs_unary3407 );
+                        u = lhs_not();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return d;
+                        }
 
                     }
-                    break;
-                case 3 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1225:5: ( lhs_eval )=>u= lhs_eval
+                        break;
+                    case 3 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1225:5: ( lhs_eval )=>u= lhs_eval
                     {
-                    pushFollow(FOLLOW_lhs_eval_in_lhs_unary3415);
-                    u=lhs_eval();
-                    _fsp--;
-                    if (failed) return d;
+                        pushFollow( FOLLOW_lhs_eval_in_lhs_unary3415 );
+                        u = lhs_eval();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return d;
+                        }
 
                     }
-                    break;
-                case 4 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1226:5: ( lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )? )=>u= lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) ) )?
+                        break;
+                    case 4 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1226:5: ( lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )? )=>u= lhs_column ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) ) )?
                     {
-                    pushFollow(FOLLOW_lhs_column_in_lhs_unary3423);
-                    u=lhs_column();
-                    _fsp--;
-                    if (failed) return d;
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1226:18: ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) ) )?
-                    int alt46=2;
-                    int LA46_0 = input.LA(1);
-                    if ( (LA46_0==FROM) ) {
-                        alt46=1;
-                    }
-                    switch (alt46) {
-                        case 1 :
-                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1227:13: ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) )
+                        pushFollow( FOLLOW_lhs_column_in_lhs_unary3423 );
+                        u = lhs_column();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return d;
+                        }
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1226:18: ( ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) ) )?
+                        int alt46 = 2;
+                        final int LA46_0 = this.input.LA( 1 );
+                        if ( (LA46_0 == FROM) ) {
+                            alt46 = 1;
+                        }
+                        switch ( alt46 ) {
+                            case 1 :
+                                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1227:13: ( FROM ( ( ACCUMULATE )=> ( accumulate_statement ) | ( COLLECT )=> ( collect_statement ) | (~ (ACCUMULATE|COLLECT))=> ( from_statement ) ) )=> FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) )
                             {
-                            match(input,FROM,FOLLOW_FROM_in_lhs_unary3439); if (failed) return d;
-                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1227:18: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) )
-                            int alt45=3;
-                            switch ( input.LA(1) ) {
-                            case ACCUMULATE:
-                                if ( (synpred72()) ) {
-                                    alt45=1;
+                                match( this.input,
+                                       FROM,
+                                       FOLLOW_FROM_in_lhs_unary3439 );
+                                if ( this.failed ) {
+                                    return d;
                                 }
-                                else if ( (synpred74()) ) {
-                                    alt45=3;
-                                }
-                                else {
-                                    if (backtracking>0) {failed=true; return d;}
-                                    NoViableAltException nvae =
-                                        new NoViableAltException("1227:18: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) )", 45, 1, input);
+                                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1227:18: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) )
+                                int alt45 = 3;
+                                switch ( this.input.LA( 1 ) ) {
+                                    case ACCUMULATE :
+                                        if ( (synpred72()) ) {
+                                            alt45 = 1;
+                                        } else if ( (synpred74()) ) {
+                                            alt45 = 3;
+                                        } else {
+                                            if ( this.backtracking > 0 ) {
+                                                this.failed = true;
+                                                return d;
+                                            }
+                                            final NoViableAltException nvae = new NoViableAltException( "1227:18: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) )",
+                                                                                                  45,
+                                                                                                  1,
+                                                                                                  this.input );
 
-                                    throw nvae;
-                                }
-                                break;
-                            case COLLECT:
-                                if ( (synpred73()) ) {
-                                    alt45=2;
-                                }
-                                else if ( (synpred74()) ) {
-                                    alt45=3;
-                                }
-                                else {
-                                    if (backtracking>0) {failed=true; return d;}
-                                    NoViableAltException nvae =
-                                        new NoViableAltException("1227:18: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) )", 45, 2, input);
+                                            throw nvae;
+                                        }
+                                        break;
+                                    case COLLECT :
+                                        if ( (synpred73()) ) {
+                                            alt45 = 2;
+                                        } else if ( (synpred74()) ) {
+                                            alt45 = 3;
+                                        } else {
+                                            if ( this.backtracking > 0 ) {
+                                                this.failed = true;
+                                                return d;
+                                            }
+                                            final NoViableAltException nvae = new NoViableAltException( "1227:18: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) )",
+                                                                                                  45,
+                                                                                                  2,
+                                                                                                  this.input );
 
-                                    throw nvae;
+                                            throw nvae;
+                                        }
+                                        break;
+                                    case PACKAGE :
+                                    case IMPORT :
+                                    case FUNCTION :
+                                    case GLOBAL :
+                                    case QUERY :
+                                    case END :
+                                    case TEMPLATE :
+                                    case RULE :
+                                    case WHEN :
+                                    case ATTRIBUTES :
+                                    case ENABLED :
+                                    case SALIENCE :
+                                    case DURATION :
+                                    case INIT :
+                                    case ACTION :
+                                    case RESULT :
+                                    case ID :
+                                    case OR :
+                                    case CONTAINS :
+                                    case MATCHES :
+                                    case EXCLUDES :
+                                    case NULL :
+                                    case AND :
+                                    case FROM :
+                                    case EXISTS :
+                                    case NOT :
+                                    case EVAL :
+                                    case FORALL :
+                                    case THEN :
+                                        alt45 = 3;
+                                        break;
+                                    default :
+                                        if ( this.backtracking > 0 ) {
+                                            this.failed = true;
+                                            return d;
+                                        }
+                                        final NoViableAltException nvae = new NoViableAltException( "1227:18: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) )",
+                                                                                              45,
+                                                                                              0,
+                                                                                              this.input );
+
+                                        throw nvae;
                                 }
-                                break;
-                            case PACKAGE:
-                            case IMPORT:
-                            case FUNCTION:
-                            case GLOBAL:
-                            case QUERY:
-                            case END:
-                            case TEMPLATE:
-                            case RULE:
-                            case WHEN:
-                            case ATTRIBUTES:
-                            case ENABLED:
-                            case SALIENCE:
-                            case DURATION:
-                            case INIT:
-                            case ACTION:
-                            case RESULT:
-                            case ID:
-                            case OR:
-                            case CONTAINS:
-                            case MATCHES:
-                            case EXCLUDES:
-                            case NULL:
-                            case AND:
-                            case FROM:
-                            case EXISTS:
-                            case NOT:
-                            case EVAL:
-                            case FORALL:
-                            case THEN:
-                                alt45=3;
-                                break;
-                            default:
-                                if (backtracking>0) {failed=true; return d;}
-                                NoViableAltException nvae =
-                                    new NoViableAltException("1227:18: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ (ACCUMULATE|COLLECT))=> (fm= from_statement ) )", 45, 0, input);
 
-                                throw nvae;
-                            }
-
-                            switch (alt45) {
-                                case 1 :
-                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1228:14: ( ACCUMULATE )=> (ac= accumulate_statement )
+                                switch ( alt45 ) {
+                                    case 1 :
+                                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1228:14: ( ACCUMULATE )=> (ac= accumulate_statement )
                                     {
-                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1228:32: (ac= accumulate_statement )
-                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1228:33: ac= accumulate_statement
-                                    {
-                                    pushFollow(FOLLOW_accumulate_statement_in_lhs_unary3467);
-                                    ac=accumulate_statement();
-                                    _fsp--;
-                                    if (failed) return d;
-                                    if ( backtracking==0 ) {
-                                      ac.setResultColumn((ColumnDescr) u); u=ac;
-                                    }
+                                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1228:32: (ac= accumulate_statement )
+                                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1228:33: ac= accumulate_statement
+                                        {
+                                            pushFollow( FOLLOW_accumulate_statement_in_lhs_unary3467 );
+                                            ac = accumulate_statement();
+                                            this._fsp--;
+                                            if ( this.failed ) {
+                                                return d;
+                                            }
+                                            if ( this.backtracking == 0 ) {
+                                                ac.setResultColumn( (ColumnDescr) u );
+                                                u = ac;
+                                            }
 
-                                    }
+                                        }
 
-
                                     }
-                                    break;
-                                case 2 :
-                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1229:14: ( COLLECT )=> (cs= collect_statement )
+                                        break;
+                                    case 2 :
+                                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1229:14: ( COLLECT )=> (cs= collect_statement )
                                     {
-                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1229:29: (cs= collect_statement )
-                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1229:30: cs= collect_statement
-                                    {
-                                    pushFollow(FOLLOW_collect_statement_in_lhs_unary3496);
-                                    cs=collect_statement();
-                                    _fsp--;
-                                    if (failed) return d;
-                                    if ( backtracking==0 ) {
-                                      cs.setResultColumn((ColumnDescr) u); u=cs;
-                                    }
+                                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1229:29: (cs= collect_statement )
+                                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1229:30: cs= collect_statement
+                                        {
+                                            pushFollow( FOLLOW_collect_statement_in_lhs_unary3496 );
+                                            cs = collect_statement();
+                                            this._fsp--;
+                                            if ( this.failed ) {
+                                                return d;
+                                            }
+                                            if ( this.backtracking == 0 ) {
+                                                cs.setResultColumn( (ColumnDescr) u );
+                                                u = cs;
+                                            }
 
-                                    }
+                                        }
 
-
                                     }
-                                    break;
-                                case 3 :
-                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1230:14: (~ (ACCUMULATE|COLLECT))=> (fm= from_statement )
+                                        break;
+                                    case 3 :
+                                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1230:14: (~ (ACCUMULATE|COLLECT))=> (fm= from_statement )
                                     {
-                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1230:43: (fm= from_statement )
-                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1230:44: fm= from_statement
-                                    {
-                                    pushFollow(FOLLOW_from_statement_in_lhs_unary3531);
-                                    fm=from_statement();
-                                    _fsp--;
-                                    if (failed) return d;
-                                    if ( backtracking==0 ) {
-                                      fm.setColumn((ColumnDescr) u); u=fm;
-                                    }
+                                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1230:43: (fm= from_statement )
+                                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1230:44: fm= from_statement
+                                        {
+                                            pushFollow( FOLLOW_from_statement_in_lhs_unary3531 );
+                                            fm = from_statement();
+                                            this._fsp--;
+                                            if ( this.failed ) {
+                                                return d;
+                                            }
+                                            if ( this.backtracking == 0 ) {
+                                                fm.setColumn( (ColumnDescr) u );
+                                                u = fm;
+                                            }
 
-                                    }
+                                        }
 
-
                                     }
-                                    break;
+                                        break;
 
-                            }
+                                }
 
-
                             }
-                            break;
+                                break;
 
-                    }
+                        }
 
-
                     }
-                    break;
-                case 5 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1233:5: ( lhs_forall )=>u= lhs_forall
+                        break;
+                    case 5 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1233:5: ( lhs_forall )=>u= lhs_forall
                     {
-                    pushFollow(FOLLOW_lhs_forall_in_lhs_unary3570);
-                    u=lhs_forall();
-                    _fsp--;
-                    if (failed) return d;
+                        pushFollow( FOLLOW_lhs_forall_in_lhs_unary3570 );
+                        u = lhs_forall();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return d;
+                        }
 
                     }
-                    break;
-                case 6 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1234:5: '(' u= lhs_or ')'
+                        break;
+                    case 6 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1234:5: '(' u= lhs_or ')'
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_unary3578); if (failed) return d;
-                    pushFollow(FOLLOW_lhs_or_in_lhs_unary3582);
-                    u=lhs_or();
-                    _fsp--;
-                    if (failed) return d;
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_unary3584); if (failed) return d;
+                        match( this.input,
+                               LEFT_PAREN,
+                               FOLLOW_LEFT_PAREN_in_lhs_unary3578 );
+                        if ( this.failed ) {
+                            return d;
+                        }
+                        pushFollow( FOLLOW_lhs_or_in_lhs_unary3582 );
+                        u = lhs_or();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return d;
+                        }
+                        match( this.input,
+                               RIGHT_PAREN,
+                               FOLLOW_RIGHT_PAREN_in_lhs_unary3584 );
+                        if ( this.failed ) {
+                            return d;
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-            if ( backtracking==0 ) {
-               d = u; 
-            }
-            pushFollow(FOLLOW_opt_semicolon_in_lhs_unary3594);
-            opt_semicolon();
-            _fsp--;
-            if (failed) return d;
+                if ( this.backtracking == 0 ) {
+                    d = u;
+                }
+                pushFollow( FOLLOW_opt_semicolon_in_lhs_unary3594 );
+                opt_semicolon();
+                this._fsp--;
+                if ( this.failed ) {
+                    return d;
+                }
 
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end lhs_unary
 
-
     // $ANTLR start lhs_exist
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1239:1: lhs_exist returns [BaseDescr d] : loc= EXISTS ( ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' ) | column= lhs_column ) ;
     public BaseDescr lhs_exist() throws RecognitionException {
         BaseDescr d = null;
 
-        Token loc=null;
-        Token end=null;
+        Token loc = null;
+        Token end = null;
         BaseDescr column = null;
 
+        d = null;
 
-        
-        		d = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1243:4: (loc= EXISTS ( ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' ) | column= lhs_column ) )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1243:4: loc= EXISTS ( ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' ) | column= lhs_column )
             {
-            loc=(Token)input.LT(1);
-            match(input,EXISTS,FOLLOW_EXISTS_in_lhs_exist3618); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              			d = new ExistsDescr( ); 
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              		
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1249:10: ( ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' ) | column= lhs_column )
-            int alt48=2;
-            int LA48_0 = input.LA(1);
-            if ( (LA48_0==LEFT_PAREN) ) {
-                alt48=1;
-            }
-            else if ( (LA48_0==ID) ) {
-                alt48=2;
-            }
-            else {
-                if (backtracking>0) {failed=true; return d;}
-                NoViableAltException nvae =
-                    new NoViableAltException("1249:10: ( ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' ) | column= lhs_column )", 48, 0, input);
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       EXISTS,
+                       FOLLOW_EXISTS_in_lhs_exist3618 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
-                throw nvae;
-            }
-            switch (alt48) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1249:12: ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' )
-                    {
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1249:12: ( '(' column= lhs_or end= ')' )
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1249:14: '(' column= lhs_or end= ')'
-                    {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_exist3638); if (failed) return d;
-                    pushFollow(FOLLOW_lhs_or_in_lhs_exist3642);
-                    column=lhs_or();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                       if ( column != null ) ((ExistsDescr)d).addDescr( column ); 
-                    }
-                    end=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_exist3674); if (failed) return d;
-                    if ( backtracking==0 ) {
-                       if ( end != null ) d.setEndCharacter( ((CommonToken)end).getStopIndex() ); 
-                    }
+                    d = new ExistsDescr();
+                    d.setLocation( offset( loc.getLine() ),
+                                   loc.getCharPositionInLine() );
+                    d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
 
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1249:10: ( ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' ) | column= lhs_column )
+                int alt48 = 2;
+                final int LA48_0 = this.input.LA( 1 );
+                if ( (LA48_0 == LEFT_PAREN) ) {
+                    alt48 = 1;
+                } else if ( (LA48_0 == ID) ) {
+                    alt48 = 2;
+                } else {
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return d;
                     }
+                    final NoViableAltException nvae = new NoViableAltException( "1249:10: ( ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' ) | column= lhs_column )",
+                                                                          48,
+                                                                          0,
+                                                                          this.input );
 
+                    throw nvae;
+                }
+                switch ( alt48 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1249:12: ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' )
+                    {
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1249:12: ( '(' column= lhs_or end= ')' )
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1249:14: '(' column= lhs_or end= ')'
+                        {
+                            match( this.input,
+                                   LEFT_PAREN,
+                                   FOLLOW_LEFT_PAREN_in_lhs_exist3638 );
+                            if ( this.failed ) {
+                                return d;
+                            }
+                            pushFollow( FOLLOW_lhs_or_in_lhs_exist3642 );
+                            column = lhs_or();
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return d;
+                            }
+                            if ( this.backtracking == 0 ) {
+                                if ( column != null ) {
+                                    ((ExistsDescr) d).addDescr( column );
+                                }
+                            }
+                            end = (Token) this.input.LT( 1 );
+                            match( this.input,
+                                   RIGHT_PAREN,
+                                   FOLLOW_RIGHT_PAREN_in_lhs_exist3674 );
+                            if ( this.failed ) {
+                                return d;
+                            }
+                            if ( this.backtracking == 0 ) {
+                                if ( end != null ) {
+                                    d.setEndCharacter( ((CommonToken) end).getStopIndex() );
+                                }
+                            }
 
+                        }
+
                     }
-                    break;
-                case 2 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1254:12: column= lhs_column
+                        break;
+                    case 2 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1254:12: column= lhs_column
                     {
-                    pushFollow(FOLLOW_lhs_column_in_lhs_exist3724);
-                    column=lhs_column();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                      
-                      	                	if ( column != null ) {
-                      	                		((ExistsDescr)d).addDescr( column );
-                      	                		d.setEndCharacter( column.getEndCharacter() );
-                      	                	}
-                      	                
-                    }
+                        pushFollow( FOLLOW_lhs_column_in_lhs_exist3724 );
+                        column = lhs_column();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return d;
+                        }
+                        if ( this.backtracking == 0 ) {
 
+                            if ( column != null ) {
+                                ((ExistsDescr) d).addDescr( column );
+                                d.setEndCharacter( column.getEndCharacter() );
+                            }
+
+                        }
+
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end lhs_exist
 
-
     // $ANTLR start lhs_not
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1264:1: lhs_not returns [NotDescr d] : loc= NOT ( ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' ) | column= lhs_column ) ;
     public NotDescr lhs_not() throws RecognitionException {
         NotDescr d = null;
 
-        Token loc=null;
-        Token end=null;
+        Token loc = null;
+        Token end = null;
         BaseDescr column = null;
 
+        d = null;
 
-        
-        		d = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1268:4: (loc= NOT ( ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' ) | column= lhs_column ) )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1268:4: loc= NOT ( ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' ) | column= lhs_column )
             {
-            loc=(Token)input.LT(1);
-            match(input,NOT,FOLLOW_NOT_in_lhs_not3778); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              			d = new NotDescr( ); 
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              		
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1274:3: ( ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' ) | column= lhs_column )
-            int alt49=2;
-            int LA49_0 = input.LA(1);
-            if ( (LA49_0==LEFT_PAREN) ) {
-                alt49=1;
-            }
-            else if ( (LA49_0==ID) ) {
-                alt49=2;
-            }
-            else {
-                if (backtracking>0) {failed=true; return d;}
-                NoViableAltException nvae =
-                    new NoViableAltException("1274:3: ( ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' ) | column= lhs_column )", 49, 0, input);
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       NOT,
+                       FOLLOW_NOT_in_lhs_not3778 );
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
-                throw nvae;
-            }
-            switch (alt49) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1274:5: ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' )
-                    {
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1274:5: ( '(' column= lhs_or end= ')' )
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1274:7: '(' column= lhs_or end= ')'
-                    {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_not3791); if (failed) return d;
-                    pushFollow(FOLLOW_lhs_or_in_lhs_not3795);
-                    column=lhs_or();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                       if ( column != null ) d.addDescr( column ); 
-                    }
-                    end=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_not3828); if (failed) return d;
-                    if ( backtracking==0 ) {
-                       if ( end != null ) d.setEndCharacter( ((CommonToken)end).getStopIndex() ); 
-                    }
+                    d = new NotDescr();
+                    d.setLocation( offset( loc.getLine() ),
+                                   loc.getCharPositionInLine() );
+                    d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
 
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1274:3: ( ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' ) | column= lhs_column )
+                int alt49 = 2;
+                final int LA49_0 = this.input.LA( 1 );
+                if ( (LA49_0 == LEFT_PAREN) ) {
+                    alt49 = 1;
+                } else if ( (LA49_0 == ID) ) {
+                    alt49 = 2;
+                } else {
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return d;
                     }
+                    final NoViableAltException nvae = new NoViableAltException( "1274:3: ( ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' ) | column= lhs_column )",
+                                                                          49,
+                                                                          0,
+                                                                          this.input );
 
+                    throw nvae;
+                }
+                switch ( alt49 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1274:5: ( ( '(' lhs_or ')' ) )=> ( '(' column= lhs_or end= ')' )
+                    {
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1274:5: ( '(' column= lhs_or end= ')' )
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1274:7: '(' column= lhs_or end= ')'
+                        {
+                            match( this.input,
+                                   LEFT_PAREN,
+                                   FOLLOW_LEFT_PAREN_in_lhs_not3791 );
+                            if ( this.failed ) {
+                                return d;
+                            }
+                            pushFollow( FOLLOW_lhs_or_in_lhs_not3795 );
+                            column = lhs_or();
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return d;
+                            }
+                            if ( this.backtracking == 0 ) {
+                                if ( column != null ) {
+                                    d.addDescr( column );
+                                }
+                            }
+                            end = (Token) this.input.LT( 1 );
+                            match( this.input,
+                                   RIGHT_PAREN,
+                                   FOLLOW_RIGHT_PAREN_in_lhs_not3828 );
+                            if ( this.failed ) {
+                                return d;
+                            }
+                            if ( this.backtracking == 0 ) {
+                                if ( end != null ) {
+                                    d.setEndCharacter( ((CommonToken) end).getStopIndex() );
+                                }
+                            }
 
+                        }
+
                     }
-                    break;
-                case 2 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1280:3: column= lhs_column
+                        break;
+                    case 2 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1280:3: column= lhs_column
                     {
-                    pushFollow(FOLLOW_lhs_column_in_lhs_not3865);
-                    column=lhs_column();
-                    _fsp--;
-                    if (failed) return d;
-                    if ( backtracking==0 ) {
-                      
-                      	                	if ( column != null ) {
-                      	                		d.addDescr( column );
-                      	                		d.setEndCharacter( column.getEndCharacter() );
-                      	                	}
-                      	                
-                    }
+                        pushFollow( FOLLOW_lhs_column_in_lhs_not3865 );
+                        column = lhs_column();
+                        this._fsp--;
+                        if ( this.failed ) {
+                            return d;
+                        }
+                        if ( this.backtracking == 0 ) {
 
+                            if ( column != null ) {
+                                d.addDescr( column );
+                                d.setEndCharacter( column.getEndCharacter() );
+                            }
+
+                        }
+
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end lhs_not
 
-
     // $ANTLR start lhs_eval
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1290:1: lhs_eval returns [BaseDescr d] : loc= EVAL c= paren_chunk[d] ;
     public BaseDescr lhs_eval() throws RecognitionException {
         BaseDescr d = null;
 
-        Token loc=null;
+        Token loc = null;
         String c = null;
 
+        d = new EvalDescr();
 
-        
-        		d = new EvalDescr( );
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1295:3: (loc= EVAL c= paren_chunk[d] )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1295:3: loc= EVAL c= paren_chunk[d]
             {
-            loc=(Token)input.LT(1);
-            match(input,EVAL,FOLLOW_EVAL_in_lhs_eval3913); if (failed) return d;
-            pushFollow(FOLLOW_paren_chunk_in_lhs_eval3917);
-            c=paren_chunk(d);
-            _fsp--;
-            if (failed) return d;
-            if ( backtracking==0 ) {
-               
-              			if ( loc != null ) d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              		        if( c != null ) {
-              		            String body = c.substring(1, c.length()-1);
-              			    checkTrailingSemicolon( body, offset(loc.getLine()) );
-              			    ((EvalDescr) d).setContent( body );
-              			}
-              		
-            }
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       EVAL,
+                       FOLLOW_EVAL_in_lhs_eval3913 );
+                if ( this.failed ) {
+                    return d;
+                }
+                pushFollow( FOLLOW_paren_chunk_in_lhs_eval3917 );
+                c = paren_chunk( d );
+                this._fsp--;
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    if ( loc != null ) {
+                        d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                    }
+                    if ( c != null ) {
+                        final String body = c.substring( 1,
+                                                   c.length() - 1 );
+                        checkTrailingSemicolon( body,
+                                                offset( loc.getLine() ) );
+                        ((EvalDescr) d).setContent( body );
+                    }
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end lhs_eval
 
-
     // $ANTLR start lhs_forall
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1306:1: lhs_forall returns [ForallDescr d] : loc= FORALL '(' base= lhs_column ( ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column )+ end= ')' ;
     public ForallDescr lhs_forall() throws RecognitionException {
         ForallDescr d = null;
 
-        Token loc=null;
-        Token end=null;
+        Token loc = null;
+        Token end = null;
         BaseDescr base = null;
 
         BaseDescr column = null;
 
+        d = this.factory.createForall();
 
-        
-        		d = factory.createForall();
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1310:4: (loc= FORALL '(' base= lhs_column ( ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column )+ end= ')' )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1310:4: loc= FORALL '(' base= lhs_column ( ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column )+ end= ')'
             {
-            loc=(Token)input.LT(1);
-            match(input,FORALL,FOLLOW_FORALL_in_lhs_forall3946); if (failed) return d;
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_forall3948); if (failed) return d;
-            pushFollow(FOLLOW_lhs_column_in_lhs_forall3952);
-            base=lhs_column();
-            _fsp--;
-            if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              			if ( loc != null ) d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              		        // adding the base column
-              		        d.addDescr( base );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              		
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1317:3: ( ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column )+
-            int cnt51=0;
-            loop51:
-            do {
-                int alt51=2;
-                int LA51_0 = input.LA(1);
-                if ( (LA51_0==ID||LA51_0==66) ) {
-                    alt51=1;
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       FORALL,
+                       FOLLOW_FORALL_in_lhs_forall3946 );
+                if ( this.failed ) {
+                    return d;
                 }
+                match( this.input,
+                       LEFT_PAREN,
+                       FOLLOW_LEFT_PAREN_in_lhs_forall3948 );
+                if ( this.failed ) {
+                    return d;
+                }
+                pushFollow( FOLLOW_lhs_column_in_lhs_forall3952 );
+                base = lhs_column();
+                this._fsp--;
+                if ( this.failed ) {
+                    return d;
+                }
+                if ( this.backtracking == 0 ) {
 
+                    if ( loc != null ) {
+                        d.setStartCharacter( ((CommonToken) loc).getStartIndex() );
+                    }
+                    // adding the base column
+                    d.addDescr( base );
+                    d.setLocation( offset( loc.getLine() ),
+                                   loc.getCharPositionInLine() );
 
-                switch (alt51) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1317:5: ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column
-            	    {
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1317:5: ( ( ',' )=> ',' )?
-            	    int alt50=2;
-            	    int LA50_0 = input.LA(1);
-            	    if ( (LA50_0==66) ) {
-            	        alt50=1;
-            	    }
-            	    switch (alt50) {
-            	        case 1 :
-            	            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1317:6: ( ',' )=> ','
-            	            {
-            	            match(input,66,FOLLOW_66_in_lhs_forall3966); if (failed) return d;
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1317:3: ( ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column )+
+                int cnt51 = 0;
+                loop51 : do {
+                    int alt51 = 2;
+                    final int LA51_0 = this.input.LA( 1 );
+                    if ( (LA51_0 == ID || LA51_0 == 66) ) {
+                        alt51 = 1;
+                    }
 
-            	            }
-            	            break;
+                    switch ( alt51 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1317:5: ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column
+                        {
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1317:5: ( ( ',' )=> ',' )?
+                            int alt50 = 2;
+                            final int LA50_0 = this.input.LA( 1 );
+                            if ( (LA50_0 == 66) ) {
+                                alt50 = 1;
+                            }
+                            switch ( alt50 ) {
+                                case 1 :
+                                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1317:6: ( ',' )=> ','
+                                {
+                                    match( this.input,
+                                           66,
+                                           FOLLOW_66_in_lhs_forall3966 );
+                                    if ( this.failed ) {
+                                        return d;
+                                    }
 
-            	    }
+                                }
+                                    break;
 
-            	    pushFollow(FOLLOW_lhs_column_in_lhs_forall3972);
-            	    column=lhs_column();
-            	    _fsp--;
-            	    if (failed) return d;
-            	    if ( backtracking==0 ) {
-            	      
-            	      		        // adding additional columns
-            	      			d.addDescr( column );
-            	      		
-            	    }
+                            }
 
-            	    }
-            	    break;
+                            pushFollow( FOLLOW_lhs_column_in_lhs_forall3972 );
+                            column = lhs_column();
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return d;
+                            }
+                            if ( this.backtracking == 0 ) {
 
-            	default :
-            	    if ( cnt51 >= 1 ) break loop51;
-            	    if (backtracking>0) {failed=true; return d;}
-                        EarlyExitException eee =
-                            new EarlyExitException(51, input);
-                        throw eee;
+                                // adding additional columns
+                                d.addDescr( column );
+
+                            }
+
+                        }
+                            break;
+
+                        default :
+                            if ( cnt51 >= 1 ) {
+                                break loop51;
+                            }
+                            if ( this.backtracking > 0 ) {
+                                this.failed = true;
+                                return d;
+                            }
+                            final EarlyExitException eee = new EarlyExitException( 51,
+                                                                             this.input );
+                            throw eee;
+                    }
+                    cnt51++;
+                } while ( true );
+
+                end = (Token) this.input.LT( 1 );
+                match( this.input,
+                       RIGHT_PAREN,
+                       FOLLOW_RIGHT_PAREN_in_lhs_forall3987 );
+                if ( this.failed ) {
+                    return d;
                 }
-                cnt51++;
-            } while (true);
+                if ( this.backtracking == 0 ) {
 
-            end=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_forall3987); if (failed) return d;
-            if ( backtracking==0 ) {
-              
-              		        if ( end != null ) d.setEndCharacter( ((CommonToken)end).getStopIndex() );
-              		
-            }
+                    if ( end != null ) {
+                        d.setEndCharacter( ((CommonToken) end).getStopIndex() );
+                    }
 
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return d;
     }
+
     // $ANTLR end lhs_forall
 
-
     // $ANTLR start dotted_name
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1329:1: dotted_name[BaseDescr descr] returns [String name] : id= ID ( ( '.' identifier )=> '.' ident= identifier )* ( ( '[' ']' )=> '[' loc= ']' )* ;
-    public String dotted_name(BaseDescr descr) throws RecognitionException {
+    public String dotted_name(final BaseDescr descr) throws RecognitionException {
         String name = null;
 
-        Token id=null;
-        Token loc=null;
+        Token id = null;
+        Token loc = null;
         Token ident = null;
 
+        name = null;
 
-        
-        		name = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1334:3: (id= ID ( ( '.' identifier )=> '.' ident= identifier )* ( ( '[' ']' )=> '[' loc= ']' )* )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1334:3: id= ID ( ( '.' identifier )=> '.' ident= identifier )* ( ( '[' ']' )=> '[' loc= ']' )*
             {
-            id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_dotted_name4018); if (failed) return name;
-            if ( backtracking==0 ) {
-               
-              		    name=id.getText(); 
-              		    if( descr != null ) {
-              			descr.setStartCharacter( ((CommonToken)id).getStartIndex() );
-              			descr.setEndCharacter( ((CommonToken)id).getStopIndex() );
-              		    }
-              		
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1342:3: ( ( '.' identifier )=> '.' ident= identifier )*
-            loop52:
-            do {
-                int alt52=2;
-                int LA52_0 = input.LA(1);
-                if ( (LA52_0==64) ) {
-                    alt52=1;
+                id = (Token) this.input.LT( 1 );
+                match( this.input,
+                       ID,
+                       FOLLOW_ID_in_dotted_name4018 );
+                if ( this.failed ) {
+                    return name;
                 }
+                if ( this.backtracking == 0 ) {
 
+                    name = id.getText();
+                    if ( descr != null ) {
+                        descr.setStartCharacter( ((CommonToken) id).getStartIndex() );
+                        descr.setEndCharacter( ((CommonToken) id).getStopIndex() );
+                    }
 
-                switch (alt52) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1342:5: ( '.' identifier )=> '.' ident= identifier
-            	    {
-            	    match(input,64,FOLLOW_64_in_dotted_name4030); if (failed) return name;
-            	    pushFollow(FOLLOW_identifier_in_dotted_name4034);
-            	    ident=identifier();
-            	    _fsp--;
-            	    if (failed) return name;
-            	    if ( backtracking==0 ) {
-            	       
-            	      		        name = name + "." + ident.getText(); 
-            	          		        if( descr != null ) {
-            	      			    descr.setEndCharacter( ((CommonToken)ident).getStopIndex() );
-            	      		        }
-            	      		    
-            	    }
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1342:3: ( ( '.' identifier )=> '.' ident= identifier )*
+                loop52 : do {
+                    int alt52 = 2;
+                    final int LA52_0 = this.input.LA( 1 );
+                    if ( (LA52_0 == 64) ) {
+                        alt52 = 1;
+                    }
 
-            	    }
-            	    break;
+                    switch ( alt52 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1342:5: ( '.' identifier )=> '.' ident= identifier
+                        {
+                            match( this.input,
+                                   64,
+                                   FOLLOW_64_in_dotted_name4030 );
+                            if ( this.failed ) {
+                                return name;
+                            }
+                            pushFollow( FOLLOW_identifier_in_dotted_name4034 );
+                            ident = identifier();
+                            this._fsp--;
+                            if ( this.failed ) {
+                                return name;
+                            }
+                            if ( this.backtracking == 0 ) {
 
-            	default :
-            	    break loop52;
-                }
-            } while (true);
+                                name = name + "." + ident.getText();
+                                if ( descr != null ) {
+                                    descr.setEndCharacter( ((CommonToken) ident).getStopIndex() );
+                                }
 
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1350:3: ( ( '[' ']' )=> '[' loc= ']' )*
-            loop53:
-            do {
-                int alt53=2;
-                int LA53_0 = input.LA(1);
-                if ( (LA53_0==LEFT_SQUARE) ) {
-                    alt53=1;
-                }
+                            }
 
+                        }
+                            break;
 
-                switch (alt53) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1350:5: ( '[' ']' )=> '[' loc= ']'
-            	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dotted_name4056); if (failed) return name;
-            	    loc=(Token)input.LT(1);
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dotted_name4060); if (failed) return name;
-            	    if ( backtracking==0 ) {
-            	       
-            	      		        name = name + "[]";
-            	          		        if( descr != null ) {
-            	      			    descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-            	      		        }
-            	      		    
-            	    }
+                        default :
+                            break loop52;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1350:3: ( ( '[' ']' )=> '[' loc= ']' )*
+                loop53 : do {
+                    int alt53 = 2;
+                    final int LA53_0 = this.input.LA( 1 );
+                    if ( (LA53_0 == LEFT_SQUARE) ) {
+                        alt53 = 1;
+                    }
 
-            	default :
-            	    break loop53;
-                }
-            } while (true);
+                    switch ( alt53 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1350:5: ( '[' ']' )=> '[' loc= ']'
+                        {
+                            match( this.input,
+                                   LEFT_SQUARE,
+                                   FOLLOW_LEFT_SQUARE_in_dotted_name4056 );
+                            if ( this.failed ) {
+                                return name;
+                            }
+                            loc = (Token) this.input.LT( 1 );
+                            match( this.input,
+                                   RIGHT_SQUARE,
+                                   FOLLOW_RIGHT_SQUARE_in_dotted_name4060 );
+                            if ( this.failed ) {
+                                return name;
+                            }
+                            if ( this.backtracking == 0 ) {
 
+                                name = name + "[]";
+                                if ( descr != null ) {
+                                    descr.setEndCharacter( ((CommonToken) loc).getStopIndex() );
+                                }
 
+                            }
+
+                        }
+                            break;
+
+                        default :
+                            break loop53;
+                    }
+                } while ( true );
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return name;
     }
+
     // $ANTLR end dotted_name
 
-
     // $ANTLR start argument
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1360:1: argument returns [String name] : id= identifier ( ( '[' ']' )=> '[' ']' )* ;
     public String argument() throws RecognitionException {
@@ -5205,1229 +5955,1444 @@
 
         Token id = null;
 
+        name = null;
 
-        
-        		name = null;
-        	
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1365:3: (id= identifier ( ( '[' ']' )=> '[' ']' )* )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1365:3: id= identifier ( ( '[' ']' )=> '[' ']' )*
             {
-            pushFollow(FOLLOW_identifier_in_argument4099);
-            id=identifier();
-            _fsp--;
-            if (failed) return name;
-            if ( backtracking==0 ) {
-               name=id.getText(); 
-            }
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1365:40: ( ( '[' ']' )=> '[' ']' )*
-            loop54:
-            do {
-                int alt54=2;
-                int LA54_0 = input.LA(1);
-                if ( (LA54_0==LEFT_SQUARE) ) {
-                    alt54=1;
+                pushFollow( FOLLOW_identifier_in_argument4099 );
+                id = identifier();
+                this._fsp--;
+                if ( this.failed ) {
+                    return name;
                 }
+                if ( this.backtracking == 0 ) {
+                    name = id.getText();
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1365:40: ( ( '[' ']' )=> '[' ']' )*
+                loop54 : do {
+                    int alt54 = 2;
+                    final int LA54_0 = this.input.LA( 1 );
+                    if ( (LA54_0 == LEFT_SQUARE) ) {
+                        alt54 = 1;
+                    }
 
+                    switch ( alt54 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1365:42: ( '[' ']' )=> '[' ']'
+                        {
+                            match( this.input,
+                                   LEFT_SQUARE,
+                                   FOLLOW_LEFT_SQUARE_in_argument4105 );
+                            if ( this.failed ) {
+                                return name;
+                            }
+                            match( this.input,
+                                   RIGHT_SQUARE,
+                                   FOLLOW_RIGHT_SQUARE_in_argument4107 );
+                            if ( this.failed ) {
+                                return name;
+                            }
+                            if ( this.backtracking == 0 ) {
+                                name = name + "[]";
+                            }
 
-                switch (alt54) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1365:42: ( '[' ']' )=> '[' ']'
-            	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_argument4105); if (failed) return name;
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_argument4107); if (failed) return name;
-            	    if ( backtracking==0 ) {
-            	       name = name + "[]";
-            	    }
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            break loop54;
+                    }
+                } while ( true );
 
-            	default :
-            	    break loop54;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return name;
     }
+
     // $ANTLR end argument
 
-
     // $ANTLR start rhs_chunk
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1368:1: rhs_chunk[RuleDescr rule] : start= THEN ( (~ END )=>~ END )* loc= END ;
-    public void rhs_chunk(RuleDescr rule) throws RecognitionException {
-        Token start=null;
-        Token loc=null;
+    public void rhs_chunk(final RuleDescr rule) throws RecognitionException {
+        Token start = null;
+        Token loc = null;
 
-        
-                   StringBuffer buf = null;
-                   Integer channel = null;
-                
+        StringBuffer buf = null;
+        Integer channel = null;
+
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1374:10: (start= THEN ( (~ END )=>~ END )* loc= END )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1374:10: start= THEN ( (~ END )=>~ END )* loc= END
             {
-            if ( backtracking==0 ) {
-              
-              	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
-              		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
-              		    buf = new StringBuffer();
-              	        
-            }
-            start=(Token)input.LT(1);
-            match(input,THEN,FOLLOW_THEN_in_rhs_chunk4151); if (failed) return ;
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1380:3: ( (~ END )=>~ END )*
-            loop55:
-            do {
-                int alt55=2;
-                int LA55_0 = input.LA(1);
-                if ( ((LA55_0>=PACKAGE && LA55_0<=QUERY)||(LA55_0>=TEMPLATE && LA55_0<=78)) ) {
-                    alt55=1;
+                if ( this.backtracking == 0 ) {
+
+                    channel = ((SwitchingCommonTokenStream) this.input).getTokenTypeChannel( WS );
+                    ((SwitchingCommonTokenStream) this.input).setTokenTypeChannel( WS,
+                                                                              Token.DEFAULT_CHANNEL );
+                    buf = new StringBuffer();
+
                 }
+                start = (Token) this.input.LT( 1 );
+                match( this.input,
+                       THEN,
+                       FOLLOW_THEN_in_rhs_chunk4151 );
+                if ( this.failed ) {
+                    return;
+                }
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1380:3: ( (~ END )=>~ END )*
+                loop55 : do {
+                    int alt55 = 2;
+                    final int LA55_0 = this.input.LA( 1 );
+                    if ( ((LA55_0 >= PACKAGE && LA55_0 <= QUERY) || (LA55_0 >= TEMPLATE && LA55_0 <= 78)) ) {
+                        alt55 = 1;
+                    }
 
+                    switch ( alt55 ) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1381:6: (~ END )=>~ END
+                        {
+                            if ( (this.input.LA( 1 ) >= PACKAGE && this.input.LA( 1 ) <= QUERY) || (this.input.LA( 1 ) >= TEMPLATE && this.input.LA( 1 ) <= 78) ) {
+                                this.input.consume();
+                                this.errorRecovery = false;
+                                this.failed = false;
+                            } else {
+                                if ( this.backtracking > 0 ) {
+                                    this.failed = true;
+                                    return;
+                                }
+                                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                         this.input );
+                                recoverFromMismatchedSet( this.input,
+                                                          mse,
+                                                          FOLLOW_set_in_rhs_chunk4163 );
+                                throw mse;
+                            }
 
-                switch (alt55) {
-            	case 1 :
-            	    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1381:6: (~ END )=>~ END
-            	    {
-            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=QUERY)||(input.LA(1)>=TEMPLATE && input.LA(1)<=78) ) {
-            	        input.consume();
-            	        errorRecovery=false;failed=false;
-            	    }
-            	    else {
-            	        if (backtracking>0) {failed=true; return ;}
-            	        MismatchedSetException mse =
-            	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk4163);    throw mse;
-            	    }
+                            if ( this.backtracking == 0 ) {
 
-            	    if ( backtracking==0 ) {
-            	      
-            	      			    buf.append( input.LT(-1).getText() );
-            	      			  
-            	    }
+                                buf.append( this.input.LT( -1 ).getText() );
 
-            	    }
-            	    break;
+                            }
 
-            	default :
-            	    break loop55;
+                        }
+                            break;
+
+                        default :
+                            break loop55;
+                    }
+                } while ( true );
+
+                if ( this.backtracking == 0 ) {
+
+                    if ( channel != null ) {
+                        ((SwitchingCommonTokenStream) this.input).setTokenTypeChannel( WS,
+                                                                                  channel.intValue() );
+                    } else {
+                        ((SwitchingCommonTokenStream) this.input).setTokenTypeChannel( WS,
+                                                                                  Token.HIDDEN_CHANNEL );
+                    }
+
                 }
-            } while (true);
+                loc = (Token) this.input.LT( 1 );
+                match( this.input,
+                       END,
+                       FOLLOW_END_in_rhs_chunk4200 );
+                if ( this.failed ) {
+                    return;
+                }
+                if ( this.backtracking == 0 ) {
 
-            if ( backtracking==0 ) {
-              
-              		    if( channel != null ) {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
-              		    } else {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
-              		    }
-              		
-            }
-            loc=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_rhs_chunk4200); if (failed) return ;
-            if ( backtracking==0 ) {
-              
-                                  // ignoring first line in the consequence
-                                  int index = 0;
-                                  while( (index < buf.length() ) && Character.isWhitespace( buf.charAt( index ) ) &&
-                                         (buf.charAt( index ) != 10 ) && (buf.charAt( index ) != 13 ))
-                                             index++;
-                                  if( (index < buf.length() ) && ( buf.charAt( index ) == '\r' ) )
-                                      index++;
-                                  if( (index < buf.length() ) && ( buf.charAt( index ) == '\n' ) )
-                                      index++;
-                                  
-              		    rule.setConsequence( buf.substring( index ) );
-                   		    rule.setConsequenceLocation(offset(start.getLine()), start.getCharPositionInLine());
-               		    rule.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-                              
-            }
+                    // ignoring first line in the consequence
+                    int index = 0;
+                    while ( (index < buf.length()) && Character.isWhitespace( buf.charAt( index ) ) && (buf.charAt( index ) != 10) && (buf.charAt( index ) != 13) ) {
+                        index++;
+                    }
+                    if ( (index < buf.length()) && (buf.charAt( index ) == '\r') ) {
+                        index++;
+                    }
+                    if ( (index < buf.length()) && (buf.charAt( index ) == '\n') ) {
+                        index++;
+                    }
 
+                    rule.setConsequence( buf.substring( index ) );
+                    rule.setConsequenceLocation( offset( start.getLine() ),
+                                                 start.getCharPositionInLine() );
+                    rule.setEndCharacter( ((CommonToken) loc).getStopIndex() );
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
-        return ;
+        return;
     }
+
     // $ANTLR end rhs_chunk
 
-
     // $ANTLR start name
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1411:1: name returns [String s] : ( ( ID )=>tok= ID | str= STRING ) ;
     public String name() throws RecognitionException {
         String s = null;
 
-        Token tok=null;
-        Token str=null;
+        Token tok = null;
+        Token str = null;
 
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1413:2: ( ( ( ID )=>tok= ID | str= STRING ) )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1413:2: ( ( ID )=>tok= ID | str= STRING )
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1413:2: ( ( ID )=>tok= ID | str= STRING )
-            int alt56=2;
-            int LA56_0 = input.LA(1);
-            if ( (LA56_0==ID) ) {
-                alt56=1;
-            }
-            else if ( (LA56_0==STRING) ) {
-                alt56=2;
-            }
-            else {
-                if (backtracking>0) {failed=true; return s;}
-                NoViableAltException nvae =
-                    new NoViableAltException("1413:2: ( ( ID )=>tok= ID | str= STRING )", 56, 0, input);
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1413:2: ( ( ID )=>tok= ID | str= STRING )
+                int alt56 = 2;
+                final int LA56_0 = this.input.LA( 1 );
+                if ( (LA56_0 == ID) ) {
+                    alt56 = 1;
+                } else if ( (LA56_0 == STRING) ) {
+                    alt56 = 2;
+                } else {
+                    if ( this.backtracking > 0 ) {
+                        this.failed = true;
+                        return s;
+                    }
+                    final NoViableAltException nvae = new NoViableAltException( "1413:2: ( ( ID )=>tok= ID | str= STRING )",
+                                                                          56,
+                                                                          0,
+                                                                          this.input );
 
-                throw nvae;
-            }
-            switch (alt56) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1414:6: ( ID )=>tok= ID
+                    throw nvae;
+                }
+                switch ( alt56 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1414:6: ( ID )=>tok= ID
                     {
-                    tok=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_name4244); if (failed) return s;
-                    if ( backtracking==0 ) {
-                      
-                      	        s = tok.getText();
-                      	    
-                    }
+                        tok = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               ID,
+                               FOLLOW_ID_in_name4244 );
+                        if ( this.failed ) {
+                            return s;
+                        }
+                        if ( this.backtracking == 0 ) {
 
+                            s = tok.getText();
+
+                        }
+
                     }
-                    break;
-                case 2 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1419:6: str= STRING
+                        break;
+                    case 2 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1419:6: str= STRING
                     {
-                    str=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_name4263); if (failed) return s;
-                    if ( backtracking==0 ) {
-                      
-                      	       s = getString( str );
-                      	    
-                    }
+                        str = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               STRING,
+                               FOLLOW_STRING_in_name4263 );
+                        if ( this.failed ) {
+                            return s;
+                        }
+                        if ( this.backtracking == 0 ) {
 
+                            s = getString( str );
+
+                        }
+
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return s;
     }
+
     // $ANTLR end name
 
-
     // $ANTLR start identifier
     // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1426:1: identifier returns [Token tok] : ( ( ID )=>t= ID | ( PACKAGE )=>t= PACKAGE | ( FUNCTION )=>t= FUNCTION | ( GLOBAL )=>t= GLOBAL | ( IMPORT )=>t= IMPORT | ( RULE )=>t= RULE | ( QUERY )=>t= QUERY | ( TEMPLATE )=>t= TEMPLATE | ( ATTRIBUTES )=>t= ATTRIBUTES | ( ENABLED )=>t= ENABLED | ( SALIENCE )=>t= SALIENCE | ( DURATION )=>t= DURATION | ( FROM )=>t= FROM | ( ACCUMULATE )=>t= ACCUMULATE | ( INIT )=>t= INIT | ( ACTION )=>t= ACTION | ( RESULT )=>t= RESULT | ( COLLECT )=>t= COLLECT | ( OR )=>t= OR | ( AND )=>t= AND | ( CONTAINS )=>t= CONTAINS | ( EXCLUDES )=>t= EXCLUDES | ( MATCHES )=>t= MATCHES | ( NULL )=>t= NULL | ( EXISTS )=>t= EXISTS | ( NOT )=>t= NOT | ( EVAL )=>t= EVAL | ( FORALL )=>t= FORALL | ( WHEN )=>t= WHEN | ( THEN )=>t= THEN | t= END ) ;
     public Token identifier() throws RecognitionException {
         Token tok = null;
 
-        Token t=null;
+        Token t = null;
 
         try {
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1428:2: ( ( ( ID )=>t= ID | ( PACKAGE )=>t= PACKAGE | ( FUNCTION )=>t= FUNCTION | ( GLOBAL )=>t= GLOBAL | ( IMPORT )=>t= IMPORT | ( RULE )=>t= RULE | ( QUERY )=>t= QUERY | ( TEMPLATE )=>t= TEMPLATE | ( ATTRIBUTES )=>t= ATTRIBUTES | ( ENABLED )=>t= ENABLED | ( SALIENCE )=>t= SALIENCE | ( DURATION )=>t= DURATION | ( FROM )=>t= FROM | ( ACCUMULATE )=>t= ACCUMULATE | ( INIT )=>t= INIT | ( ACTION )=>t= ACTION | ( RESULT )=>t= RESULT | ( COLLECT )=>t= COLLECT | ( OR )=>t= OR | ( AND )=>t= AND | ( CONTAINS )=>t= CONTAINS | ( EXCLUDES )=>t= EXCLUDES | ( MATCHES )=>t= MATCHES | ( NULL )=>t= NULL | ( EXISTS )=>t= EXISTS | ( NOT )=>t= NOT | ( EVAL )=>t= EVAL | ( FORALL )=>t= FORALL | ( WHEN )=>t= WHEN | ( THEN )=>t= THEN | t= END ) )
             // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1428:2: ( ( ID )=>t= ID | ( PACKAGE )=>t= PACKAGE | ( FUNCTION )=>t= FUNCTION | ( GLOBAL )=>t= GLOBAL | ( IMPORT )=>t= IMPORT | ( RULE )=>t= RULE | ( QUERY )=>t= QUERY | ( TEMPLATE )=>t= TEMPLATE | ( ATTRIBUTES )=>t= ATTRIBUTES | ( ENABLED )=>t= ENABLED | ( SALIENCE )=>t= SALIENCE | ( DURATION )=>t= DURATION | ( FROM )=>t= FROM | ( ACCUMULATE )=>t= ACCUMULATE | ( INIT )=>t= INIT | ( ACTION )=>t= ACTION | ( RESULT )=>t= RESULT | ( COLLECT )=>t= COLLECT | ( OR )=>t= OR | ( AND )=>t= AND | ( CONTAINS )=>t= CONTAINS | ( EXCLUDES )=>t= EXCLUDES | ( MATCHES )=>t= MATCHES | ( NULL )=>t= NULL | ( EXISTS )=>t= EXISTS | ( NOT )=>t= NOT | ( EVAL )=>t= EVAL | ( FORALL )=>t= FORALL | ( WHEN )=>t= WHEN | ( THEN )=>t= THEN | t= END )
             {
-            // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1428:2: ( ( ID )=>t= ID | ( PACKAGE )=>t= PACKAGE | ( FUNCTION )=>t= FUNCTION | ( GLOBAL )=>t= GLOBAL | ( IMPORT )=>t= IMPORT | ( RULE )=>t= RULE | ( QUERY )=>t= QUERY | ( TEMPLATE )=>t= TEMPLATE | ( ATTRIBUTES )=>t= ATTRIBUTES | ( ENABLED )=>t= ENABLED | ( SALIENCE )=>t= SALIENCE | ( DURATION )=>t= DURATION | ( FROM )=>t= FROM | ( ACCUMULATE )=>t= ACCUMULATE | ( INIT )=>t= INIT | ( ACTION )=>t= ACTION | ( RESULT )=>t= RESULT | ( COLLECT )=>t= COLLECT | ( OR )=>t= OR | ( AND )=>t= AND | ( CONTAINS )=>t= CONTAINS | ( EXCLUDES )=>t= EXCLUDES | ( MATCHES )=>t= MATCHES | ( NULL )=>t= NULL | ( EXISTS )=>t= EXISTS | ( NOT )=>t= NOT | ( EVAL )=>t= EVAL | ( FORALL )=>t= FORALL | ( WHEN )=>t= WHEN | ( THEN )=>t= THEN | t= END )
-            int alt57=31;
-            switch ( input.LA(1) ) {
-            case ID:
-                alt57=1;
-                break;
-            case PACKAGE:
-                alt57=2;
-                break;
-            case FUNCTION:
-                alt57=3;
-                break;
-            case GLOBAL:
-                alt57=4;
-                break;
-            case IMPORT:
-                alt57=5;
-                break;
-            case RULE:
-                alt57=6;
-                break;
-            case QUERY:
-                alt57=7;
-                break;
-            case TEMPLATE:
-                alt57=8;
-                break;
-            case ATTRIBUTES:
-                alt57=9;
-                break;
-            case ENABLED:
-                alt57=10;
-                break;
-            case SALIENCE:
-                alt57=11;
-                break;
-            case DURATION:
-                alt57=12;
-                break;
-            case FROM:
-                alt57=13;
-                break;
-            case ACCUMULATE:
-                alt57=14;
-                break;
-            case INIT:
-                alt57=15;
-                break;
-            case ACTION:
-                alt57=16;
-                break;
-            case RESULT:
-                alt57=17;
-                break;
-            case COLLECT:
-                alt57=18;
-                break;
-            case OR:
-                alt57=19;
-                break;
-            case AND:
-                alt57=20;
-                break;
-            case CONTAINS:
-                alt57=21;
-                break;
-            case EXCLUDES:
-                alt57=22;
-                break;
-            case MATCHES:
-                alt57=23;
-                break;
-            case NULL:
-                alt57=24;
-                break;
-            case EXISTS:
-                alt57=25;
-                break;
-            case NOT:
-                alt57=26;
-                break;
-            case EVAL:
-                alt57=27;
-                break;
-            case FORALL:
-                alt57=28;
-                break;
-            case WHEN:
-                alt57=29;
-                break;
-            case THEN:
-                alt57=30;
-                break;
-            case END:
-                alt57=31;
-                break;
-            default:
-                if (backtracking>0) {failed=true; return tok;}
-                NoViableAltException nvae =
-                    new NoViableAltException("1428:2: ( ( ID )=>t= ID | ( PACKAGE )=>t= PACKAGE | ( FUNCTION )=>t= FUNCTION | ( GLOBAL )=>t= GLOBAL | ( IMPORT )=>t= IMPORT | ( RULE )=>t= RULE | ( QUERY )=>t= QUERY | ( TEMPLATE )=>t= TEMPLATE | ( ATTRIBUTES )=>t= ATTRIBUTES | ( ENABLED )=>t= ENABLED | ( SALIENCE )=>t= SALIENCE | ( DURATION )=>t= DURATION | ( FROM )=>t= FROM | ( ACCUMULATE )=>t= ACCUMULATE | ( INIT )=>t= INIT | ( ACTION )=>t= ACTION | ( RESULT )=>t= RESULT | ( COLLECT )=>t= COLLECT | ( OR )=>t= OR | ( AND )=>t= AND | ( CONTAINS )=>t= CONTAINS | ( EXCLUDES )=>t= EXCLUDES | ( MATCHES )=>t= MATCHES | ( NULL )=>t= NULL | ( EXISTS )=>t= EXISTS | ( NOT )=>t= NOT | ( EVAL )=>t= EVAL | ( FORALL )=>t= FORALL | ( WHEN )=>t= WHEN | ( THEN )=>t= THEN | t= END )", 57, 0, input);
+                // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1428:2: ( ( ID )=>t= ID | ( PACKAGE )=>t= PACKAGE | ( FUNCTION )=>t= FUNCTION | ( GLOBAL )=>t= GLOBAL | ( IMPORT )=>t= IMPORT | ( RULE )=>t= RULE | ( QUERY )=>t= QUERY | ( TEMPLATE )=>t= TEMPLATE | ( ATTRIBUTES )=>t= ATTRIBUTES | ( ENABLED )=>t= ENABLED | ( SALIENCE )=>t= SALIENCE | ( DURATION )=>t= DURATION | ( FROM )=>t= FROM | ( ACCUMULATE )=>t= ACCUMULATE | ( INIT )=>t= INIT | ( ACTION )=>t= ACTION | ( RESULT )=>t= RESULT | ( COLLECT )=>t= COLLECT | ( OR )=>t= OR | ( AND )=>t= AND | ( CONTAINS )=>t= CONTAINS | ( EXCLUDES )=>t= EXCLUDES | ( MATCHES )=>t= MATCHES | ( NULL )=>t= NULL | ( EXISTS )=>t= EXISTS | ( NOT )=>t= NOT | ( EVAL )=>t= EVAL | ( FORALL )=>t= FORALL | ( WHEN )=>t= WHEN | ( THEN )=>t= THEN | t= END )
+                int alt57 = 31;
+                switch ( this.input.LA( 1 ) ) {
+                    case ID :
+                        alt57 = 1;
+                        break;
+                    case PACKAGE :
+                        alt57 = 2;
+                        break;
+                    case FUNCTION :
+                        alt57 = 3;
+                        break;
+                    case GLOBAL :
+                        alt57 = 4;
+                        break;
+                    case IMPORT :
+                        alt57 = 5;
+                        break;
+                    case RULE :
+                        alt57 = 6;
+                        break;
+                    case QUERY :
+                        alt57 = 7;
+                        break;
+                    case TEMPLATE :
+                        alt57 = 8;
+                        break;
+                    case ATTRIBUTES :
+                        alt57 = 9;
+                        break;
+                    case ENABLED :
+                        alt57 = 10;
+                        break;
+                    case SALIENCE :
+                        alt57 = 11;
+                        break;
+                    case DURATION :
+                        alt57 = 12;
+                        break;
+                    case FROM :
+                        alt57 = 13;
+                        break;
+                    case ACCUMULATE :
+                        alt57 = 14;
+                        break;
+                    case INIT :
+                        alt57 = 15;
+                        break;
+                    case ACTION :
+                        alt57 = 16;
+                        break;
+                    case RESULT :
+                        alt57 = 17;
+                        break;
+                    case COLLECT :
+                        alt57 = 18;
+                        break;
+                    case OR :
+                        alt57 = 19;
+                        break;
+                    case AND :
+                        alt57 = 20;
+                        break;
+                    case CONTAINS :
+                        alt57 = 21;
+                        break;
+                    case EXCLUDES :
+                        alt57 = 22;
+                        break;
+                    case MATCHES :
+                        alt57 = 23;
+                        break;
+                    case NULL :
+                        alt57 = 24;
+                        break;
+                    case EXISTS :
+                        alt57 = 25;
+                        break;
+                    case NOT :
+                        alt57 = 26;
+                        break;
+                    case EVAL :
+                        alt57 = 27;
+                        break;
+                    case FORALL :
+                        alt57 = 28;
+                        break;
+                    case WHEN :
+                        alt57 = 29;
+                        break;
+                    case THEN :
+                        alt57 = 30;
+                        break;
+                    case END :
+                        alt57 = 31;
+                        break;
+                    default :
+                        if ( this.backtracking > 0 ) {
+                            this.failed = true;
+                            return tok;
+                        }
+                        final NoViableAltException nvae = new NoViableAltException( "1428:2: ( ( ID )=>t= ID | ( PACKAGE )=>t= PACKAGE | ( FUNCTION )=>t= FUNCTION | ( GLOBAL )=>t= GLOBAL | ( IMPORT )=>t= IMPORT | ( RULE )=>t= RULE | ( QUERY )=>t= QUERY | ( TEMPLATE )=>t= TEMPLATE | ( ATTRIBUTES )=>t= ATTRIBUTES | ( ENABLED )=>t= ENABLED | ( SALIENCE )=>t= SALIENCE | ( DURATION )=>t= DURATION | ( FROM )=>t= FROM | ( ACCUMULATE )=>t= ACCUMULATE | ( INIT )=>t= INIT | ( ACTION )=>t= ACTION | ( RESULT )=>t= RESULT | ( COLLECT )=>t= COLLECT | ( OR )=>t= OR | ( AND )=>t= AND | ( CONTAINS )=>t= CONTAINS | ( EXCLUDES )=>t= EXCLUDES | ( MATCHES )=>t= MATCHES | ( NULL )=>t= NULL | ( EXISTS )=>t= EXISTS | ( NOT )=>t= NOT | ( EVAL )=>t= EVAL | ( FORALL )=>t= FORALL | ( WHEN )=>t= WHEN | ( THEN )=>t= THEN | t= END )",
+                                                                              57,
+                                                                              0,
+                                                                              this.input );
 
-                throw nvae;
-            }
+                        throw nvae;
+                }
 
-            switch (alt57) {
-                case 1 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1428:10: ( ID )=>t= ID
+                switch ( alt57 ) {
+                    case 1 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1428:10: ( ID )=>t= ID
                     {
-                    t=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_identifier4301); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               ID,
+                               FOLLOW_ID_in_identifier4301 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 2 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1429:4: ( PACKAGE )=>t= PACKAGE
+                        break;
+                    case 2 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1429:4: ( PACKAGE )=>t= PACKAGE
                     {
-                    t=(Token)input.LT(1);
-                    match(input,PACKAGE,FOLLOW_PACKAGE_in_identifier4314); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               PACKAGE,
+                               FOLLOW_PACKAGE_in_identifier4314 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 3 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1430:4: ( FUNCTION )=>t= FUNCTION
+                        break;
+                    case 3 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1430:4: ( FUNCTION )=>t= FUNCTION
                     {
-                    t=(Token)input.LT(1);
-                    match(input,FUNCTION,FOLLOW_FUNCTION_in_identifier4321); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               FUNCTION,
+                               FOLLOW_FUNCTION_in_identifier4321 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 4 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1431:4: ( GLOBAL )=>t= GLOBAL
+                        break;
+                    case 4 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1431:4: ( GLOBAL )=>t= GLOBAL
                     {
-                    t=(Token)input.LT(1);
-                    match(input,GLOBAL,FOLLOW_GLOBAL_in_identifier4328); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               GLOBAL,
+                               FOLLOW_GLOBAL_in_identifier4328 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 5 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1432:4: ( IMPORT )=>t= IMPORT
+                        break;
+                    case 5 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1432:4: ( IMPORT )=>t= IMPORT
                     {
-                    t=(Token)input.LT(1);
-                    match(input,IMPORT,FOLLOW_IMPORT_in_identifier4335); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               IMPORT,
+                               FOLLOW_IMPORT_in_identifier4335 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 6 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1433:4: ( RULE )=>t= RULE
+                        break;
+                    case 6 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1433:4: ( RULE )=>t= RULE
                     {
-                    t=(Token)input.LT(1);
-                    match(input,RULE,FOLLOW_RULE_in_identifier4344); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               RULE,
+                               FOLLOW_RULE_in_identifier4344 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 7 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1434:4: ( QUERY )=>t= QUERY
+                        break;
+                    case 7 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1434:4: ( QUERY )=>t= QUERY
                     {
-                    t=(Token)input.LT(1);
-                    match(input,QUERY,FOLLOW_QUERY_in_identifier4351); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               QUERY,
+                               FOLLOW_QUERY_in_identifier4351 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 8 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1435:17: ( TEMPLATE )=>t= TEMPLATE
+                        break;
+                    case 8 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1435:17: ( TEMPLATE )=>t= TEMPLATE
                     {
-                    t=(Token)input.LT(1);
-                    match(input,TEMPLATE,FOLLOW_TEMPLATE_in_identifier4372); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               TEMPLATE,
+                               FOLLOW_TEMPLATE_in_identifier4372 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 9 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1436:17: ( ATTRIBUTES )=>t= ATTRIBUTES
+                        break;
+                    case 9 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1436:17: ( ATTRIBUTES )=>t= ATTRIBUTES
                     {
-                    t=(Token)input.LT(1);
-                    match(input,ATTRIBUTES,FOLLOW_ATTRIBUTES_in_identifier4400); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               ATTRIBUTES,
+                               FOLLOW_ATTRIBUTES_in_identifier4400 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 10 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1437:17: ( ENABLED )=>t= ENABLED
+                        break;
+                    case 10 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1437:17: ( ENABLED )=>t= ENABLED
                     {
-                    t=(Token)input.LT(1);
-                    match(input,ENABLED,FOLLOW_ENABLED_in_identifier4426); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               ENABLED,
+                               FOLLOW_ENABLED_in_identifier4426 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 11 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1438:17: ( SALIENCE )=>t= SALIENCE
+                        break;
+                    case 11 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1438:17: ( SALIENCE )=>t= SALIENCE
                     {
-                    t=(Token)input.LT(1);
-                    match(input,SALIENCE,FOLLOW_SALIENCE_in_identifier4455); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               SALIENCE,
+                               FOLLOW_SALIENCE_in_identifier4455 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 12 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1439:17: ( DURATION )=>t= DURATION
+                        break;
+                    case 12 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1439:17: ( DURATION )=>t= DURATION
                     {
-                    t=(Token)input.LT(1);
-                    match(input,DURATION,FOLLOW_DURATION_in_identifier4477); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               DURATION,
+                               FOLLOW_DURATION_in_identifier4477 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 13 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1440:17: ( FROM )=>t= FROM
+                        break;
+                    case 13 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1440:17: ( FROM )=>t= FROM
                     {
-                    t=(Token)input.LT(1);
-                    match(input,FROM,FOLLOW_FROM_in_identifier4499); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               FROM,
+                               FOLLOW_FROM_in_identifier4499 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 14 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1441:17: ( ACCUMULATE )=>t= ACCUMULATE
+                        break;
+                    case 14 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1441:17: ( ACCUMULATE )=>t= ACCUMULATE
                     {
-                    t=(Token)input.LT(1);
-                    match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_identifier4528); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               ACCUMULATE,
+                               FOLLOW_ACCUMULATE_in_identifier4528 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 15 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1442:17: ( INIT )=>t= INIT
+                        break;
+                    case 15 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1442:17: ( INIT )=>t= INIT
                     {
-                    t=(Token)input.LT(1);
-                    match(input,INIT,FOLLOW_INIT_in_identifier4550); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               INIT,
+                               FOLLOW_INIT_in_identifier4550 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 16 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1443:17: ( ACTION )=>t= ACTION
+                        break;
+                    case 16 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1443:17: ( ACTION )=>t= ACTION
                     {
-                    t=(Token)input.LT(1);
-                    match(input,ACTION,FOLLOW_ACTION_in_identifier4579); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               ACTION,
+                               FOLLOW_ACTION_in_identifier4579 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 17 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1444:17: ( RESULT )=>t= RESULT
+                        break;
+                    case 17 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1444:17: ( RESULT )=>t= RESULT
                     {
-                    t=(Token)input.LT(1);
-                    match(input,RESULT,FOLLOW_RESULT_in_identifier4608); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               RESULT,
+                               FOLLOW_RESULT_in_identifier4608 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 18 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1445:17: ( COLLECT )=>t= COLLECT
+                        break;
+                    case 18 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1445:17: ( COLLECT )=>t= COLLECT
                     {
-                    t=(Token)input.LT(1);
-                    match(input,COLLECT,FOLLOW_COLLECT_in_identifier4637); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               COLLECT,
+                               FOLLOW_COLLECT_in_identifier4637 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 19 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1446:17: ( OR )=>t= OR
+                        break;
+                    case 19 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1446:17: ( OR )=>t= OR
                     {
-                    t=(Token)input.LT(1);
-                    match(input,OR,FOLLOW_OR_in_identifier4666); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               OR,
+                               FOLLOW_OR_in_identifier4666 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 20 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1447:17: ( AND )=>t= AND
+                        break;
+                    case 20 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1447:17: ( AND )=>t= AND
                     {
-                    t=(Token)input.LT(1);
-                    match(input,AND,FOLLOW_AND_in_identifier4695); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               AND,
+                               FOLLOW_AND_in_identifier4695 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 21 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1448:17: ( CONTAINS )=>t= CONTAINS
+                        break;
+                    case 21 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1448:17: ( CONTAINS )=>t= CONTAINS
                     {
-                    t=(Token)input.LT(1);
-                    match(input,CONTAINS,FOLLOW_CONTAINS_in_identifier4724); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               CONTAINS,
+                               FOLLOW_CONTAINS_in_identifier4724 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 22 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1449:17: ( EXCLUDES )=>t= EXCLUDES
+                        break;
+                    case 22 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1449:17: ( EXCLUDES )=>t= EXCLUDES
                     {
-                    t=(Token)input.LT(1);
-                    match(input,EXCLUDES,FOLLOW_EXCLUDES_in_identifier4746); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               EXCLUDES,
+                               FOLLOW_EXCLUDES_in_identifier4746 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 23 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1450:17: ( MATCHES )=>t= MATCHES
+                        break;
+                    case 23 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1450:17: ( MATCHES )=>t= MATCHES
                     {
-                    t=(Token)input.LT(1);
-                    match(input,MATCHES,FOLLOW_MATCHES_in_identifier4768); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               MATCHES,
+                               FOLLOW_MATCHES_in_identifier4768 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 24 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1451:17: ( NULL )=>t= NULL
+                        break;
+                    case 24 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1451:17: ( NULL )=>t= NULL
                     {
-                    t=(Token)input.LT(1);
-                    match(input,NULL,FOLLOW_NULL_in_identifier4797); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               NULL,
+                               FOLLOW_NULL_in_identifier4797 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 25 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1452:17: ( EXISTS )=>t= EXISTS
+                        break;
+                    case 25 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1452:17: ( EXISTS )=>t= EXISTS
                     {
-                    t=(Token)input.LT(1);
-                    match(input,EXISTS,FOLLOW_EXISTS_in_identifier4826); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               EXISTS,
+                               FOLLOW_EXISTS_in_identifier4826 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 26 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1453:17: ( NOT )=>t= NOT
+                        break;
+                    case 26 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1453:17: ( NOT )=>t= NOT
                     {
-                    t=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_identifier4855); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               NOT,
+                               FOLLOW_NOT_in_identifier4855 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 27 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1454:17: ( EVAL )=>t= EVAL
+                        break;
+                    case 27 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1454:17: ( EVAL )=>t= EVAL
                     {
-                    t=(Token)input.LT(1);
-                    match(input,EVAL,FOLLOW_EVAL_in_identifier4884); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               EVAL,
+                               FOLLOW_EVAL_in_identifier4884 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 28 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1455:17: ( FORALL )=>t= FORALL
+                        break;
+                    case 28 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1455:17: ( FORALL )=>t= FORALL
                     {
-                    t=(Token)input.LT(1);
-                    match(input,FORALL,FOLLOW_FORALL_in_identifier4913); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               FORALL,
+                               FOLLOW_FORALL_in_identifier4913 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 29 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1456:17: ( WHEN )=>t= WHEN
+                        break;
+                    case 29 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1456:17: ( WHEN )=>t= WHEN
                     {
-                    t=(Token)input.LT(1);
-                    match(input,WHEN,FOLLOW_WHEN_in_identifier4951); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               WHEN,
+                               FOLLOW_WHEN_in_identifier4951 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 30 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1457:17: ( THEN )=>t= THEN
+                        break;
+                    case 30 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1457:17: ( THEN )=>t= THEN
                     {
-                    t=(Token)input.LT(1);
-                    match(input,THEN,FOLLOW_THEN_in_identifier4983); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               THEN,
+                               FOLLOW_THEN_in_identifier4983 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
-                case 31 :
-                    // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1458:17: t= END
+                        break;
+                    case 31 :
+                        // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1458:17: t= END
                     {
-                    t=(Token)input.LT(1);
-                    match(input,END,FOLLOW_END_in_identifier5012); if (failed) return tok;
+                        t = (Token) this.input.LT( 1 );
+                        match( this.input,
+                               END,
+                               FOLLOW_END_in_identifier5012 );
+                        if ( this.failed ) {
+                            return tok;
+                        }
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-            if ( backtracking==0 ) {
-              
-              	    tok = t;
-              	
-            }
+                if ( this.backtracking == 0 ) {
 
+                    tok = t;
+
+                }
+
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-        }
         return tok;
     }
+
     // $ANTLR end identifier
 
     // $ANTLR start synpred4
-    public void synpred4_fragment() throws RecognitionException {   
+    public void synpred4_fragment() throws RecognitionException {
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:189:4: ( function_import_statement )
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:189:4: function_import_statement
         {
-        pushFollow(FOLLOW_function_import_statement_in_synpred4114);
-        function_import_statement();
-        _fsp--;
-        if (failed) return ;
+            pushFollow( FOLLOW_function_import_statement_in_synpred4114 );
+            function_import_statement();
+            this._fsp--;
+            if ( this.failed ) {
+                return;
+            }
 
         }
     }
+
     // $ANTLR end synpred4
 
     // $ANTLR start synpred5
-    public void synpred5_fragment() throws RecognitionException {   
+    public void synpred5_fragment() throws RecognitionException {
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:190:4: ( import_statement )
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:190:4: import_statement
         {
-        pushFollow(FOLLOW_import_statement_in_synpred5120);
-        import_statement();
-        _fsp--;
-        if (failed) return ;
+            pushFollow( FOLLOW_import_statement_in_synpred5120 );
+            import_statement();
+            this._fsp--;
+            if ( this.failed ) {
+                return;
+            }
 
         }
     }
+
     // $ANTLR end synpred5
 
     // $ANTLR start synpred38
-    public void synpred38_fragment() throws RecognitionException {   
+    public void synpred38_fragment() throws RecognitionException {
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:718:4: ( paren_chunk[from] )
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:718:4: paren_chunk[from]
         {
-        pushFollow(FOLLOW_paren_chunk_in_synpred381788);
-        paren_chunk(from);
-        _fsp--;
-        if (failed) return ;
+            pushFollow( FOLLOW_paren_chunk_in_synpred381788 );
+            paren_chunk( this.from );
+            this._fsp--;
+            if ( this.failed ) {
+                return;
+            }
 
         }
     }
+
     // $ANTLR end synpred38
 
     // $ANTLR start synpred41
-    public void synpred41_fragment() throws RecognitionException {   
+    public void synpred41_fragment() throws RecognitionException {
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:753:6: ( LEFT_PAREN )
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:753:8: LEFT_PAREN
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred411888); if (failed) return ;
+            match( this.input,
+                   LEFT_PAREN,
+                   FOLLOW_LEFT_PAREN_in_synpred411888 );
+            if ( this.failed ) {
+                return;
+            }
 
         }
     }
+
     // $ANTLR end synpred41
 
     // $ANTLR start synpred44
-    public void synpred44_fragment() throws RecognitionException {   
+    public void synpred44_fragment() throws RecognitionException {
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:850:6: ( (OR|'||') fact )
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:850:6: (OR|'||') fact
         {
-        if ( input.LA(1)==OR||input.LA(1)==68 ) {
-            input.consume();
-            errorRecovery=false;failed=false;
-        }
-        else {
-            if (backtracking>0) {failed=true; return ;}
-            MismatchedSetException mse =
-                new MismatchedSetException(null,input);
-            recoverFromMismatchedSet(input,mse,FOLLOW_set_in_synpred442197);    throw mse;
-        }
+            if ( this.input.LA( 1 ) == OR || this.input.LA( 1 ) == 68 ) {
+                this.input.consume();
+                this.errorRecovery = false;
+                this.failed = false;
+            } else {
+                if ( this.backtracking > 0 ) {
+                    this.failed = true;
+                    return;
+                }
+                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                         this.input );
+                recoverFromMismatchedSet( this.input,
+                                          mse,
+                                          FOLLOW_set_in_synpred442197 );
+                throw mse;
+            }
 
-        pushFollow(FOLLOW_fact_in_synpred442214);
-        fact();
-        _fsp--;
-        if (failed) return ;
+            pushFollow( FOLLOW_fact_in_synpred442214 );
+            fact();
+            this._fsp--;
+            if ( this.failed ) {
+                return;
+            }
 
         }
     }
+
     // $ANTLR end synpred44
 
     // $ANTLR start synpred72
-    public void synpred72_fragment() throws RecognitionException {   
+    public void synpred72_fragment() throws RecognitionException {
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1228:14: ( ACCUMULATE )
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1228:16: ACCUMULATE
         {
-        match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_synpred723458); if (failed) return ;
+            match( this.input,
+                   ACCUMULATE,
+                   FOLLOW_ACCUMULATE_in_synpred723458 );
+            if ( this.failed ) {
+                return;
+            }
 
         }
     }
+
     // $ANTLR end synpred72
 
     // $ANTLR start synpred73
-    public void synpred73_fragment() throws RecognitionException {   
+    public void synpred73_fragment() throws RecognitionException {
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1229:14: ( COLLECT )
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1229:16: COLLECT
         {
-        match(input,COLLECT,FOLLOW_COLLECT_in_synpred733487); if (failed) return ;
+            match( this.input,
+                   COLLECT,
+                   FOLLOW_COLLECT_in_synpred733487 );
+            if ( this.failed ) {
+                return;
+            }
 
         }
     }
+
     // $ANTLR end synpred73
 
     // $ANTLR start synpred74
-    public void synpred74_fragment() throws RecognitionException {   
+    public void synpred74_fragment() throws RecognitionException {
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1230:14: (~ (ACCUMULATE|COLLECT))
         // C:\\dev\\jbossrules\\trunk3\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1230:16: ~ (ACCUMULATE|COLLECT)
         {
-        if ( (input.LA(1)>=PACKAGE && input.LA(1)<=LOCK_ON_ACTIVE)||(input.LA(1)>=INIT && input.LA(1)<=RESULT)||(input.LA(1)>=ID && input.LA(1)<=78) ) {
-            input.consume();
-            errorRecovery=false;failed=false;
-        }
-        else {
-            if (backtracking>0) {failed=true; return ;}
-            MismatchedSetException mse =
-                new MismatchedSetException(null,input);
-            recoverFromMismatchedSet(input,mse,FOLLOW_set_in_synpred743517);    throw mse;
-        }
+            if ( (this.input.LA( 1 ) >= PACKAGE && this.input.LA( 1 ) <= LOCK_ON_ACTIVE) || (this.input.LA( 1 ) >= INIT && this.input.LA( 1 ) <= RESULT) || (this.input.LA( 1 ) >= ID && this.input.LA( 1 ) <= 78) ) {
+                this.input.consume();
+                this.errorRecovery = false;
+                this.failed = false;
+            } else {
+                if ( this.backtracking > 0 ) {
+                    this.failed = true;
+                    return;
+                }
+                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                         this.input );
+                recoverFromMismatchedSet( this.input,
+                                          mse,
+                                          FOLLOW_set_in_synpred743517 );
+                throw mse;
+            }
 
-
         }
     }
+
     // $ANTLR end synpred74
 
     public boolean synpred44() {
-        backtracking++;
-        int start = input.mark();
+        this.backtracking++;
+        final int start = this.input.mark();
         try {
             synpred44_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
+        } catch ( final RecognitionException re ) {
+            System.err.println( "impossible: " + re );
         }
-        boolean success = !failed;
-        input.rewind(start);
-        backtracking--;
-        failed=false;
+        final boolean success = !this.failed;
+        this.input.rewind( start );
+        this.backtracking--;
+        this.failed = false;
         return success;
     }
+
     public boolean synpred74() {
-        backtracking++;
-        int start = input.mark();
+        this.backtracking++;
+        final int start = this.input.mark();
         try {
             synpred74_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
+        } catch ( final RecognitionException re ) {
+            System.err.println( "impossible: " + re );
         }
-        boolean success = !failed;
-        input.rewind(start);
-        backtracking--;
-        failed=false;
+        final boolean success = !this.failed;
+        this.input.rewind( start );
+        this.backtracking--;
+        this.failed = false;
         return success;
     }
+
     public boolean synpred38() {
-        backtracking++;
-        int start = input.mark();
+        this.backtracking++;
+        final int start = this.input.mark();
         try {
             synpred38_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
+        } catch ( final RecognitionException re ) {
+            System.err.println( "impossible: " + re );
         }
-        boolean success = !failed;
-        input.rewind(start);
-        backtracking--;
-        failed=false;
+        final boolean success = !this.failed;
+        this.input.rewind( start );
+        this.backtracking--;
+        this.failed = false;
         return success;
     }
+
     public boolean synpred72() {
-        backtracking++;
-        int start = input.mark();
+        this.backtracking++;
+        final int start = this.input.mark();
         try {
             synpred72_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
+        } catch ( final RecognitionException re ) {
+            System.err.println( "impossible: " + re );
         }
-        boolean success = !failed;
-        input.rewind(start);
-        backtracking--;
-        failed=false;
+        final boolean success = !this.failed;
+        this.input.rewind( start );
+        this.backtracking--;
+        this.failed = false;
         return success;
     }
+
     public boolean synpred73() {
-        backtracking++;
-        int start = input.mark();
+        this.backtracking++;
+        final int start = this.input.mark();
         try {
             synpred73_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
+        } catch ( final RecognitionException re ) {
+            System.err.println( "impossible: " + re );
         }
-        boolean success = !failed;
-        input.rewind(start);
-        backtracking--;
-        failed=false;
+        final boolean success = !this.failed;
+        this.input.rewind( start );
+        this.backtracking--;
+        this.failed = false;
         return success;
     }
+
     public boolean synpred5() {
-        backtracking++;
-        int start = input.mark();
+        this.backtracking++;
+        final int start = this.input.mark();
         try {
             synpred5_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
+        } catch ( final RecognitionException re ) {
+            System.err.println( "impossible: " + re );
         }
-        boolean success = !failed;
-        input.rewind(start);
-        backtracking--;
-        failed=false;
+        final boolean success = !this.failed;
+        this.input.rewind( start );
+        this.backtracking--;
+        this.failed = false;
         return success;
     }
+
     public boolean synpred41() {
-        backtracking++;
-        int start = input.mark();
+        this.backtracking++;
+        final int start = this.input.mark();
         try {
             synpred41_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
+        } catch ( final RecognitionException re ) {
+            System.err.println( "impossible: " + re );
         }
-        boolean success = !failed;
-        input.rewind(start);
-        backtracking--;
-        failed=false;
+        final boolean success = !this.failed;
+        this.input.rewind( start );
+        this.backtracking--;
+        this.failed = false;
         return success;
     }
+
     public boolean synpred4() {
-        backtracking++;
-        int start = input.mark();
+        this.backtracking++;
+        final int start = this.input.mark();
         try {
             synpred4_fragment(); // can never throw exception
-        } catch (RecognitionException re) {
-            System.err.println("impossible: "+re);
+        } catch ( final RecognitionException re ) {
+            System.err.println( "impossible: " + re );
         }
-        boolean success = !failed;
-        input.rewind(start);
-        backtracking--;
-        failed=false;
+        final boolean success = !this.failed;
+        this.input.rewind( start );
+        this.backtracking--;
+        this.failed = false;
         return success;
     }
 
+    protected DFA8               dfa8            = new DFA8( this );
+    protected DFA9               dfa9            = new DFA9( this );
+    public static final String   DFA8_eotS       = "\6\uffff";
+    public static final String   DFA8_eofS       = "\6\uffff";
+    public static final String   DFA8_minS       = "\2\4\2\uffff\1\55\1\4";
+    public static final String   DFA8_maxS       = "\1\64\1\102\2\uffff\1\55\1\102";
+    public static final String   DFA8_acceptS    = "\2\uffff\1\2\1\1\2\uffff";
+    public static final String   DFA8_specialS   = "\6\uffff}>";
+    public static final String[] DFA8_transition = {"\12\2\3\uffff\1\2\1\uffff\1\2\6\uffff\1\2\1\uffff\5\2\1\1\1\2\2" + "\uffff\3\2\1\uffff\1\2\4\uffff\7\2",
+            "\12\3\3\uffff\1\3\1\uffff\1\3\6\uffff\1\3\1\uffff\7\3\1\uffff\1" + "\2\3\3\1\uffff\1\3\2\uffff\1\4\1\uffff\7\3\13\uffff\1\3\1\uffff" + "\1\2", "", "", "\1\5",
+            "\12\3\3\uffff\1\3\1\uffff\1\3\6\uffff\1\3\1\uffff\7\3\1\uffff\1" + "\2\3\3\1\uffff\1\3\2\uffff\1\4\1\uffff\7\3\15\uffff\1\2"};
 
-    protected DFA8 dfa8 = new DFA8(this);
-    protected DFA9 dfa9 = new DFA9(this);
-    public static final String DFA8_eotS =
-        "\6\uffff";
-    public static final String DFA8_eofS =
-        "\6\uffff";
-    public static final String DFA8_minS =
-        "\2\4\2\uffff\1\55\1\4";
-    public static final String DFA8_maxS =
-        "\1\64\1\102\2\uffff\1\55\1\102";
-    public static final String DFA8_acceptS =
-        "\2\uffff\1\2\1\1\2\uffff";
-    public static final String DFA8_specialS =
-        "\6\uffff}>";
-    public static final String[] DFA8_transition = {
-        "\12\2\3\uffff\1\2\1\uffff\1\2\6\uffff\1\2\1\uffff\5\2\1\1\1\2\2"+
-        "\uffff\3\2\1\uffff\1\2\4\uffff\7\2",
-        "\12\3\3\uffff\1\3\1\uffff\1\3\6\uffff\1\3\1\uffff\7\3\1\uffff\1"+
-        "\2\3\3\1\uffff\1\3\2\uffff\1\4\1\uffff\7\3\13\uffff\1\3\1\uffff"+
-        "\1\2",
-        "",
-        "",
-        "\1\5",
-        "\12\3\3\uffff\1\3\1\uffff\1\3\6\uffff\1\3\1\uffff\7\3\1\uffff\1"+
-        "\2\3\3\1\uffff\1\3\2\uffff\1\4\1\uffff\7\3\15\uffff\1\2"
-    };
-
     class DFA8 extends DFA {
-        public DFA8(BaseRecognizer recognizer) {
+        public DFA8(final BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 8;
-            this.eot = DFA.unpackEncodedString(DFA8_eotS);
-            this.eof = DFA.unpackEncodedString(DFA8_eofS);
-            this.min = DFA.unpackEncodedStringToUnsignedChars(DFA8_minS);
-            this.max = DFA.unpackEncodedStringToUnsignedChars(DFA8_maxS);
-            this.accept = DFA.unpackEncodedString(DFA8_acceptS);
-            this.special = DFA.unpackEncodedString(DFA8_specialS);
-            int numStates = DFA8_transition.length;
+            this.eot = DFA.unpackEncodedString( DFA8_eotS );
+            this.eof = DFA.unpackEncodedString( DFA8_eofS );
+            this.min = DFA.unpackEncodedStringToUnsignedChars( DFA8_minS );
+            this.max = DFA.unpackEncodedStringToUnsignedChars( DFA8_maxS );
+            this.accept = DFA.unpackEncodedString( DFA8_acceptS );
+            this.special = DFA.unpackEncodedString( DFA8_specialS );
+            final int numStates = DFA8_transition.length;
             this.transition = new short[numStates][];
-            for (int i=0; i<numStates; i++) {
-                transition[i] = DFA.unpackEncodedString(DFA8_transition[i]);
+            for ( int i = 0; i < numStates; i++ ) {
+                this.transition[i] = DFA.unpackEncodedString( DFA8_transition[i] );
             }
         }
+
         public String getDescription() {
             return "307:6: ( ( dotted_name[null] )=>paramType= dotted_name[null] )?";
         }
     }
-    public static final String DFA9_eotS =
-        "\6\uffff";
-    public static final String DFA9_eofS =
-        "\6\uffff";
-    public static final String DFA9_minS =
-        "\2\4\2\uffff\1\55\1\4";
-    public static final String DFA9_maxS =
-        "\1\64\1\102\2\uffff\1\55\1\102";
-    public static final String DFA9_acceptS =
-        "\2\uffff\1\2\1\1\2\uffff";
-    public static final String DFA9_specialS =
-        "\6\uffff}>";
-    public static final String[] DFA9_transition = {
-        "\12\2\3\uffff\1\2\1\uffff\1\2\6\uffff\1\2\1\uffff\5\2\1\1\1\2\2"+
-        "\uffff\3\2\1\uffff\1\2\4\uffff\7\2",
-        "\12\3\3\uffff\1\3\1\uffff\1\3\6\uffff\1\3\1\uffff\7\3\1\uffff\1"+
-        "\2\3\3\1\uffff\1\3\2\uffff\1\4\1\uffff\7\3\13\uffff\1\3\1\uffff"+
-        "\1\2",
-        "",
-        "",
-        "\1\5",
-        "\12\3\3\uffff\1\3\1\uffff\1\3\6\uffff\1\3\1\uffff\7\3\1\uffff\1"+
-        "\2\3\3\1\uffff\1\3\2\uffff\1\4\1\uffff\7\3\15\uffff\1\2"
-    };
 
+    public static final String   DFA9_eotS       = "\6\uffff";
+    public static final String   DFA9_eofS       = "\6\uffff";
+    public static final String   DFA9_minS       = "\2\4\2\uffff\1\55\1\4";
+    public static final String   DFA9_maxS       = "\1\64\1\102\2\uffff\1\55\1\102";
+    public static final String   DFA9_acceptS    = "\2\uffff\1\2\1\1\2\uffff";
+    public static final String   DFA9_specialS   = "\6\uffff}>";
+    public static final String[] DFA9_transition = {"\12\2\3\uffff\1\2\1\uffff\1\2\6\uffff\1\2\1\uffff\5\2\1\1\1\2\2" + "\uffff\3\2\1\uffff\1\2\4\uffff\7\2",
+            "\12\3\3\uffff\1\3\1\uffff\1\3\6\uffff\1\3\1\uffff\7\3\1\uffff\1" + "\2\3\3\1\uffff\1\3\2\uffff\1\4\1\uffff\7\3\13\uffff\1\3\1\uffff" + "\1\2", "", "", "\1\5",
+            "\12\3\3\uffff\1\3\1\uffff\1\3\6\uffff\1\3\1\uffff\7\3\1\uffff\1" + "\2\3\3\1\uffff\1\3\2\uffff\1\4\1\uffff\7\3\15\uffff\1\2"};
+
     class DFA9 extends DFA {
-        public DFA9(BaseRecognizer recognizer) {
+        public DFA9(final BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 9;
-            this.eot = DFA.unpackEncodedString(DFA9_eotS);
-            this.eof = DFA.unpackEncodedString(DFA9_eofS);
-            this.min = DFA.unpackEncodedStringToUnsignedChars(DFA9_minS);
-            this.max = DFA.unpackEncodedStringToUnsignedChars(DFA9_maxS);
-            this.accept = DFA.unpackEncodedString(DFA9_acceptS);
-            this.special = DFA.unpackEncodedString(DFA9_specialS);
-            int numStates = DFA9_transition.length;
+            this.eot = DFA.unpackEncodedString( DFA9_eotS );
+            this.eof = DFA.unpackEncodedString( DFA9_eofS );
+            this.min = DFA.unpackEncodedStringToUnsignedChars( DFA9_minS );
+            this.max = DFA.unpackEncodedStringToUnsignedChars( DFA9_maxS );
+            this.accept = DFA.unpackEncodedString( DFA9_acceptS );
+            this.special = DFA.unpackEncodedString( DFA9_specialS );
+            final int numStates = DFA9_transition.length;
             this.transition = new short[numStates][];
-            for (int i=0; i<numStates; i++) {
-                transition[i] = DFA.unpackEncodedString(DFA9_transition[i]);
+            for ( int i = 0; i < numStates; i++ ) {
+                this.transition[i] = DFA.unpackEncodedString( DFA9_transition[i] );
             }
         }
+
         public String getDescription() {
             return "311:11: ( ( dotted_name[null] )=>paramType= dotted_name[null] )?";
         }
     }
- 
 
-    public static final BitSet FOLLOW_63_in_opt_semicolon46 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_prolog_in_compilation_unit58 = new BitSet(new long[]{0x0000000000000DE0L});
-    public static final BitSet FOLLOW_statement_in_compilation_unit65 = new BitSet(new long[]{0x0000000000000DE2L});
-    public static final BitSet FOLLOW_package_statement_in_prolog90 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_function_import_statement_in_statement114 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_import_statement_in_statement120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_global_in_statement126 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_function_in_statement132 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_template_in_statement146 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule_in_statement155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_query_in_statement167 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_PACKAGE_in_package_statement196 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_dotted_name_in_package_statement200 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_opt_semicolon_in_package_statement203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IMPORT_in_import_statement235 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_import_name_in_import_statement258 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_opt_semicolon_in_import_statement261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IMPORT_in_function_import_statement287 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_FUNCTION_in_function_import_statement289 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_import_name_in_function_import_statement312 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_opt_semicolon_in_function_import_statement315 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_import_name343 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000003L});
-    public static final BitSet FOLLOW_64_in_import_name355 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_import_name359 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000003L});
-    public static final BitSet FOLLOW_65_in_import_name383 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_GLOBAL_in_global419 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_dotted_name_in_global430 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_global442 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_opt_semicolon_in_global444 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FUNCTION_in_function471 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_dotted_name_in_function476 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_function483 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_function492 = new BitSet(new long[]{0x001FC2F7F40A3FF0L});
-    public static final BitSet FOLLOW_dotted_name_in_function502 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_argument_in_function509 = new BitSet(new long[]{0x0000001000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_66_in_function523 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_dotted_name_in_function528 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_argument_in_function535 = new BitSet(new long[]{0x0000001000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_function559 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_curly_chunk_in_function565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_QUERY_in_query597 = new BitSet(new long[]{0x0000000200008000L});
-    public static final BitSet FOLLOW_name_in_query601 = new BitSet(new long[]{0x000F000A00000200L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_query614 = new BitSet(new long[]{0x0000000000000200L});
-    public static final BitSet FOLLOW_END_in_query631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEMPLATE_in_template661 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_template665 = new BitSet(new long[]{0x8000000200000000L});
-    public static final BitSet FOLLOW_opt_semicolon_in_template667 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_template_slot_in_template682 = new BitSet(new long[]{0x0000000200000200L});
-    public static final BitSet FOLLOW_END_in_template699 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_opt_semicolon_in_template701 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_dotted_name_in_template_slot747 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_template_slot765 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_opt_semicolon_in_template_slot767 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_in_rule800 = new BitSet(new long[]{0x0000000200008000L});
-    public static final BitSet FOLLOW_name_in_rule804 = new BitSet(new long[]{0x001000000FEB7000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_rule_attributes_in_rule813 = new BitSet(new long[]{0x0010000000001000L});
-    public static final BitSet FOLLOW_WHEN_in_rule822 = new BitSet(new long[]{0x001F000A00000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_67_in_rule824 = new BitSet(new long[]{0x001F000A00000000L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_rule842 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_rhs_chunk_in_rule863 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ATTRIBUTES_in_rule_attributes884 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_67_in_rule_attributes886 = new BitSet(new long[]{0x000000000FEB4002L,0x0000000000000004L});
-    public static final BitSet FOLLOW_66_in_rule_attributes895 = new BitSet(new long[]{0x000000000FEB4000L});
-    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes900 = new BitSet(new long[]{0x000000000FEB4002L,0x0000000000000004L});
-    public static final BitSet FOLLOW_salience_in_rule_attribute941 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_no_loop_in_rule_attribute951 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_agenda_group_in_rule_attribute962 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_duration_in_rule_attribute975 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_activation_group_in_rule_attribute989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_auto_focus_in_rule_attribute1000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_date_effective_in_rule_attribute1011 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_date_expires_in_rule_attribute1021 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_enabled_in_rule_attribute1031 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleflow_group_in_rule_attribute1041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lock_on_active_in_rule_attribute1051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DATE_EFFECTIVE_in_date_effective1082 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_STRING_in_date_effective1086 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DATE_EXPIRES_in_date_expires1119 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_STRING_in_date_expires1123 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ENABLED_in_enabled1158 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_BOOL_in_enabled1162 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_SALIENCE_in_salience1207 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_INT_in_salience1211 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NO_LOOP_in_no_loop1249 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NO_LOOP_in_no_loop1277 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_BOOL_in_no_loop1281 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AUTO_FOCUS_in_auto_focus1330 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AUTO_FOCUS_in_auto_focus1358 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_BOOL_in_auto_focus1362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACTIVATION_GROUP_in_activation_group1407 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_STRING_in_activation_group1411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1443 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_STRING_in_ruleflow_group1447 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AGENDA_GROUP_in_agenda_group1479 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_STRING_in_agenda_group1483 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DURATION_in_duration1518 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_INT_in_duration1522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1592 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_BOOL_in_lock_on_active1596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_in_normal_lhs_block1634 = new BitSet(new long[]{0x000F000A00000002L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs1671 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_binding_in_lhs_column1699 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_in_lhs_column1708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_from_source_in_from_statement1735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_from_source1777 = new BitSet(new long[]{0x0000000800000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_paren_chunk_in_from_source1788 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_expression_chain_in_from_source1802 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_expression_chain1827 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_expression_chain1831 = new BitSet(new long[]{0x0000100800000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_square_chunk_in_expression_chain1862 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_paren_chunk_in_expression_chain1896 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_expression_chain_in_expression_chain1917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACCUMULATE_in_accumulate_statement1958 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_statement1968 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_lhs_column_in_accumulate_statement1972 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_66_in_accumulate_statement1974 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_INIT_in_accumulate_statement1983 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement1987 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_66_in_accumulate_statement1990 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_ACTION_in_accumulate_statement1999 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2003 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_66_in_accumulate_statement2006 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_RESULT_in_accumulate_statement2015 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2019 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_statement2024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_COLLECT_in_collect_statement2067 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_collect_statement2077 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_lhs_column_in_collect_statement2081 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_collect_statement2085 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_fact_binding2119 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_67_in_fact_binding2121 = new BitSet(new long[]{0x0000000A00000000L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_binding2134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_fact_expression2166 = new BitSet(new long[]{0x0000000A00000000L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2170 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact_expression2173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_in_fact_expression2184 = new BitSet(new long[]{0x0000000400000002L,0x0000000000000010L});
-    public static final BitSet FOLLOW_set_in_fact_expression2197 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_fact_in_fact_expression2214 = new BitSet(new long[]{0x0000000400000002L,0x0000000000000010L});
-    public static final BitSet FOLLOW_dotted_name_in_fact2275 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_fact2289 = new BitSet(new long[]{0x001FC2FFF40A3FF0L});
-    public static final BitSet FOLLOW_constraints_in_fact2299 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact2312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_constraint_in_constraints2333 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000004L});
-    public static final BitSet FOLLOW_predicate_in_constraints2336 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000004L});
-    public static final BitSet FOLLOW_66_in_constraints2344 = new BitSet(new long[]{0x001FC2EFF40A3FF0L});
-    public static final BitSet FOLLOW_constraint_in_constraints2347 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000004L});
-    public static final BitSet FOLLOW_predicate_in_constraints2350 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_constraint2379 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_67_in_constraint2381 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_constraint2402 = new BitSet(new long[]{0x000000E000000002L,0x0000000000003F80L});
-    public static final BitSet FOLLOW_constraint_expression_in_constraint2420 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000060L});
-    public static final BitSet FOLLOW_set_in_constraint2442 = new BitSet(new long[]{0x000000E000000000L,0x0000000000003F00L});
-    public static final BitSet FOLLOW_constraint_expression_in_constraint2461 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000060L});
-    public static final BitSet FOLLOW_71_in_constraint2489 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_predicate_in_constraint2491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_set_in_constraint_expression2528 = new BitSet(new long[]{0x0000030A00148000L});
-    public static final BitSet FOLLOW_ID_in_constraint_expression2595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_enum_constraint_in_constraint_expression2611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literal_constraint_in_constraint_expression2634 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_retval_constraint_in_constraint_expression2648 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_literal_constraint2687 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_INT_in_literal_constraint2698 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FLOAT_in_literal_constraint2711 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_BOOL_in_literal_constraint2722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NULL_in_literal_constraint2734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_enum_constraint2769 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_64_in_enum_constraint2775 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_enum_constraint2779 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_paren_chunk_in_predicate2821 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk2870 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000007FFFL});
-    public static final BitSet FOLLOW_set_in_paren_chunk2886 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000007FFFL});
-    public static final BitSet FOLLOW_paren_chunk_in_paren_chunk2910 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000007FFFL});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk2947 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk2998 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000007FFFL});
-    public static final BitSet FOLLOW_set_in_curly_chunk3014 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000007FFFL});
-    public static final BitSet FOLLOW_curly_chunk_in_curly_chunk3038 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000007FFFL});
-    public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk3075 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk3138 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000007FFFL});
-    public static final BitSet FOLLOW_set_in_square_chunk3154 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000007FFFL});
-    public static final BitSet FOLLOW_square_chunk_in_square_chunk3178 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000007FFFL});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk3215 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_retval_constraint3260 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or3288 = new BitSet(new long[]{0x0000000400000002L,0x0000000000000010L});
-    public static final BitSet FOLLOW_set_in_lhs_or3297 = new BitSet(new long[]{0x000F000A00000000L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or3307 = new BitSet(new long[]{0x0000000400000002L,0x0000000000000010L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and3343 = new BitSet(new long[]{0x0000400000000002L,0x0000000000004000L});
-    public static final BitSet FOLLOW_set_in_lhs_and3352 = new BitSet(new long[]{0x000F000A00000000L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and3362 = new BitSet(new long[]{0x0000400000000002L,0x0000000000004000L});
-    public static final BitSet FOLLOW_lhs_exist_in_lhs_unary3399 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_lhs_not_in_lhs_unary3407 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary3415 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_lhs_column_in_lhs_unary3423 = new BitSet(new long[]{0x8000800000000002L});
-    public static final BitSet FOLLOW_FROM_in_lhs_unary3439 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_accumulate_statement_in_lhs_unary3467 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_collect_statement_in_lhs_unary3496 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_from_statement_in_lhs_unary3531 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_lhs_forall_in_lhs_unary3570 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_unary3578 = new BitSet(new long[]{0x000F000A00000000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_unary3582 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_unary3584 = new BitSet(new long[]{0x8000000000000002L});
-    public static final BitSet FOLLOW_opt_semicolon_in_lhs_unary3594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EXISTS_in_lhs_exist3618 = new BitSet(new long[]{0x0000000A00000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_exist3638 = new BitSet(new long[]{0x000F000A00000000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_exist3642 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_exist3674 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_column_in_lhs_exist3724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NOT_in_lhs_not3778 = new BitSet(new long[]{0x0000000A00000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_not3791 = new BitSet(new long[]{0x000F000A00000000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_not3795 = new BitSet(new long[]{0x0000001000000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_not3828 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_column_in_lhs_not3865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EVAL_in_lhs_eval3913 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_lhs_eval3917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FORALL_in_lhs_forall3946 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_forall3948 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_lhs_column_in_lhs_forall3952 = new BitSet(new long[]{0x0000000200000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_66_in_lhs_forall3966 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_lhs_column_in_lhs_forall3972 = new BitSet(new long[]{0x0000001200000000L,0x0000000000000004L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_forall3987 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_dotted_name4018 = new BitSet(new long[]{0x0000100000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_64_in_dotted_name4030 = new BitSet(new long[]{0x001FC2E7F40A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_dotted_name4034 = new BitSet(new long[]{0x0000100000000002L,0x0000000000000001L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_dotted_name4056 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_dotted_name4060 = new BitSet(new long[]{0x0000100000000002L});
-    public static final BitSet FOLLOW_identifier_in_argument4099 = new BitSet(new long[]{0x0000100000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_argument4105 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_argument4107 = new BitSet(new long[]{0x0000100000000002L});
-    public static final BitSet FOLLOW_THEN_in_rhs_chunk4151 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000007FFFL});
-    public static final BitSet FOLLOW_set_in_rhs_chunk4163 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000007FFFL});
-    public static final BitSet FOLLOW_END_in_rhs_chunk4200 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_name4244 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_name4263 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_identifier4301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_PACKAGE_in_identifier4314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FUNCTION_in_identifier4321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_GLOBAL_in_identifier4328 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IMPORT_in_identifier4335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_in_identifier4344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_QUERY_in_identifier4351 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEMPLATE_in_identifier4372 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ATTRIBUTES_in_identifier4400 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ENABLED_in_identifier4426 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_SALIENCE_in_identifier4455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DURATION_in_identifier4477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FROM_in_identifier4499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACCUMULATE_in_identifier4528 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_INIT_in_identifier4550 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACTION_in_identifier4579 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RESULT_in_identifier4608 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_COLLECT_in_identifier4637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_OR_in_identifier4666 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AND_in_identifier4695 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_CONTAINS_in_identifier4724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EXCLUDES_in_identifier4746 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_MATCHES_in_identifier4768 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NULL_in_identifier4797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EXISTS_in_identifier4826 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NOT_in_identifier4855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EVAL_in_identifier4884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FORALL_in_identifier4913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_WHEN_in_identifier4951 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_THEN_in_identifier4983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_END_in_identifier5012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_function_import_statement_in_synpred4114 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_import_statement_in_synpred5120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_synpred381788 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred411888 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_set_in_synpred442197 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_fact_in_synpred442214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACCUMULATE_in_synpred723458 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_COLLECT_in_synpred733487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_set_in_synpred743517 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_63_in_opt_semicolon46                           = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_prolog_in_compilation_unit58                    = new BitSet( new long[]{0x0000000000000DE0L} );
+    public static final BitSet FOLLOW_statement_in_compilation_unit65                 = new BitSet( new long[]{0x0000000000000DE2L} );
+    public static final BitSet FOLLOW_package_statement_in_prolog90                   = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_function_import_statement_in_statement114       = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_import_statement_in_statement120                = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_global_in_statement126                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_function_in_statement132                        = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_template_in_statement146                        = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_rule_in_statement155                            = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_query_in_statement167                           = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_PACKAGE_in_package_statement196                 = new BitSet( new long[]{0x0000000200000000L} );
+    public static final BitSet FOLLOW_dotted_name_in_package_statement200             = new BitSet( new long[]{0x8000000000000002L} );
+    public static final BitSet FOLLOW_opt_semicolon_in_package_statement203           = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_IMPORT_in_import_statement235                   = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_import_name_in_import_statement258              = new BitSet( new long[]{0x8000000000000002L} );
+    public static final BitSet FOLLOW_opt_semicolon_in_import_statement261            = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_IMPORT_in_function_import_statement287          = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_FUNCTION_in_function_import_statement289        = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_import_name_in_function_import_statement312     = new BitSet( new long[]{0x8000000000000002L} );
+    public static final BitSet FOLLOW_opt_semicolon_in_function_import_statement315   = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_identifier_in_import_name343                    = new BitSet( new long[]{0x0000000000000002L, 0x0000000000000003L} );
+    public static final BitSet FOLLOW_64_in_import_name355                            = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_identifier_in_import_name359                    = new BitSet( new long[]{0x0000000000000002L, 0x0000000000000003L} );
+    public static final BitSet FOLLOW_65_in_import_name383                            = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_GLOBAL_in_global419                             = new BitSet( new long[]{0x0000000200000000L} );
+    public static final BitSet FOLLOW_dotted_name_in_global430                        = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_identifier_in_global442                         = new BitSet( new long[]{0x8000000000000002L} );
+    public static final BitSet FOLLOW_opt_semicolon_in_global444                      = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_FUNCTION_in_function471                         = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_dotted_name_in_function476                      = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_identifier_in_function483                       = new BitSet( new long[]{0x0000000800000000L} );
+    public static final BitSet FOLLOW_LEFT_PAREN_in_function492                       = new BitSet( new long[]{0x001FC2F7F40A3FF0L} );
+    public static final BitSet FOLLOW_dotted_name_in_function502                      = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_argument_in_function509                         = new BitSet( new long[]{0x0000001000000000L, 0x0000000000000004L} );
+    public static final BitSet FOLLOW_66_in_function523                               = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_dotted_name_in_function528                      = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_argument_in_function535                         = new BitSet( new long[]{0x0000001000000000L, 0x0000000000000004L} );
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_function559                      = new BitSet( new long[]{0x0000040000000000L} );
+    public static final BitSet FOLLOW_curly_chunk_in_function565                      = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_QUERY_in_query597                               = new BitSet( new long[]{0x0000000200008000L} );
+    public static final BitSet FOLLOW_name_in_query601                                = new BitSet( new long[]{0x000F000A00000200L} );
+    public static final BitSet FOLLOW_normal_lhs_block_in_query614                    = new BitSet( new long[]{0x0000000000000200L} );
+    public static final BitSet FOLLOW_END_in_query631                                 = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_TEMPLATE_in_template661                         = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_identifier_in_template665                       = new BitSet( new long[]{0x8000000200000000L} );
+    public static final BitSet FOLLOW_opt_semicolon_in_template667                    = new BitSet( new long[]{0x0000000200000000L} );
+    public static final BitSet FOLLOW_template_slot_in_template682                    = new BitSet( new long[]{0x0000000200000200L} );
+    public static final BitSet FOLLOW_END_in_template699                              = new BitSet( new long[]{0x8000000000000002L} );
+    public static final BitSet FOLLOW_opt_semicolon_in_template701                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_dotted_name_in_template_slot747                 = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_identifier_in_template_slot765                  = new BitSet( new long[]{0x8000000000000002L} );
+    public static final BitSet FOLLOW_opt_semicolon_in_template_slot767               = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_RULE_in_rule800                                 = new BitSet( new long[]{0x0000000200008000L} );
+    public static final BitSet FOLLOW_name_in_rule804                                 = new BitSet( new long[]{0x001000000FEB7000L, 0x0000000000000004L} );
+    public static final BitSet FOLLOW_rule_attributes_in_rule813                      = new BitSet( new long[]{0x0010000000001000L} );
+    public static final BitSet FOLLOW_WHEN_in_rule822                                 = new BitSet( new long[]{0x001F000A00000000L, 0x0000000000000008L} );
+    public static final BitSet FOLLOW_67_in_rule824                                   = new BitSet( new long[]{0x001F000A00000000L} );
+    public static final BitSet FOLLOW_normal_lhs_block_in_rule842                     = new BitSet( new long[]{0x0010000000000000L} );
+    public static final BitSet FOLLOW_rhs_chunk_in_rule863                            = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_ATTRIBUTES_in_rule_attributes884                = new BitSet( new long[]{0x0000000000000000L, 0x0000000000000008L} );
+    public static final BitSet FOLLOW_67_in_rule_attributes886                        = new BitSet( new long[]{0x000000000FEB4002L, 0x0000000000000004L} );
+    public static final BitSet FOLLOW_66_in_rule_attributes895                        = new BitSet( new long[]{0x000000000FEB4000L} );
+    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes900            = new BitSet( new long[]{0x000000000FEB4002L, 0x0000000000000004L} );
+    public static final BitSet FOLLOW_salience_in_rule_attribute941                   = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_no_loop_in_rule_attribute951                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_agenda_group_in_rule_attribute962               = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_duration_in_rule_attribute975                   = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_activation_group_in_rule_attribute989           = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_auto_focus_in_rule_attribute1000                = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_date_effective_in_rule_attribute1011            = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_date_expires_in_rule_attribute1021              = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_enabled_in_rule_attribute1031                   = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_ruleflow_group_in_rule_attribute1041            = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_lock_on_active_in_rule_attribute1051            = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_DATE_EFFECTIVE_in_date_effective1082            = new BitSet( new long[]{0x0000000000008000L} );
+    public static final BitSet FOLLOW_STRING_in_date_effective1086                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_DATE_EXPIRES_in_date_expires1119                = new BitSet( new long[]{0x0000000000008000L} );
+    public static final BitSet FOLLOW_STRING_in_date_expires1123                      = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_ENABLED_in_enabled1158                          = new BitSet( new long[]{0x0000000000040000L} );
+    public static final BitSet FOLLOW_BOOL_in_enabled1162                             = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_SALIENCE_in_salience1207                        = new BitSet( new long[]{0x0000000000100000L} );
+    public static final BitSet FOLLOW_INT_in_salience1211                             = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_NO_LOOP_in_no_loop1249                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_NO_LOOP_in_no_loop1277                          = new BitSet( new long[]{0x0000000000040000L} );
+    public static final BitSet FOLLOW_BOOL_in_no_loop1281                             = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_AUTO_FOCUS_in_auto_focus1330                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_AUTO_FOCUS_in_auto_focus1358                    = new BitSet( new long[]{0x0000000000040000L} );
+    public static final BitSet FOLLOW_BOOL_in_auto_focus1362                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_ACTIVATION_GROUP_in_activation_group1407        = new BitSet( new long[]{0x0000000000008000L} );
+    public static final BitSet FOLLOW_STRING_in_activation_group1411                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1443            = new BitSet( new long[]{0x0000000000008000L} );
+    public static final BitSet FOLLOW_STRING_in_ruleflow_group1447                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_AGENDA_GROUP_in_agenda_group1479                = new BitSet( new long[]{0x0000000000008000L} );
+    public static final BitSet FOLLOW_STRING_in_agenda_group1483                      = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_DURATION_in_duration1518                        = new BitSet( new long[]{0x0000000000100000L} );
+    public static final BitSet FOLLOW_INT_in_duration1522                             = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1564            = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1592            = new BitSet( new long[]{0x0000000000040000L} );
+    public static final BitSet FOLLOW_BOOL_in_lock_on_active1596                      = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_lhs_in_normal_lhs_block1634                     = new BitSet( new long[]{0x000F000A00000002L} );
+    public static final BitSet FOLLOW_lhs_or_in_lhs1671                               = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_fact_binding_in_lhs_column1699                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_fact_in_lhs_column1708                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_from_source_in_from_statement1735               = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_identifier_in_from_source1777                   = new BitSet( new long[]{0x0000000800000002L, 0x0000000000000001L} );
+    public static final BitSet FOLLOW_paren_chunk_in_from_source1788                  = new BitSet( new long[]{0x0000000000000002L, 0x0000000000000001L} );
+    public static final BitSet FOLLOW_expression_chain_in_from_source1802             = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_64_in_expression_chain1827                      = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_identifier_in_expression_chain1831              = new BitSet( new long[]{0x0000100800000002L, 0x0000000000000001L} );
+    public static final BitSet FOLLOW_square_chunk_in_expression_chain1862            = new BitSet( new long[]{0x0000000000000002L, 0x0000000000000001L} );
+    public static final BitSet FOLLOW_paren_chunk_in_expression_chain1896             = new BitSet( new long[]{0x0000000000000002L, 0x0000000000000001L} );
+    public static final BitSet FOLLOW_expression_chain_in_expression_chain1917        = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_ACCUMULATE_in_accumulate_statement1958          = new BitSet( new long[]{0x0000000800000000L} );
+    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_statement1968          = new BitSet( new long[]{0x0000000200000000L} );
+    public static final BitSet FOLLOW_lhs_column_in_accumulate_statement1972          = new BitSet( new long[]{0x0000000000000000L, 0x0000000000000004L} );
+    public static final BitSet FOLLOW_66_in_accumulate_statement1974                  = new BitSet( new long[]{0x0000000020000000L} );
+    public static final BitSet FOLLOW_INIT_in_accumulate_statement1983                = new BitSet( new long[]{0x0000000800000000L} );
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement1987         = new BitSet( new long[]{0x0000000000000000L, 0x0000000000000004L} );
+    public static final BitSet FOLLOW_66_in_accumulate_statement1990                  = new BitSet( new long[]{0x0000000040000000L} );
+    public static final BitSet FOLLOW_ACTION_in_accumulate_statement1999              = new BitSet( new long[]{0x0000000800000000L} );
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2003         = new BitSet( new long[]{0x0000000000000000L, 0x0000000000000004L} );
+    public static final BitSet FOLLOW_66_in_accumulate_statement2006                  = new BitSet( new long[]{0x0000000080000000L} );
+    public static final BitSet FOLLOW_RESULT_in_accumulate_statement2015              = new BitSet( new long[]{0x0000000800000000L} );
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2019         = new BitSet( new long[]{0x0000001000000000L} );
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_statement2024         = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_COLLECT_in_collect_statement2067                = new BitSet( new long[]{0x0000000800000000L} );
+    public static final BitSet FOLLOW_LEFT_PAREN_in_collect_statement2077             = new BitSet( new long[]{0x0000000200000000L} );
+    public static final BitSet FOLLOW_lhs_column_in_collect_statement2081             = new BitSet( new long[]{0x0000001000000000L} );
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_collect_statement2085            = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_ID_in_fact_binding2119                          = new BitSet( new long[]{0x0000000000000000L, 0x0000000000000008L} );
+    public static final BitSet FOLLOW_67_in_fact_binding2121                          = new BitSet( new long[]{0x0000000A00000000L} );
+    public static final BitSet FOLLOW_fact_expression_in_fact_binding2134             = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LEFT_PAREN_in_fact_expression2166               = new BitSet( new long[]{0x0000000A00000000L} );
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2170          = new BitSet( new long[]{0x0000001000000000L} );
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact_expression2173              = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_fact_in_fact_expression2184                     = new BitSet( new long[]{0x0000000400000002L, 0x0000000000000010L} );
+    public static final BitSet FOLLOW_set_in_fact_expression2197                      = new BitSet( new long[]{0x0000000200000000L} );
+    public static final BitSet FOLLOW_fact_in_fact_expression2214                     = new BitSet( new long[]{0x0000000400000002L, 0x0000000000000010L} );
+    public static final BitSet FOLLOW_dotted_name_in_fact2275                         = new BitSet( new long[]{0x0000000800000000L} );
+    public static final BitSet FOLLOW_LEFT_PAREN_in_fact2289                          = new BitSet( new long[]{0x001FC2FFF40A3FF0L} );
+    public static final BitSet FOLLOW_constraints_in_fact2299                         = new BitSet( new long[]{0x0000001000000000L} );
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact2312                         = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_constraint_in_constraints2333                   = new BitSet( new long[]{0x0000000000000002L, 0x0000000000000004L} );
+    public static final BitSet FOLLOW_predicate_in_constraints2336                    = new BitSet( new long[]{0x0000000000000002L, 0x0000000000000004L} );
+    public static final BitSet FOLLOW_66_in_constraints2344                           = new BitSet( new long[]{0x001FC2EFF40A3FF0L} );
+    public static final BitSet FOLLOW_constraint_in_constraints2347                   = new BitSet( new long[]{0x0000000000000002L, 0x0000000000000004L} );
+    public static final BitSet FOLLOW_predicate_in_constraints2350                    = new BitSet( new long[]{0x0000000000000002L, 0x0000000000000004L} );
+    public static final BitSet FOLLOW_ID_in_constraint2379                            = new BitSet( new long[]{0x0000000000000000L, 0x0000000000000008L} );
+    public static final BitSet FOLLOW_67_in_constraint2381                            = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_identifier_in_constraint2402                    = new BitSet( new long[]{0x000000E000000002L, 0x0000000000003F80L} );
+    public static final BitSet FOLLOW_constraint_expression_in_constraint2420         = new BitSet( new long[]{0x0000000000000002L, 0x0000000000000060L} );
+    public static final BitSet FOLLOW_set_in_constraint2442                           = new BitSet( new long[]{0x000000E000000000L, 0x0000000000003F00L} );
+    public static final BitSet FOLLOW_constraint_expression_in_constraint2461         = new BitSet( new long[]{0x0000000000000002L, 0x0000000000000060L} );
+    public static final BitSet FOLLOW_71_in_constraint2489                            = new BitSet( new long[]{0x0000000800000000L} );
+    public static final BitSet FOLLOW_predicate_in_constraint2491                     = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_set_in_constraint_expression2528                = new BitSet( new long[]{0x0000030A00148000L} );
+    public static final BitSet FOLLOW_ID_in_constraint_expression2595                 = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_enum_constraint_in_constraint_expression2611    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_literal_constraint_in_constraint_expression2634 = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_retval_constraint_in_constraint_expression2648  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_STRING_in_literal_constraint2687                = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_INT_in_literal_constraint2698                   = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_FLOAT_in_literal_constraint2711                 = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_BOOL_in_literal_constraint2722                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_NULL_in_literal_constraint2734                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_ID_in_enum_constraint2769                       = new BitSet( new long[]{0x0000000000000000L, 0x0000000000000001L} );
+    public static final BitSet FOLLOW_64_in_enum_constraint2775                       = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_identifier_in_enum_constraint2779               = new BitSet( new long[]{0x0000000000000002L, 0x0000000000000001L} );
+    public static final BitSet FOLLOW_paren_chunk_in_predicate2821                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk2870                   = new BitSet( new long[]{0xFFFFFFFFFFFFFFF0L, 0x0000000000007FFFL} );
+    public static final BitSet FOLLOW_set_in_paren_chunk2886                          = new BitSet( new long[]{0xFFFFFFFFFFFFFFF0L, 0x0000000000007FFFL} );
+    public static final BitSet FOLLOW_paren_chunk_in_paren_chunk2910                  = new BitSet( new long[]{0xFFFFFFFFFFFFFFF0L, 0x0000000000007FFFL} );
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk2947                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk2998                   = new BitSet( new long[]{0xFFFFFFFFFFFFFFF0L, 0x0000000000007FFFL} );
+    public static final BitSet FOLLOW_set_in_curly_chunk3014                          = new BitSet( new long[]{0xFFFFFFFFFFFFFFF0L, 0x0000000000007FFFL} );
+    public static final BitSet FOLLOW_curly_chunk_in_curly_chunk3038                  = new BitSet( new long[]{0xFFFFFFFFFFFFFFF0L, 0x0000000000007FFFL} );
+    public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk3075                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk3138                 = new BitSet( new long[]{0xFFFFFFFFFFFFFFF0L, 0x0000000000007FFFL} );
+    public static final BitSet FOLLOW_set_in_square_chunk3154                         = new BitSet( new long[]{0xFFFFFFFFFFFFFFF0L, 0x0000000000007FFFL} );
+    public static final BitSet FOLLOW_square_chunk_in_square_chunk3178                = new BitSet( new long[]{0xFFFFFFFFFFFFFFF0L, 0x0000000000007FFFL} );
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk3215                = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_paren_chunk_in_retval_constraint3260            = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or3288                           = new BitSet( new long[]{0x0000000400000002L, 0x0000000000000010L} );
+    public static final BitSet FOLLOW_set_in_lhs_or3297                               = new BitSet( new long[]{0x000F000A00000000L} );
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or3307                           = new BitSet( new long[]{0x0000000400000002L, 0x0000000000000010L} );
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and3343                        = new BitSet( new long[]{0x0000400000000002L, 0x0000000000004000L} );
+    public static final BitSet FOLLOW_set_in_lhs_and3352                              = new BitSet( new long[]{0x000F000A00000000L} );
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and3362                        = new BitSet( new long[]{0x0000400000000002L, 0x0000000000004000L} );
+    public static final BitSet FOLLOW_lhs_exist_in_lhs_unary3399                      = new BitSet( new long[]{0x8000000000000002L} );
+    public static final BitSet FOLLOW_lhs_not_in_lhs_unary3407                        = new BitSet( new long[]{0x8000000000000002L} );
+    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary3415                       = new BitSet( new long[]{0x8000000000000002L} );
+    public static final BitSet FOLLOW_lhs_column_in_lhs_unary3423                     = new BitSet( new long[]{0x8000800000000002L} );
+    public static final BitSet FOLLOW_FROM_in_lhs_unary3439                           = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_accumulate_statement_in_lhs_unary3467           = new BitSet( new long[]{0x8000000000000002L} );
+    public static final BitSet FOLLOW_collect_statement_in_lhs_unary3496              = new BitSet( new long[]{0x8000000000000002L} );
+    public static final BitSet FOLLOW_from_statement_in_lhs_unary3531                 = new BitSet( new long[]{0x8000000000000002L} );
+    public static final BitSet FOLLOW_lhs_forall_in_lhs_unary3570                     = new BitSet( new long[]{0x8000000000000002L} );
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_unary3578                     = new BitSet( new long[]{0x000F000A00000000L} );
+    public static final BitSet FOLLOW_lhs_or_in_lhs_unary3582                         = new BitSet( new long[]{0x0000001000000000L} );
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_unary3584                    = new BitSet( new long[]{0x8000000000000002L} );
+    public static final BitSet FOLLOW_opt_semicolon_in_lhs_unary3594                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_EXISTS_in_lhs_exist3618                         = new BitSet( new long[]{0x0000000A00000000L} );
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_exist3638                     = new BitSet( new long[]{0x000F000A00000000L} );
+    public static final BitSet FOLLOW_lhs_or_in_lhs_exist3642                         = new BitSet( new long[]{0x0000001000000000L} );
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_exist3674                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_lhs_column_in_lhs_exist3724                     = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_NOT_in_lhs_not3778                              = new BitSet( new long[]{0x0000000A00000000L} );
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_not3791                       = new BitSet( new long[]{0x000F000A00000000L} );
+    public static final BitSet FOLLOW_lhs_or_in_lhs_not3795                           = new BitSet( new long[]{0x0000001000000000L} );
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_not3828                      = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_lhs_column_in_lhs_not3865                       = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_EVAL_in_lhs_eval3913                            = new BitSet( new long[]{0x0000000800000000L} );
+    public static final BitSet FOLLOW_paren_chunk_in_lhs_eval3917                     = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_FORALL_in_lhs_forall3946                        = new BitSet( new long[]{0x0000000800000000L} );
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_forall3948                    = new BitSet( new long[]{0x0000000200000000L} );
+    public static final BitSet FOLLOW_lhs_column_in_lhs_forall3952                    = new BitSet( new long[]{0x0000000200000000L, 0x0000000000000004L} );
+    public static final BitSet FOLLOW_66_in_lhs_forall3966                            = new BitSet( new long[]{0x0000000200000000L} );
+    public static final BitSet FOLLOW_lhs_column_in_lhs_forall3972                    = new BitSet( new long[]{0x0000001200000000L, 0x0000000000000004L} );
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_forall3987                   = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_ID_in_dotted_name4018                           = new BitSet( new long[]{0x0000100000000002L, 0x0000000000000001L} );
+    public static final BitSet FOLLOW_64_in_dotted_name4030                           = new BitSet( new long[]{0x001FC2E7F40A3FF0L} );
+    public static final BitSet FOLLOW_identifier_in_dotted_name4034                   = new BitSet( new long[]{0x0000100000000002L, 0x0000000000000001L} );
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_dotted_name4056                  = new BitSet( new long[]{0x0000200000000000L} );
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_dotted_name4060                 = new BitSet( new long[]{0x0000100000000002L} );
+    public static final BitSet FOLLOW_identifier_in_argument4099                      = new BitSet( new long[]{0x0000100000000002L} );
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_argument4105                     = new BitSet( new long[]{0x0000200000000000L} );
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_argument4107                    = new BitSet( new long[]{0x0000100000000002L} );
+    public static final BitSet FOLLOW_THEN_in_rhs_chunk4151                           = new BitSet( new long[]{0xFFFFFFFFFFFFFFF0L, 0x0000000000007FFFL} );
+    public static final BitSet FOLLOW_set_in_rhs_chunk4163                            = new BitSet( new long[]{0xFFFFFFFFFFFFFFF0L, 0x0000000000007FFFL} );
+    public static final BitSet FOLLOW_END_in_rhs_chunk4200                            = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_ID_in_name4244                                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_STRING_in_name4263                              = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_ID_in_identifier4301                            = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_PACKAGE_in_identifier4314                       = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_FUNCTION_in_identifier4321                      = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_GLOBAL_in_identifier4328                        = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_IMPORT_in_identifier4335                        = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_RULE_in_identifier4344                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_QUERY_in_identifier4351                         = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_TEMPLATE_in_identifier4372                      = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_ATTRIBUTES_in_identifier4400                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_ENABLED_in_identifier4426                       = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_SALIENCE_in_identifier4455                      = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_DURATION_in_identifier4477                      = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_FROM_in_identifier4499                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_ACCUMULATE_in_identifier4528                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_INIT_in_identifier4550                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_ACTION_in_identifier4579                        = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_RESULT_in_identifier4608                        = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_COLLECT_in_identifier4637                       = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_OR_in_identifier4666                            = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_AND_in_identifier4695                           = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_CONTAINS_in_identifier4724                      = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_EXCLUDES_in_identifier4746                      = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_MATCHES_in_identifier4768                       = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_NULL_in_identifier4797                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_EXISTS_in_identifier4826                        = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_NOT_in_identifier4855                           = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_EVAL_in_identifier4884                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_FORALL_in_identifier4913                        = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_WHEN_in_identifier4951                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_THEN_in_identifier4983                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_END_in_identifier5012                           = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_function_import_statement_in_synpred4114        = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_import_statement_in_synpred5120                 = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_paren_chunk_in_synpred381788                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred411888                     = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_set_in_synpred442197                            = new BitSet( new long[]{0x0000000200000000L} );
+    public static final BitSet FOLLOW_fact_in_synpred442214                           = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_ACCUMULATE_in_synpred723458                     = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_COLLECT_in_synpred733487                        = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_set_in_synpred743517                            = new BitSet( new long[]{0x0000000000000002L} );
 
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -71,22 +71,22 @@
 
     public void visitAttributeDescr(final AttributeDescr attributeDescr) {
         this.template = new String();
-        String name = attributeDescr.getName();
+        final String name = attributeDescr.getName();
         String value = null;
         if ( name.equals( "agenda-group" ) || name.equals( "activation-group" ) || name.equals( "ruleflow-group" ) ) {
             // These attributes may need quotes around them, if they have spaces, so add anyway
-            value =  "\"" + attributeDescr.getValue() + "\"";
+            value = "\"" + attributeDescr.getValue() + "\"";
         } else {
             value = attributeDescr.getValue();
         }
         this.template = "\t " + name + " " + value + DrlDumper.eol;
     }
-    
+
     public void visitFieldConstraintDescr(final FieldConstraintDescr descr) {
         if ( !descr.getRestrictions().isEmpty() ) {
             this.template = descr.getFieldName() + " " + processFieldConstraint( descr.getRestrictions() );
-        } 
-    }    
+        }
+    }
 
     public void visitVariableRestrictionDescr(final VariableRestrictionDescr descr) {
         this.template = new String();
@@ -144,7 +144,7 @@
     public void visitLiteralRestrictionDescr(final LiteralRestrictionDescr descr) {
         this.template = new String();
         String text = descr.getText();
-        if( text == null ) {
+        if ( text == null ) {
             text = "null";
         } else {
             try {
@@ -155,7 +155,7 @@
         }
         this.template = descr.getEvaluator() + " " + text;
     }
-    
+
     public void visitRestrictionConnectiveDescr(final RestrictionConnectiveDescr descr) {
         if ( descr.getConnective() == RestrictionConnectiveDescr.OR ) {
             this.template = " | ";
@@ -274,32 +274,31 @@
 
             final Object temp = iterator.next();
             visit( temp );
-                        
+
             if ( previous == null ) {
                 descrString += this.template;
-            } else if ( previous instanceof FieldBindingDescr && !(temp instanceof FieldBindingDescr) && !(temp instanceof PredicateDescr)) {
-                FieldConstraintDescr tempDescr = (FieldConstraintDescr) temp;
-                FieldBindingDescr previousDescr = (FieldBindingDescr) previous;
+            } else if ( previous instanceof FieldBindingDescr && !(temp instanceof FieldBindingDescr) && !(temp instanceof PredicateDescr) ) {
+                final FieldConstraintDescr tempDescr = (FieldConstraintDescr) temp;
+                final FieldBindingDescr previousDescr = (FieldBindingDescr) previous;
                 if ( tempDescr.getFieldName().equals( previousDescr.getFieldName() ) ) {
                     // as its a binding followed by a field constraint we need to remove 
                     // the extra field name                    
                     descrString += this.template.substring( tempDescr.getFieldName().length() + 1 );
                 } else {
-                  descrString +=  " , " + this.template;               
+                    descrString += " , " + this.template;
                 }
             } else {
-                descrString +=  " , " + this.template;                
+                descrString += " , " + this.template;
             }
 
             previous = temp;
-            
-            
+
         }
         return descrString.substring( 0,
                                       descrString.length() );
     }
 
-    private String processFieldConstraint(List list)  {
+    private String processFieldConstraint(final List list) {
         String descrString = "";
         for ( final Iterator it = list.iterator(); it.hasNext(); ) {
             final Object temp = it.next();
@@ -307,8 +306,8 @@
             descrString += this.template;
         }
         return descrString;
-    }    
-    
+    }
+
     private String processDescrList(final List descr) {
         String descrString = "";
         for ( final Iterator it = descr.iterator(); it.hasNext(); ) {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/Expander.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/Expander.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/Expander.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -53,7 +53,7 @@
      * @param drl the source code to be pre-processed
      * @return source code after running pre-processors
      */
-    public String expand( Reader drl ) throws IOException;
+    public String expand(Reader drl) throws IOException;
 
     /**
      * Expands (process) the expression Just-In-Time for the parser.
@@ -64,20 +64,20 @@
      * @param source the source code to be expanded
      * @return source code after running pre-processors
      */
-    public String expand( String source );
+    public String expand(String source);
 
     /**
      * Add the new mapping to this expander.
      * @param mapping
      */
     public void addDSLMapping(DSLMapping mapping);
-    
+
     /**
      * Returns the list of errors from the last expansion made
      * @return
      */
     public List getErrors();
-    
+
     /**
      * Returns true in case the last expansion had any errors
      * @return

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/ExpanderException.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/ExpanderException.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/ExpanderException.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -24,10 +24,10 @@
      * 
      */
     private static final long serialVersionUID = 4842957918475578512L;
-    
-    private String message;
-    private int line;
 
+    private String            message;
+    private int               line;
+
     public ExpanderException(final String message,
                              final int line) {
         this.message = message;
@@ -35,7 +35,7 @@
     }
 
     public String getMessage() {
-        return "["+line+"] "+message;
+        return "[" + this.line + "] " + this.message;
     }
-    
+
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/GeneralParseException.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/GeneralParseException.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/GeneralParseException.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -24,7 +24,7 @@
      * 
      */
     private static final long serialVersionUID = -1743929851876940150L;
-    private String message;
+    private String            message;
 
     public GeneralParseException(final String message,
                                  final int line) {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AccessorDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AccessorDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AccessorDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -4,48 +4,48 @@
 import java.util.Iterator;
 import java.util.List;
 
-public class AccessorDescr extends DeclarativeInvokerDescr { 
+public class AccessorDescr extends DeclarativeInvokerDescr {
 
     private static final long serialVersionUID = -8501718084759205602L;
 
-    private String variableName;
-    private List invokers;
-    
+    private String            variableName;
+    private List              invokers;
+
     public AccessorDescr() {
         this( null );
     }
-    
-    public AccessorDescr(String rootVariableName) {
+
+    public AccessorDescr(final String rootVariableName) {
         super();
         this.variableName = rootVariableName;
         this.invokers = new ArrayList();
     }
-    
+
     public DeclarativeInvokerDescr[] getInvokersAsArray() {
         return (DeclarativeInvokerDescr[]) this.invokers.toArray( new DeclarativeInvokerDescr[0] );
     }
-    
+
     public List getInvokers() {
         return this.invokers;
     }
-    
-    public void addInvoker(DeclarativeInvokerDescr accessor) {
+
+    public void addInvoker(final DeclarativeInvokerDescr accessor) {
         this.invokers.add( accessor );
     }
-    
+
     public String getVariableName() {
         return this.variableName;
     }
-    
-    public void setVariableName(String methodName) {
+
+    public void setVariableName(final String methodName) {
         this.variableName = methodName;
     }
-    
+
     public String toString() {
-        StringBuffer buf = new StringBuffer();
-        buf.append( ( this.variableName != null ) ? this.variableName : "" );
-        for( Iterator it = this.invokers.iterator(); it.hasNext(); ) {
-            if( buf.length() > 0 ) {
+        final StringBuffer buf = new StringBuffer();
+        buf.append( (this.variableName != null) ? this.variableName : "" );
+        for ( final Iterator it = this.invokers.iterator(); it.hasNext(); ) {
+            if ( buf.length() > 0 ) {
                 buf.append( "." );
             }
             buf.append( it.next().toString() );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AccumulateDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AccumulateDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AccumulateDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -22,8 +22,9 @@
 /**
  * A descr class for accumulate node
  */
-public class AccumulateDescr extends BaseDescr 
-    implements ConditionalElementDescr {
+public class AccumulateDescr extends BaseDescr
+    implements
+    ConditionalElementDescr {
 
     private static final long serialVersionUID = 2831283873824863255L;
 
@@ -40,70 +41,70 @@
     }
 
     public int getLine() {
-        return sourceColumn.getLine();
+        return this.sourceColumn.getLine();
     }
 
-    public void setSourceColumn(ColumnDescr sourceColumn) {
+    public void setSourceColumn(final ColumnDescr sourceColumn) {
         this.sourceColumn = sourceColumn;
     }
 
     public ColumnDescr getSourceColumn() {
-        return sourceColumn;
+        return this.sourceColumn;
     }
 
     public String getClassMethodName() {
-        return classMethodName;
+        return this.classMethodName;
     }
 
-    public void setClassMethodName(String classMethodName) {
+    public void setClassMethodName(final String classMethodName) {
         this.classMethodName = classMethodName;
     }
 
     public String[] getDeclarations() {
-        return declarations;
+        return this.declarations;
     }
 
-    public void setDeclarations(String[] declarations) {
+    public void setDeclarations(final String[] declarations) {
         this.declarations = declarations;
     }
 
     public String getActionCode() {
-        return actionCode;
+        return this.actionCode;
     }
 
-    public void setActionCode(String actionCode) {
+    public void setActionCode(final String actionCode) {
         this.actionCode = actionCode;
     }
 
     public String getInitCode() {
-        return initCode;
+        return this.initCode;
     }
 
-    public void setInitCode(String initCode) {
+    public void setInitCode(final String initCode) {
         this.initCode = initCode;
     }
 
     public String getResultCode() {
-        return resultCode;
+        return this.resultCode;
     }
 
-    public void setResultCode(String resultCode) {
+    public void setResultCode(final String resultCode) {
         this.resultCode = resultCode;
     }
-    
-    public void setResultColumn(ColumnDescr resultColumn) {
+
+    public void setResultColumn(final ColumnDescr resultColumn) {
         this.resultColumn = resultColumn;
     }
-    
+
     public ColumnDescr getResultColumn() {
         return this.resultColumn;
     }
 
     public String toString() {
-        return "[Accumulate: id=" + resultColumn.getIdentifier() + "; objectType=" + resultColumn.getObjectType() + "]";
+        return "[Accumulate: id=" + this.resultColumn.getIdentifier() + "; objectType=" + this.resultColumn.getObjectType() + "]";
     }
 
-    public void addDescr(BaseDescr patternDescr) {
+    public void addDescr(final BaseDescr patternDescr) {
         // Nothing to do
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -27,7 +27,7 @@
      * 
      */
     private static final long serialVersionUID = 8225023304408452585L;
-    private List descrs       = Collections.EMPTY_LIST;
+    private List              descrs           = Collections.EMPTY_LIST;
 
     public AndDescr() {
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AttributeDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AttributeDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AttributeDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -21,8 +21,8 @@
      * 
      */
     private static final long serialVersionUID = -2746045674173812015L;
-    private String name;
-    private String value;
+    private String            name;
+    private String            value;
 
     public AttributeDescr(final String name,
                           final String value) {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/BaseDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/BaseDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/BaseDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -26,21 +26,21 @@
     Serializable {
 
     private static final long serialVersionUID = 320;
-    private int               startCharacter = -1;
-    private int               endCharacter = -1;
-    private int               line = -1;
-    private int               column = -1;
-    private int               endLine = -1;
-    private int               endColumn = -1;
+    private int               startCharacter   = -1;
+    private int               endCharacter     = -1;
+    private int               line             = -1;
+    private int               column           = -1;
+    private int               endLine          = -1;
+    private int               endColumn        = -1;
 
-    public void setLocation(int line,
-                            int column) {
+    public void setLocation(final int line,
+                            final int column) {
         this.line = line;
         this.column = column;
     }
 
-    public void setEndLocation(int line,
-                               int column) {
+    public void setEndLocation(final int line,
+                               final int column) {
         this.endLine = line;
         this.endColumn = column;
     }
@@ -65,13 +65,13 @@
      * @return the endCharacter
      */
     public int getEndCharacter() {
-        return endCharacter;
+        return this.endCharacter;
     }
 
     /**
      * @param endCharacter the endCharacter to set
      */
-    public void setEndCharacter(int endCharacter) {
+    public void setEndCharacter(final int endCharacter) {
         this.endCharacter = endCharacter;
     }
 
@@ -79,13 +79,13 @@
      * @return the startCharacter
      */
     public int getStartCharacter() {
-        return startCharacter;
+        return this.startCharacter;
     }
 
     /**
      * @param startCharacter the startCharacter to set
      */
-    public void setStartCharacter(int startCharacter) {
+    public void setStartCharacter(final int startCharacter) {
         this.startCharacter = startCharacter;
     }
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/CollectDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/CollectDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/CollectDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -30,7 +30,7 @@
     ConditionalElementDescr {
 
     private static final long serialVersionUID = -78056848363435347L;
-    
+
     private ColumnDescr       sourceColumn;
     private ColumnDescr       resultColumn;
     private String            classMethodName;
@@ -40,38 +40,38 @@
     }
 
     public int getLine() {
-        return sourceColumn.getLine();
+        return this.sourceColumn.getLine();
     }
 
-    public void setSourceColumn(ColumnDescr sourceColumn) {
+    public void setSourceColumn(final ColumnDescr sourceColumn) {
         this.sourceColumn = sourceColumn;
     }
 
     public ColumnDescr getSourceColumn() {
-        return sourceColumn;
+        return this.sourceColumn;
     }
 
     public String getClassMethodName() {
-        return classMethodName;
+        return this.classMethodName;
     }
 
-    public void setClassMethodName(String classMethodName) {
+    public void setClassMethodName(final String classMethodName) {
         this.classMethodName = classMethodName;
     }
 
-    public void setResultColumn(ColumnDescr resultColumn) {
+    public void setResultColumn(final ColumnDescr resultColumn) {
         this.resultColumn = resultColumn;
     }
-    
+
     public ColumnDescr getResultColumn() {
         return this.resultColumn;
     }
 
     public String toString() {
-        return "[Collect: id=" + resultColumn.getIdentifier() + "; objectType=" + resultColumn.getObjectType() + "]";
+        return "[Collect: id=" + this.resultColumn.getIdentifier() + "; objectType=" + this.resultColumn.getObjectType() + "]";
     }
 
-    public void addDescr(BaseDescr patternDescr) {
+    public void addDescr(final BaseDescr patternDescr) {
         // Nothing to do
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ColumnDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ColumnDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ColumnDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -24,17 +24,18 @@
     /**
      * 
      */
-    private static final long serialVersionUID = 63959215220308107L;
-    private String objectType;
-    private String identifier;
-    private List   descrs = Collections.EMPTY_LIST;
-    private int    leftParentCharacter = -1;
-    private int    rightParentCharacter = -1;
+    private static final long serialVersionUID     = 63959215220308107L;
+    private String            objectType;
+    private String            identifier;
+    private List              descrs               = Collections.EMPTY_LIST;
+    private int               leftParentCharacter  = -1;
+    private int               rightParentCharacter = -1;
 
     public ColumnDescr() {
-        this(null, null);
+        this( null,
+              null );
     }
-    
+
     public ColumnDescr(final String objectType) {
         this( objectType,
               null );
@@ -58,9 +59,9 @@
     }
 
     public void setObjectType(final String objectType) {
-        this.objectType = objectType;    
+        this.objectType = objectType;
     }
-    
+
     public String getObjectType() {
         return this.objectType;
     }
@@ -81,13 +82,13 @@
      * @return the leftParentCharacter
      */
     public int getLeftParentCharacter() {
-        return leftParentCharacter;
+        return this.leftParentCharacter;
     }
 
     /**
      * @param leftParentCharacter the leftParentCharacter to set
      */
-    public void setLeftParentCharacter(int leftParentCharacter) {
+    public void setLeftParentCharacter(final int leftParentCharacter) {
         this.leftParentCharacter = leftParentCharacter;
     }
 
@@ -95,13 +96,13 @@
      * @return the rightParentCharacter
      */
     public int getRightParentCharacter() {
-        return rightParentCharacter;
+        return this.rightParentCharacter;
     }
 
     /**
      * @param rightParentCharacter the rightParentCharacter to set
      */
-    public void setRightParentCharacter(int rightParentCharacter) {
+    public void setRightParentCharacter(final int rightParentCharacter) {
         this.rightParentCharacter = rightParentCharacter;
     }
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/DeclarativeInvokerDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/DeclarativeInvokerDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/DeclarativeInvokerDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -4,5 +4,5 @@
  * This is the parent class function/method calls.
  */
 public class DeclarativeInvokerDescr extends BaseDescr {
-	
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -9,11 +9,11 @@
  *
  */
 public class DescrFactory {
-    
-    public PackageDescr createPackage( String packageName ) {
+
+    public PackageDescr createPackage(final String packageName) {
         return new PackageDescr( packageName );
     }
-    
+
     public GlobalDescr createGlobal() {
         return new GlobalDescr();
     }
@@ -25,35 +25,38 @@
     public AccumulateDescr createAccumulate() {
         return new AccumulateDescr();
     }
-    
+
     public CollectDescr createCollect() {
         return new CollectDescr();
     }
-    
+
     public ForallDescr createForall() {
         return new ForallDescr();
     }
-    
-    public ImportDescr createImport()  {
+
+    public ImportDescr createImport() {
         return new ImportDescr();
     }
-    
-    public FunctionImportDescr createFunctionImport()  {
+
+    public FunctionImportDescr createFunctionImport() {
         return new FunctionImportDescr();
     }
-    
-    public QueryDescr createQuery(String queryName) {
-        return new QueryDescr(queryName, "");
+
+    public QueryDescr createQuery(final String queryName) {
+        return new QueryDescr( queryName,
+                               "" );
     }
-    
-    public FunctionDescr createFunction(String functionName, String returnType) {
-        return new FunctionDescr( functionName, returnType );
+
+    public FunctionDescr createFunction(final String functionName,
+                                        final String returnType) {
+        return new FunctionDescr( functionName,
+                                  returnType );
     }
-    
-    public FactTemplateDescr createFactTemplate(String templateName) {
+
+    public FactTemplateDescr createFactTemplate(final String templateName) {
         return new FactTemplateDescr( templateName );
     }
-    
+
     public FieldTemplateDescr createFieldTemplate() {
         return new FieldTemplateDescr();
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/EvalDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/EvalDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/EvalDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -27,11 +27,11 @@
      */
     private static final long serialVersionUID = 325264120108029570L;
 
-    private Object   content;
+    private Object            content;
 
-    private String[] declarations;
+    private String[]          declarations;
 
-    private String   classMethodName;
+    private String            classMethodName;
 
     public EvalDescr() {
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ExistsDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ExistsDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ExistsDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -27,7 +27,7 @@
      * 
      */
     private static final long serialVersionUID = -1617901384156245788L;
-    private final List descrs = new ArrayList( 1 );
+    private final List        descrs           = new ArrayList( 1 );
 
     public ExistsDescr() {
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FactTemplateDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FactTemplateDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FactTemplateDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -5,15 +5,15 @@
 
 public class FactTemplateDescr extends BaseDescr {
     private static final long serialVersionUID = 320;
-    
-    String name;
-    List fields = new ArrayList( 1 );
-    
-    public FactTemplateDescr(String name) {
+
+    String                    name;
+    List                      fields           = new ArrayList( 1 );
+
+    public FactTemplateDescr(final String name) {
         this.name = name;
     }
-    
-    public void addFieldTemplate(FieldTemplateDescr fieldTemplate) {
+
+    public void addFieldTemplate(final FieldTemplateDescr fieldTemplate) {
         this.fields.add( fieldTemplate );
     }
 
@@ -24,6 +24,5 @@
     public String getName() {
         return this.name;
     }
-    
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldAccessDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldAccessDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldAccessDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -11,37 +11,38 @@
 public class FieldAccessDescr extends DeclarativeInvokerDescr {
 
     private static final long serialVersionUID = 3262446325341307441L;
-    
-    private String fieldName;
-    private String argument;
 
-    public FieldAccessDescr(String fieldName) {
-        this.fieldName = fieldName;     
+    private String            fieldName;
+    private String            argument;
+
+    public FieldAccessDescr(final String fieldName) {
+        this.fieldName = fieldName;
     }
 
-    public FieldAccessDescr(String fieldName, String argument) {
-        this.fieldName = fieldName;     
+    public FieldAccessDescr(final String fieldName,
+                            final String argument) {
+        this.fieldName = fieldName;
         this.argument = argument;
-    }    
-    
-	public String getFieldName() {
-		return fieldName;
-	}
+    }
 
-	public void setFieldName(String fieldName) {
-		this.fieldName = fieldName;
-	}
+    public String getFieldName() {
+        return this.fieldName;
+    }
 
+    public void setFieldName(final String fieldName) {
+        this.fieldName = fieldName;
+    }
+
     public String getArgument() {
         return this.argument;
     }
 
-    public void setArgument(String argument) {
+    public void setArgument(final String argument) {
         this.argument = argument;
     }
-    
+
     public String toString() {
-        return fieldName + ( (this.argument!=null) ? this.argument: "" );
+        return this.fieldName + ((this.argument != null) ? this.argument : "");
     }
-	
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldBindingDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldBindingDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldBindingDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -21,24 +21,25 @@
      * 
      */
     private static final long serialVersionUID = 1996404511986883239L;
-    private String fieldName;
-    private String identifier;
+    private String            fieldName;
+    private String            identifier;
 
     public FieldBindingDescr() {
-        this(null, null);
+        this( null,
+              null );
     }
-    
+
     public FieldBindingDescr(final String fieldName,
                              final String identifier) {
         this.fieldName = fieldName;
         this.identifier = identifier;
     }
-    
-    public void setFieldName(String fieldName) {
+
+    public void setFieldName(final String fieldName) {
         this.fieldName = fieldName;
     }
-    
-    public void setIdentifier(String identifier) {
+
+    public void setIdentifier(final String identifier) {
         this.identifier = identifier;
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldConstraintDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldConstraintDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldConstraintDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -27,38 +27,37 @@
  */
 public class FieldConstraintDescr extends BaseDescr {
 
-	private static final long serialVersionUID = 320;
-    private String  fieldName;
-    private List    restrictions = Collections.EMPTY_LIST;
+    private static final long serialVersionUID = 320;
+    private String            fieldName;
+    private List              restrictions     = Collections.EMPTY_LIST;
 
     public FieldConstraintDescr(final String fieldName) {
-        this.fieldName = fieldName;        
+        this.fieldName = fieldName;
     }
 
     public String getFieldName() {
         return this.fieldName;
     }
-    
-    public void addRestriction(RestrictionDescr restriction) {
+
+    public void addRestriction(final RestrictionDescr restriction) {
         if ( this.restrictions == Collections.EMPTY_LIST ) {
             this.restrictions = new ArrayList();
         }
         this.restrictions.add( restriction );
     }
-    
+
     public List getRestrictions() {
         return this.restrictions;
     }
-    
-/*    public boolean isBound(String identifier) {
-        for ( Iterator it = this.restrictions.iterator(); it.hasNext(); ) {
-            Object object = it.next();
-            if ( object instanceof FieldBindingDescr ) {
-                FieldBindingDescr descr = 
-            }
-        }
-        return false;
-    }*/
 
-    
+    /*    public boolean isBound(String identifier) {
+     for ( Iterator it = this.restrictions.iterator(); it.hasNext(); ) {
+     Object object = it.next();
+     if ( object instanceof FieldBindingDescr ) {
+     FieldBindingDescr descr = 
+     }
+     }
+     return false;
+     }*/
+
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldTemplateDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldTemplateDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FieldTemplateDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -3,22 +3,25 @@
 public class FieldTemplateDescr extends BaseDescr {
 
     private static final long serialVersionUID = -5702332394753109979L;
-    private String      name;
-    private String      classType;
-    
+    private String            name;
+    private String            classType;
+
     public FieldTemplateDescr() {
-        this(null, null);
+        this( null,
+              null );
     }
-    
+
     public FieldTemplateDescr(final String name,
                               final String type) {
         super();
         this.name = name;
         this.classType = type;
     }
+
     public String getName() {
         return this.name;
     }
+
     public String getClassType() {
         return this.classType;
     }
@@ -26,16 +29,15 @@
     /**
      * @param classType the classType to set
      */
-    public void setClassType(String classType) {
+    public void setClassType(final String classType) {
         this.classType = classType;
     }
 
     /**
      * @param name the name to set
      */
-    public void setName(String name) {
+    public void setName(final String name) {
         this.name = name;
     }
-    
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ForallDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ForallDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ForallDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -39,9 +39,9 @@
     /* (non-Javadoc)
      * @see org.drools.lang.descr.ConditionalElementDescr#addDescr(org.drools.lang.descr.BaseDescr)
      */
-    public void addDescr(BaseDescr baseDescr) {
+    public void addDescr(final BaseDescr baseDescr) {
         // cast to make sure we are adding a column descriptor
-        this.columns.add( (ColumnDescr) baseDescr );
+        this.columns.add( baseDescr );
     }
 
     /* (non-Javadoc)

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FromDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FromDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FromDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -5,38 +5,40 @@
 
 public class FromDescr extends BaseDescr
     implements
-    ConditionalElementDescr { 
-	private ColumnDescr column;
-	private DeclarativeInvokerDescr dataSource;
-	
-	FromDescr() {
-		//protected so only factory can create
-	}
-	
-	public int getLine() {
-		return column.getLine();
-	}
-	public void setColumn(ColumnDescr column) {
-		this.column = column;
-	}
-	public DeclarativeInvokerDescr getDataSource() {
-		return dataSource;
-	}
-	public void setDataSource(DeclarativeInvokerDescr dataSource) {
-		this.dataSource = dataSource;
-	}
-	
-	public ColumnDescr getReturnedColumn() {
-		return column;
-	}
+    ConditionalElementDescr {
+    private ColumnDescr             column;
+    private DeclarativeInvokerDescr dataSource;
 
-    public void addDescr(BaseDescr baseDescr) {
+    FromDescr() {
+        //protected so only factory can create
+    }
+
+    public int getLine() {
+        return this.column.getLine();
+    }
+
+    public void setColumn(final ColumnDescr column) {
+        this.column = column;
+    }
+
+    public DeclarativeInvokerDescr getDataSource() {
+        return this.dataSource;
+    }
+
+    public void setDataSource(final DeclarativeInvokerDescr dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    public ColumnDescr getReturnedColumn() {
+        return this.column;
+    }
+
+    public void addDescr(final BaseDescr baseDescr) {
         //
     }
 
     public List getDescrs() {
         return Collections.EMPTY_LIST;
     }
-	
-   
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionCallDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionCallDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionCallDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,39 +1,35 @@
 package org.drools.lang.descr;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /** This represents a function call - as in calling a Drools function. 
  * eg: functionName(argument list)
  */
 public class FunctionCallDescr extends DeclarativeInvokerDescr {
 
-	private String name;
-	private String arguments;
+    private String name;
+    private String arguments;
 
-	public FunctionCallDescr(String name) {
-		this.name = name;
-	}
-	
-	public String getArguments() {
-		return arguments;
-	}
+    public FunctionCallDescr(final String name) {
+        this.name = name;
+    }
 
-	public void setArguments(String arguments) {
-		this.arguments = arguments;
-	}
+    public String getArguments() {
+        return this.arguments;
+    }
 
-	public String getName() {
-		return name;
-	}
+    public void setArguments(final String arguments) {
+        this.arguments = arguments;
+    }
 
-	public void setName(String name) {
-		this.name = name;
-	}
-	
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
     public String toString() {
-        return this.name+this.arguments;
+        return this.name + this.arguments;
     }
-	
-	
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -22,19 +22,19 @@
 
 public class FunctionDescr extends BaseDescr {
     private static final long serialVersionUID = 320;
-    
-    private final String name;
-    private final String returnType;
-    
-    private List         parameterTypes = Collections.EMPTY_LIST;
-    private List         parameterNames = Collections.EMPTY_LIST;
 
-    private String       text;
-    
-    private int      offset;
+    private final String      name;
+    private final String      returnType;
 
-    private String   className;
+    private List              parameterTypes   = Collections.EMPTY_LIST;
+    private List              parameterNames   = Collections.EMPTY_LIST;
 
+    private String            text;
+
+    private int               offset;
+
+    private String            className;
+
     public FunctionDescr(final String name,
                          final String returnType) {
         this.name = name;
@@ -90,10 +90,8 @@
         return this.offset;
     }
 
-    public void setOffset(int offset) {
+    public void setOffset(final int offset) {
         this.offset = offset;
     }
-    
-    
-    
+
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionImportDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionImportDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/FunctionImportDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -22,14 +22,14 @@
  * @author etirelli
  */
 public class FunctionImportDescr extends ImportDescr {
-    
+
     private static final long serialVersionUID = 3549259347577832528L;
 
     public FunctionImportDescr() {
     }
-    
+
     public String toString() {
-        return "import function "+this.getTarget();
+        return "import function " + this.getTarget();
     }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/GlobalDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/GlobalDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/GlobalDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -24,15 +24,17 @@
 public class GlobalDescr extends BaseDescr {
 
     private static final long serialVersionUID = -7950086393744529044L;
-    
-    private String identifier;
-    private String type;
-    
+
+    private String            identifier;
+    private String            type;
+
     public GlobalDescr() {
-        this( null, null );
+        this( null,
+              null );
     }
-    
-    public GlobalDescr( String identifier, String type ) {
+
+    public GlobalDescr(final String identifier,
+                       final String type) {
         this.identifier = identifier;
         this.type = type;
     }
@@ -41,13 +43,13 @@
      * @return the identifier
      */
     public String getIdentifier() {
-        return identifier;
+        return this.identifier;
     }
 
     /**
      * @param identifier the identifier to set
      */
-    public void setIdentifier(String identifier) {
+    public void setIdentifier(final String identifier) {
         this.identifier = identifier;
     }
 
@@ -55,13 +57,13 @@
      * @return the type
      */
     public String getType() {
-        return type;
+        return this.type;
     }
 
     /**
      * @param type the type to set
      */
-    public void setType(String type) {
+    public void setType(final String type) {
         this.type = type;
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ImportDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ImportDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/ImportDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -23,20 +23,20 @@
 public class ImportDescr extends BaseDescr {
 
     private static final long serialVersionUID = -5578158193651898438L;
-    private String target;
-    
+    private String            target;
+
     public ImportDescr() {
     }
-    
-    public ImportDescr(String clazzName) {
+
+    public ImportDescr(final String clazzName) {
         this.target = clazzName;
     }
-    
+
     public String getTarget() {
         return this.target;
     }
-    
-    public void setTarget(String clazzName) {
+
+    public void setTarget(final String clazzName) {
         this.target = clazzName;
     }
 
@@ -46,7 +46,7 @@
     public int hashCode() {
         final int PRIME = 31;
         int result = 1;
-        result = PRIME * result + ((target == null) ? 0 : target.hashCode());
+        result = PRIME * result + ((this.target == null) ? 0 : this.target.hashCode());
         result = PRIME * result + this.getStartCharacter();
         return result;
     }
@@ -54,19 +54,29 @@
     /* (non-Javadoc)
      * @see java.lang.Object#equals(java.lang.Object)
      */
-    public boolean equals(Object obj) {
-        if ( this == obj ) return true;
-        if ( obj == null ) return false;
-        if ( getClass() != obj.getClass() ) return false;
+    public boolean equals(final Object obj) {
+        if ( this == obj ) {
+            return true;
+        }
+        if ( obj == null ) {
+            return false;
+        }
+        if ( getClass() != obj.getClass() ) {
+            return false;
+        }
         final ImportDescr other = (ImportDescr) obj;
-        if ( target == null ) {
-            if ( other.target != null ) return false;
-        } else if ( !target.equals( other.target ) ) return false;
+        if ( this.target == null ) {
+            if ( other.target != null ) {
+                return false;
+            }
+        } else if ( !this.target.equals( other.target ) ) {
+            return false;
+        }
         return this.getStartCharacter() == other.getStartCharacter();
     }
-    
+
     public String toString() {
-        return "import "+this.target;
+        return "import " + this.target;
     }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/LiteralRestrictionDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/LiteralRestrictionDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/LiteralRestrictionDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -56,7 +56,7 @@
     public String getText() {
         return this.text;
     }
-    
+
     public String toString() {
         return this.evaluator + " " + this.text;
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/MethodAccessDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/MethodAccessDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/MethodAccessDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,6 +1,5 @@
 package org.drools.lang.descr;
 
-
 /**
  * 
  * This represents a method call.
@@ -12,40 +11,38 @@
 public class MethodAccessDescr extends DeclarativeInvokerDescr {
 
     private static final long serialVersionUID = -1855405201484757499L;
-    
-    private String methodName;
-	private String arguments;
-	
-    public MethodAccessDescr( String methodName ) {
+
+    private String            methodName;
+    private String            arguments;
+
+    public MethodAccessDescr(final String methodName) {
         this.methodName = methodName;
     }
 
-    public MethodAccessDescr( String methodName, String arguments ) {
+    public MethodAccessDescr(final String methodName,
+                             final String arguments) {
         this.methodName = methodName;
         this.arguments = arguments;
     }
 
-	public String getArguments() {
-		return arguments;
-	}
+    public String getArguments() {
+        return this.arguments;
+    }
 
-	public void setArguments(String arguments) {
-		this.arguments = arguments;
-	}
+    public void setArguments(final String arguments) {
+        this.arguments = arguments;
+    }
 
-	public String getMethodName() {
-		return methodName;
-	}
+    public String getMethodName() {
+        return this.methodName;
+    }
 
-	public void setMethodName(String methodName) {
-		this.methodName = methodName;
-	}
-    
+    public void setMethodName(final String methodName) {
+        this.methodName = methodName;
+    }
+
     public String toString() {
         return this.methodName + this.arguments;
     }
 
-	
-	
-	
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/NotDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/NotDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/NotDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -27,7 +27,7 @@
      * 
      */
     private static final long serialVersionUID = 4650543951506472407L;
-    private final List descrs = new ArrayList( 1 );
+    private final List        descrs           = new ArrayList( 1 );
 
     public NotDescr() {
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/OrDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/OrDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/OrDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -27,7 +27,7 @@
      * 
      */
     private static final long serialVersionUID = -6499901868693501867L;
-    private List descrs = Collections.EMPTY_LIST;
+    private List              descrs           = Collections.EMPTY_LIST;
 
     public OrDescr() {
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -65,14 +65,14 @@
     public List getImports() {
         return this.imports;
     }
-    
+
     public void addFunctionImport(final FunctionImportDescr importFunction) {
-        if (this.functionImports == Collections.EMPTY_LIST) {
+        if ( this.functionImports == Collections.EMPTY_LIST ) {
             this.functionImports = new ArrayList();
         }
         this.functionImports.add( importFunction );
     }
-        
+
     public List getFunctionImports() {
         return this.functionImports;
     }
@@ -86,7 +86,7 @@
 
     public List getGlobals() {
         return this.globals;
-    }    
+    }
 
     public void addAttribute(final AttributeDescr attribute) {
         if ( this.attributes == Collections.EMPTY_LIST ) {
@@ -98,14 +98,14 @@
     public List getAttributes() {
         return this.attributes;
     }
-    
-    public void addFactTemplate(final FactTemplateDescr  factTemplate) {
+
+    public void addFactTemplate(final FactTemplateDescr factTemplate) {
         if ( this.factTemplates == Collections.EMPTY_LIST ) {
             this.factTemplates = new ArrayList( 1 );
         }
         this.factTemplates.add( factTemplate );
     }
-    
+
     public List getFactTemplates() {
         return this.factTemplates;
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -22,36 +22,36 @@
      */
     private static final long serialVersionUID = 320;
     //private final String fieldName;
-    private Object       content;
+    private Object            content;
 
     //private final String declaration;
-    private String[]     declarations;
+    private String[]          declarations;
 
-    private String       classMethodName;
+    private String            classMethodName;
 
-//    public PredicateDescr(final String fieldName,
-//                          final String declaration) {
-//        this.fieldName = fieldName;
-//        this.declaration = declaration;
-//    }
-//
-//    public PredicateDescr(final String fieldName,
-//                          final String declaration,
-//                          final String text) {
-//        this.fieldName = fieldName;
-//        this.declaration = declaration;
-//        this.text = text;
-//    }
-    public PredicateDescr( final Object text ) {
+    //    public PredicateDescr(final String fieldName,
+    //                          final String declaration) {
+    //        this.fieldName = fieldName;
+    //        this.declaration = declaration;
+    //    }
+    //
+    //    public PredicateDescr(final String fieldName,
+    //                          final String declaration,
+    //                          final String text) {
+    //        this.fieldName = fieldName;
+    //        this.declaration = declaration;
+    //        this.text = text;
+    //    }
+    public PredicateDescr(final Object text) {
         this.content = text;
     }
 
-    public PredicateDescr( ) {
+    public PredicateDescr() {
     }
 
-//    public String getFieldName() {
-//        return this.fieldName;
-//    }
+    //    public String getFieldName() {
+    //        return this.fieldName;
+    //    }
 
     public String getClassMethodName() {
         return this.classMethodName;
@@ -69,9 +69,9 @@
         this.content = text;
     }
 
-//    public String getDeclaration() {
-//        return this.declaration;
-//    }
+    //    public String getDeclaration() {
+    //        return this.declaration;
+    //    }
 
     public void setDeclarations(final String[] declarations) {
         this.declarations = declarations;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/Restriction.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/Restriction.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/Restriction.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 public class Restriction extends BaseDescr {
- 
+
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RestrictionConnectiveDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RestrictionConnectiveDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RestrictionConnectiveDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -6,15 +6,15 @@
  * 	age < 40 & > 30 
  *
  */
-public class RestrictionConnectiveDescr extends RestrictionDescr {    
+public class RestrictionConnectiveDescr extends RestrictionDescr {
 
     private static final long serialVersionUID = 320;
-    public final static int AND = 0;
-    public final static int OR = 1;
-    
-    private int connective;
+    public final static int   AND              = 0;
+    public final static int   OR               = 1;
 
-    public RestrictionConnectiveDescr(int connective) {
+    private int               connective;
+
+    public RestrictionConnectiveDescr(final int connective) {
         super();
         this.connective = connective;
     }
@@ -22,5 +22,5 @@
     public int getConnective() {
         return this.connective;
     }
-            
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -25,17 +25,17 @@
      * 
      */
     private static final long serialVersionUID = 320L;
-    private String   name;
-    private String   documentation;
+    private String            name;
+    private String            documentation;
 
-    private AndDescr lhs;
-    private Object   consequence;
-    private int      consequenceLine;
-    private int      consequenceColumn;
-    private int      offset;
-    private List     attributes = Collections.EMPTY_LIST;
+    private AndDescr          lhs;
+    private Object            consequence;
+    private int               consequenceLine;
+    private int               consequenceColumn;
+    private int               offset;
+    private List              attributes       = Collections.EMPTY_LIST;
 
-    private String   className;
+    private String            className;
 
     public RuleDescr(final String name) {
         this( name,

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapping.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapping.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapping.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -32,24 +32,24 @@
      * @return
      */
     public String getIdentifier();
-    
+
     /**
      * Sets the identifier for this mapping
      * @param identifier
      */
-    public void setIdentifier( String identifier );
-    
+    public void setIdentifier(String identifier);
+
     /**
      * Returns a String description of this mapping
      * @return
      */
     public String getDescription();
-    
+
     /**
      * Sets the description for this mapping
      * @param description
      */
-    public void setDescription( String description );
+    public void setDescription(String description);
 
     /**
      * Returns the list of entries in this mapping

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMappingEntry.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMappingEntry.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMappingEntry.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -27,11 +27,11 @@
  */
 public interface DSLMappingEntry {
 
-    public static final Section KEYWORD     = new KeywordSection();
-    public static final Section CONDITION   = new ConditionSection();
-    public static final Section CONSEQUENCE = new ConsequenceSection();
-    public static final Section ANY         = new AnySection();
-    public static final MetaData EMPTY_METADATA = new DefaultDSLEntryMetaData("");
+    public static final Section  KEYWORD        = new KeywordSection();
+    public static final Section  CONDITION      = new ConditionSection();
+    public static final Section  CONSEQUENCE    = new ConsequenceSection();
+    public static final Section  ANY            = new AnySection();
+    public static final MetaData EMPTY_METADATA = new DefaultDSLEntryMetaData( "" );
 
     /**
      * Returns the section this mapping entry refers to
@@ -99,7 +99,7 @@
      * @param metadata the metadata to set
      */
     public void setMetaData(MetaData metadata);
-    
+
     /**
      * Returns a list of errors found in this mapping
      * @return
@@ -161,18 +161,28 @@
             return result;
         }
 
-        public boolean equals(Object obj) {
-            if ( this == obj ) return true;
-            if ( obj == null ) return false;
-            if ( getClass() != obj.getClass() ) return false;
+        public boolean equals(final Object obj) {
+            if ( this == obj ) {
+                return true;
+            }
+            if ( obj == null ) {
+                return false;
+            }
+            if ( getClass() != obj.getClass() ) {
+                return false;
+            }
             final KeywordSection other = (KeywordSection) obj;
             if ( symbol == null ) {
-                if ( other.getSymbol() != null ) return false;
-            } else if ( !symbol.equals( other.getSymbol() ) ) return false;
+                if ( other.getSymbol() != null ) {
+                    return false;
+                }
+            } else if ( !symbol.equals( other.getSymbol() ) ) {
+                return false;
+            }
             return true;
         }
 
-        public int compareTo(Object arg0) {
+        public int compareTo(final Object arg0) {
             return this.toString().compareTo( arg0.toString() );
         }
     }
@@ -185,7 +195,7 @@
     public static class ConditionSection
         implements
         Section {
-        private static String symbol = "[condition]";
+        private static final String symbol = "[condition]";
 
         private ConditionSection() {
         }
@@ -205,18 +215,28 @@
             return result;
         }
 
-        public boolean equals(Object obj) {
-            if ( this == obj ) return true;
-            if ( obj == null ) return false;
-            if ( getClass() != obj.getClass() ) return false;
+        public boolean equals(final Object obj) {
+            if ( this == obj ) {
+                return true;
+            }
+            if ( obj == null ) {
+                return false;
+            }
+            if ( getClass() != obj.getClass() ) {
+                return false;
+            }
             final KeywordSection other = (KeywordSection) obj;
             if ( symbol == null ) {
-                if ( other.getSymbol() != null ) return false;
-            } else if ( !symbol.equals( other.getSymbol() ) ) return false;
+                if ( other.getSymbol() != null ) {
+                    return false;
+                }
+            } else if ( !symbol.equals( other.getSymbol() ) ) {
+                return false;
+            }
             return true;
         }
 
-        public int compareTo(Object arg0) {
+        public int compareTo(final Object arg0) {
             return this.toString().compareTo( arg0.toString() );
         }
     }
@@ -230,7 +250,7 @@
     public static class ConsequenceSection
         implements
         Section {
-        private static String symbol = "[consequence]";
+        private static final String symbol = "[consequence]";
 
         private ConsequenceSection() {
         }
@@ -250,18 +270,28 @@
             return result;
         }
 
-        public boolean equals(Object obj) {
-            if ( this == obj ) return true;
-            if ( obj == null ) return false;
-            if ( getClass() != obj.getClass() ) return false;
+        public boolean equals(final Object obj) {
+            if ( this == obj ) {
+                return true;
+            }
+            if ( obj == null ) {
+                return false;
+            }
+            if ( getClass() != obj.getClass() ) {
+                return false;
+            }
             final KeywordSection other = (KeywordSection) obj;
             if ( symbol == null ) {
-                if ( other.getSymbol() != null ) return false;
-            } else if ( !symbol.equals( other.getSymbol() ) ) return false;
+                if ( other.getSymbol() != null ) {
+                    return false;
+                }
+            } else if ( !symbol.equals( other.getSymbol() ) ) {
+                return false;
+            }
             return true;
         }
 
-        public int compareTo(Object arg0) {
+        public int compareTo(final Object arg0) {
             return this.toString().compareTo( arg0.toString() );
         }
     }
@@ -275,7 +305,7 @@
     public static class AnySection
         implements
         Section {
-        private static String symbol = "*";
+        private static final String symbol = "*";
 
         private AnySection() {
         }
@@ -295,18 +325,28 @@
             return result;
         }
 
-        public boolean equals(Object obj) {
-            if ( this == obj ) return true;
-            if ( obj == null ) return false;
-            if ( getClass() != obj.getClass() ) return false;
+        public boolean equals(final Object obj) {
+            if ( this == obj ) {
+                return true;
+            }
+            if ( obj == null ) {
+                return false;
+            }
+            if ( getClass() != obj.getClass() ) {
+                return false;
+            }
             final KeywordSection other = (KeywordSection) obj;
             if ( symbol == null ) {
-                if ( other.getSymbol() != null ) return false;
-            } else if ( !symbol.equals( other.getSymbol() ) ) return false;
+                if ( other.getSymbol() != null ) {
+                    return false;
+                }
+            } else if ( !symbol.equals( other.getSymbol() ) ) {
+                return false;
+            }
             return true;
         }
 
-        public int compareTo(Object arg0) {
+        public int compareTo(final Object arg0) {
             return this.toString().compareTo( arg0.toString() );
         }
     }
@@ -317,7 +357,7 @@
 
         private String metadata;
 
-        public DefaultDSLEntryMetaData(String metadata) {
+        public DefaultDSLEntryMetaData(final String metadata) {
             this.metadata = metadata;
         }
 
@@ -329,7 +369,7 @@
             return (this.metadata == null) ? "" : this.metadata;
         }
 
-        public int compareTo(Object arg0) {
+        public int compareTo(final Object arg0) {
             return this.toString().compareTo( arg0.toString() );
         }
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMappingFile.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMappingFile.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMappingFile.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -48,7 +48,7 @@
     private List                 errors;
 
     public DSLMappingFile() {
-        this.mapping = new DefaultDSLMapping( );
+        this.mapping = new DefaultDSLMapping();
         this.errors = Collections.EMPTY_LIST;
     }
 
@@ -64,7 +64,7 @@
      * Sets the 
      * @param mapping
      */
-    public void setMapping( DSLMapping mapping ) {
+    public void setMapping(final DSLMapping mapping) {
         this.mapping = mapping;
     }
 
@@ -83,20 +83,20 @@
      * @return true in case no error was found parsing the file. false 
      *         otherwise. Use getErrors() to check for the actual errors.
      */
-    public boolean parseAndLoad( Reader dsl ) throws IOException {
+    public boolean parseAndLoad(final Reader dsl) throws IOException {
         String line = null;
         int linecounter = 0;
-        BufferedReader dslFileReader = new BufferedReader( dsl );
+        final BufferedReader dslFileReader = new BufferedReader( dsl );
         this.mapping = new DefaultDSLMapping();
         this.errors = new LinkedList();
         while ( (line = dslFileReader.readLine()) != null ) {
             linecounter++;
-            Matcher mat = pattern.matcher( line );
+            final Matcher mat = pattern.matcher( line );
             if ( mat.matches() ) {
-                String sectionStr = mat.group( 2 );
-                String metadataStr = mat.group( 4 );
-                String key = mat.group( 5 );
-                String value = mat.group( 6 );
+                final String sectionStr = mat.group( 2 );
+                final String metadataStr = mat.group( 4 );
+                final String key = mat.group( 5 );
+                final String value = mat.group( 6 );
 
                 DSLMappingEntry.Section section = DSLMappingEntry.ANY;
                 if ( KEYWORD.equals( sectionStr ) ) {
@@ -107,17 +107,17 @@
                     section = DSLMappingEntry.CONSEQUENCE;
                 }
 
-                DSLMappingEntry.MetaData metadata = new DefaultDSLEntryMetaData( metadataStr );
+                final DSLMappingEntry.MetaData metadata = new DefaultDSLEntryMetaData( metadataStr );
 
-                DSLMappingEntry entry = new DefaultDSLMappingEntry( section,
+                final DSLMappingEntry entry = new DefaultDSLMappingEntry( section,
                                                                     metadata,
                                                                     key,
                                                                     value );
 
                 this.mapping.addEntry( entry );
             } else if ( !line.trim().startsWith( "#" ) ) { // it is not a comment 
-                String error = "Error parsing mapping entry: " + line;
-                DSLMappingParseException exception = new DSLMappingParseException( error,
+                final String error = "Error parsing mapping entry: " + line;
+                final DSLMappingParseException exception = new DSLMappingParseException( error,
                                                                                    linecounter );
                 this.errors.add( exception );
             }
@@ -130,13 +130,13 @@
      * @param out
      * @throws IOException
      */
-    public void saveMapping( Writer out ) throws IOException {
-        for ( Iterator it = mapping.getEntries().iterator(); it.hasNext(); ) {
+    public void saveMapping(final Writer out) throws IOException {
+        for ( final Iterator it = this.mapping.getEntries().iterator(); it.hasNext(); ) {
             out.write( it.next().toString() );
             out.write( "\n" );
         }
     }
-    
+
     /**
      * Saves the given mapping into a DSL mapping file
      * 
@@ -144,20 +144,21 @@
      * @param mapping
      * @throws IOException
      */
-    public static void saveMapping( Writer out, DSLMapping mapping ) throws IOException {
-        for ( Iterator it = mapping.getEntries().iterator(); it.hasNext(); ) {
+    public static void saveMapping(final Writer out,
+                                   final DSLMapping mapping) throws IOException {
+        for ( final Iterator it = mapping.getEntries().iterator(); it.hasNext(); ) {
             out.write( it.next().toString() );
             out.write( "\n" );
         }
     }
-    
+
     /**
      * Method to return the current mapping as a String object
      * @return
      */
     public String dumpFile() {
-        StringBuffer buf = new StringBuffer();
-        for ( Iterator it = this.mapping.getEntries().iterator(); it.hasNext(); ) {
+        final StringBuffer buf = new StringBuffer();
+        for ( final Iterator it = this.mapping.getEntries().iterator(); it.hasNext(); ) {
             buf.append( it.next() );
             buf.append( "\n" );
         }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMappingParseException.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMappingParseException.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMappingParseException.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -16,7 +16,6 @@
 
 package org.drools.lang.dsl;
 
-
 /**
  * @author etirelli
  *
@@ -24,25 +23,25 @@
 public class DSLMappingParseException extends Exception {
     private static final long serialVersionUID = 3451471362012187687L;
 
-    public String message;
-    public int   line;
+    public String             message;
+    public int                line;
 
-    public DSLMappingParseException(String message,
-                                    int line) {
+    public DSLMappingParseException(final String message,
+                                    final int line) {
         this.message = message;
         this.line = line;
     }
-    
+
     public String getMessage() {
         return this.message;
     }
-    
+
     public int getLine() {
         return this.line;
     }
-    
+
     public String toString() {
-        return "[ line "+line+" ]" + this.message;
+        return "[ line " + this.line + " ]" + this.message;
     }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultDSLMapping.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultDSLMapping.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultDSLMapping.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -41,7 +41,7 @@
         this( "" );
     }
 
-    public DefaultDSLMapping(String identifier) {
+    public DefaultDSLMapping(final String identifier) {
         this.identifier = identifier;
         this.entries = new LinkedList();
     }
@@ -50,35 +50,35 @@
      * Add one entry to the list of the entries
      * @param entry
      */
-    public void addEntry( DSLMappingEntry entry ) {
+    public void addEntry(final DSLMappingEntry entry) {
         this.entries.add( entry );
     }
-    
+
     /**
      * Adds all entries in the given list to this DSL Mapping
      * @param entries
      */
-    public void addEntries( List entries ) {
+    public void addEntries(final List entries) {
         this.entries.addAll( entries );
     }
-    
+
     /**
      * Returns an unmodifiable list of entries
      */
     public List getEntries() {
         return Collections.unmodifiableList( this.entries );
     }
-    
+
     /**
      * Returns the list of mappings for the given section 
      * @param section
      * @return
      */
-    public List getEntries( Section section ) {
-        List list = new LinkedList();
-        for( Iterator it = this.entries.iterator(); it.hasNext(); ) {
-            DSLMappingEntry entry = (DSLMappingEntry) it.next();
-            if( entry.getSection().equals( section ) ) {
+    public List getEntries(final Section section) {
+        final List list = new LinkedList();
+        for ( final Iterator it = this.entries.iterator(); it.hasNext(); ) {
+            final DSLMappingEntry entry = (DSLMappingEntry) it.next();
+            if ( entry.getSection().equals( section ) ) {
                 list.add( entry );
             }
         }
@@ -95,7 +95,7 @@
     /**
      * @inheritDoc
      */
-    public void removeEntry(DSLMappingEntry entry) {
+    public void removeEntry(final DSLMappingEntry entry) {
         this.entries.remove( entry );
     }
 
@@ -109,14 +109,14 @@
     /**
      * @inheritDoc
      */
-    public void setDescription(String description) {
+    public void setDescription(final String description) {
         this.description = description;
     }
 
     /**
      * @inheritDoc
      */
-    public void setIdentifier(String identifier) {
+    public void setIdentifier(final String identifier) {
         this.identifier = identifier;
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultDSLMappingEntry.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultDSLMappingEntry.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultDSLMappingEntry.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -33,15 +33,15 @@
     implements
     DSLMappingEntry {
 
-    private Section              section;
-    private MetaData             metadata;
-    private String               key;
-    private String               value;
+    private Section      section;
+    private MetaData     metadata;
+    private String       key;
+    private String       value;
 
-    private Map                  variables = Collections.EMPTY_MAP;
+    private Map          variables = Collections.EMPTY_MAP;
 
-    private Pattern              keyPattern;
-    private String               valuePattern;
+    private Pattern      keyPattern;
+    private String       valuePattern;
 
     // following pattern is used to extract all variables names and positions from a mapping.
     // Example: for the following String:
@@ -52,7 +52,7 @@
     // This, pattern, easy, say
     //
     static final Pattern varFinder = Pattern.compile( "(^|[^\\\\])\\{([(\\\\\\{)|[^\\{]]*?)\\}",
-                                                              Pattern.MULTILINE | Pattern.DOTALL );
+                                                      Pattern.MULTILINE | Pattern.DOTALL );
 
     public DefaultDSLMappingEntry() {
         this( DSLMappingEntry.ANY,
@@ -61,10 +61,10 @@
               null );
     }
 
-    public DefaultDSLMappingEntry(Section section,
-                                  MetaData metadata,
-                                  String key,
-                                  String value) {
+    public DefaultDSLMappingEntry(final Section section,
+                                  final MetaData metadata,
+                                  final String key,
+                                  final String value) {
         this.section = section;
         this.metadata = metadata;
         this.setMappingKey( key );
@@ -102,14 +102,14 @@
     /**
      * @param key the key to set
      */
-    public void setMappingKey(String key) {
+    public void setMappingKey(final String key) {
         this.key = key;
 
-        if( key != null ) {
+        if ( key != null ) {
             // retrieving variables list and creating key pattern 
-            Matcher m = varFinder.matcher( key.replaceAll( "\\$",
+            final Matcher m = varFinder.matcher( key.replaceAll( "\\$",
                                                            "\\\\\\$" ) );
-            StringBuffer buf = new StringBuffer();
+            final StringBuffer buf = new StringBuffer();
             int counter = 1;
             while ( m.find() ) {
                 if ( this.variables == Collections.EMPTY_MAP ) {
@@ -145,26 +145,26 @@
     /**
      * @param section the section to set
      */
-    public void setSection(Section section) {
+    public void setSection(final Section section) {
         this.section = section;
     }
 
     /**
      * @param value the value to set
      */
-    public void setMappingValue(String value) {
+    public void setMappingValue(final String value) {
         this.valuePattern = value;
         this.value = value;
         if ( value != null ) {
             this.valuePattern = this.valuePattern.replaceAll( "\\\\n",
                                                               "\n" ).replaceAll( "\\$",
                                                                                  "\\\\\\$" );
-            for ( Iterator it = this.variables.entrySet().iterator(); it.hasNext(); ) {
-                Map.Entry entry = (Map.Entry) it.next();
-                String var = (String) entry.getKey();
-                int pos = ((Integer) entry.getValue()).intValue();
+            for ( final Iterator it = this.variables.entrySet().iterator(); it.hasNext(); ) {
+                final Map.Entry entry = (Map.Entry) it.next();
+                final String var = (String) entry.getKey();
+                final int pos = ((Integer) entry.getValue()).intValue();
 
-                this.valuePattern = valuePattern.replaceAll( "\\{" + var + "\\}",
+                this.valuePattern = this.valuePattern.replaceAll( "\\{" + var + "\\}",
                                                              "\\$" + pos );
             }
         }
@@ -173,7 +173,7 @@
     /**
      * @param metadata the metadata to set
      */
-    public void setMetaData(MetaData metadata) {
+    public void setMetaData(final MetaData metadata) {
         this.metadata = metadata;
     }
 
@@ -181,21 +181,21 @@
      * @return the keyPattern
      */
     public Pattern getKeyPattern() {
-        return keyPattern;
+        return this.keyPattern;
     }
 
     /**
      * @return the valuePattern
      */
     public String getValuePattern() {
-        return valuePattern;
+        return this.valuePattern;
     }
 
     /**
      * @return the variables
      */
     public Map getVariables() {
-        return variables;
+        return this.variables;
     }
 
     public String toPatternString() {
@@ -212,33 +212,55 @@
     public int hashCode() {
         final int PRIME = 31;
         int result = 1;
-        result = PRIME * result + ((key == null) ? 0 : key.hashCode());
-        result = PRIME * result + ((metadata == null) ? 0 : metadata.hashCode());
-        result = PRIME * result + ((section == null) ? 0 : section.hashCode());
-        result = PRIME * result + ((value == null) ? 0 : value.hashCode());
+        result = PRIME * result + ((this.key == null) ? 0 : this.key.hashCode());
+        result = PRIME * result + ((this.metadata == null) ? 0 : this.metadata.hashCode());
+        result = PRIME * result + ((this.section == null) ? 0 : this.section.hashCode());
+        result = PRIME * result + ((this.value == null) ? 0 : this.value.hashCode());
         return result;
     }
 
     /* (non-Javadoc)
      * @see java.lang.Object#equals(java.lang.Object)
      */
-    public boolean equals(Object obj) {
-        if ( this == obj ) return true;
-        if ( obj == null ) return false;
-        if ( getClass() != obj.getClass() ) return false;
+    public boolean equals(final Object obj) {
+        if ( this == obj ) {
+            return true;
+        }
+        if ( obj == null ) {
+            return false;
+        }
+        if ( getClass() != obj.getClass() ) {
+            return false;
+        }
         final DefaultDSLMappingEntry other = (DefaultDSLMappingEntry) obj;
-        if ( key == null ) {
-            if ( other.key != null ) return false;
-        } else if ( !key.equals( other.key ) ) return false;
-        if ( metadata == null ) {
-            if ( other.metadata != null ) return false;
-        } else if ( !metadata.equals( other.metadata ) ) return false;
-        if ( section == null ) {
-            if ( other.section != null ) return false;
-        } else if ( !section.equals( other.section ) ) return false;
-        if ( value == null ) {
-            if ( other.value != null ) return false;
-        } else if ( !value.equals( other.value ) ) return false;
+        if ( this.key == null ) {
+            if ( other.key != null ) {
+                return false;
+            }
+        } else if ( !this.key.equals( other.key ) ) {
+            return false;
+        }
+        if ( this.metadata == null ) {
+            if ( other.metadata != null ) {
+                return false;
+            }
+        } else if ( !this.metadata.equals( other.metadata ) ) {
+            return false;
+        }
+        if ( this.section == null ) {
+            if ( other.section != null ) {
+                return false;
+            }
+        } else if ( !this.section.equals( other.section ) ) {
+            return false;
+        }
+        if ( this.value == null ) {
+            if ( other.value != null ) {
+                return false;
+            }
+        } else if ( !this.value.equals( other.value ) ) {
+            return false;
+        }
         return true;
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpander.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpander.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpander.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -45,42 +45,43 @@
     // Be EXTREMELLY careful if you decide to change bellow regexp's
     //
     // bellow regexp is used to find and parse rule parts: header, LHS, RHS, trailer, etc
-    private static final String rulesExpr = "(^\\s*rule.*?$.*?^\\s*when.*?$)(.*?)(^\\s*then.*?$)(.*?)(^\\s*end)";
+    private static final String  rulesExpr    = "(^\\s*rule.*?$.*?^\\s*when.*?$)(.*?)(^\\s*then.*?$)(.*?)(^\\s*end)";
     // bellow regexp is used to find and parse query parts: header, condition, trailer
-    private static final String queryExpr = "(^\\s*query.*?$)(.*?)(^\\s*end)";
-    
+    private static final String  queryExpr    = "(^\\s*query.*?$)(.*?)(^\\s*end)";
+
     // bellow we combine and compile above expressions into a pattern object
-    private static final Pattern finder = Pattern.compile( "("+rulesExpr+"|"+queryExpr+")" , Pattern.DOTALL | Pattern.MULTILINE );
+    private static final Pattern finder       = Pattern.compile( "(" + rulesExpr + "|" + queryExpr + ")",
+                                                                 Pattern.DOTALL | Pattern.MULTILINE );
     // bellow pattern is used to find a column's constraint list
     private static final Pattern columnFinder = Pattern.compile( "\\((.*?)\\)" );
-    
-    private Map     mappings    = new HashMap();
-    private List    keywords    = new LinkedList();
-    private List    condition   = new LinkedList();
-    private List    consequence = new LinkedList();
-    private List    cleanup     = new LinkedList();
-    
-    private List    errors      = Collections.EMPTY_LIST;
 
+    private final Map                  mappings     = new HashMap();
+    private final List                 keywords     = new LinkedList();
+    private final List                 condition    = new LinkedList();
+    private final List                 consequence  = new LinkedList();
+    private final List                 cleanup      = new LinkedList();
+
+    private List                 errors       = Collections.EMPTY_LIST;
+
     /**
      * Creates a new DefaultExpander
      */
     public DefaultExpander() {
-        this.cleanup.add( new DefaultDSLMappingEntry(DSLMappingEntry.KEYWORD,
-                          null,
-                          "expander {name}",
-                          ""));
+        this.cleanup.add( new DefaultDSLMappingEntry( DSLMappingEntry.KEYWORD,
+                                                      null,
+                                                      "expander {name}",
+                                                      "" ) );
     }
 
     /**
      * Add the new mapping to this expander.
      * @param mapping
      */
-    public void addDSLMapping(DSLMapping mapping) {
+    public void addDSLMapping(final DSLMapping mapping) {
         this.mappings.put( mapping.getIdentifier(),
                            mapping );
-        for ( Iterator it = mapping.getEntries().iterator(); it.hasNext(); ) {
-            DSLMappingEntry entry = (DSLMappingEntry) it.next();
+        for ( final Iterator it = mapping.getEntries().iterator(); it.hasNext(); ) {
+            final DSLMappingEntry entry = (DSLMappingEntry) it.next();
             if ( entry.getSection() == DSLMappingEntry.KEYWORD ) {
                 this.keywords.add( entry );
             } else if ( entry.getSection() == DSLMappingEntry.CONDITION ) {
@@ -102,7 +103,7 @@
     public String expand(final Reader drlReader) throws IOException {
         return this.expand( this.loadDrlFile( drlReader ) );
     }
-    
+
     /**
      * @inheritDoc
      * @throws IOException 
@@ -110,7 +111,7 @@
     public String expand(String drl) {
         drl = expandKeywords( drl );
         drl = cleanupExpressions( drl );
-        StringBuffer buf = expandConstructions( drl );
+        final StringBuffer buf = expandConstructions( drl );
         return buf.toString();
     }
 
@@ -120,14 +121,14 @@
      * @param drl
      * @return
      */
-    private StringBuffer expandConstructions(String drl) {
+    private StringBuffer expandConstructions(final String drl) {
         // parse and expand specific areas
-        Matcher m = finder.matcher( drl );
-        StringBuffer buf = new StringBuffer();
-        while( m.find() ) {
-            StringBuffer expanded = new StringBuffer();
-            String constr = m.group( 1 ).trim();
-            if( constr.startsWith( "rule" ) ) {
+        final Matcher m = finder.matcher( drl );
+        final StringBuffer buf = new StringBuffer();
+        while ( m.find() ) {
+            final StringBuffer expanded = new StringBuffer();
+            final String constr = m.group( 1 ).trim();
+            if ( constr.startsWith( "rule" ) ) {
                 // match rule
                 expanded.append( m.group( 2 ) ); // adding rule header and attributes
                 expanded.append( this.expandLHS( m.group( 3 ) ) ); // adding expanded LHS
@@ -135,7 +136,7 @@
                 expanded.append( this.expandRHS( m.group( 5 ) ) ); // adding expanded RHS
                 expanded.append( m.group( 6 ) ); // adding rule trailer
                 expanded.append( "\n" );
-            } else if( constr.startsWith( "query" ) ) {
+            } else if ( constr.startsWith( "query" ) ) {
                 // match query
                 expanded.append( m.group( 7 ) ); // adding query header and attributes
                 expanded.append( this.expandLHS( m.group( 8 ) ) ); // adding expanded LHS
@@ -143,9 +144,12 @@
                 expanded.append( "\n" );
             } else {
                 // strange behavior
-                this.addError( new ExpanderException("Unable to expand statement: "+constr, 0) );
+                this.addError( new ExpanderException( "Unable to expand statement: " + constr,
+                                                      0 ) );
             }
-            m.appendReplacement( buf, expanded.toString().replaceAll( "\\$", "\\\\\\$" ) );
+            m.appendReplacement( buf,
+                                 expanded.toString().replaceAll( "\\$",
+                                                                 "\\\\\\$" ) );
         }
         m.appendTail( buf );
         return buf;
@@ -159,8 +163,8 @@
      */
     private String cleanupExpressions(String drl) {
         // execute cleanup
-        for( Iterator it = this.cleanup.iterator(); it.hasNext(); ) {
-            DSLMappingEntry entry = (DSLMappingEntry) it.next();
+        for ( final Iterator it = this.cleanup.iterator(); it.hasNext(); ) {
+            final DSLMappingEntry entry = (DSLMappingEntry) it.next();
             drl = entry.getKeyPattern().matcher( drl ).replaceAll( entry.getValuePattern() );
         }
         return drl;
@@ -174,8 +178,8 @@
      */
     private String expandKeywords(String drl) {
         // apply all keywords templates
-        for( Iterator it = this.keywords.iterator(); it.hasNext(); ) {
-            DSLMappingEntry entry = (DSLMappingEntry) it.next();
+        for ( final Iterator it = this.keywords.iterator(); it.hasNext(); ) {
+            final DSLMappingEntry entry = (DSLMappingEntry) it.next();
             drl = entry.getKeyPattern().matcher( drl ).replaceAll( entry.getValuePattern() );
         }
         return drl;
@@ -186,56 +190,58 @@
      * @param lhs
      * @return
      */
-    private String expandLHS(String lhs) {
-        StringBuffer buf = new StringBuffer();
-        String[] lines = lhs.split( "\n" ); // since we assembled the string, we know line breaks are \n
-        String[] expanded = new String[lines.length]; // buffer for expanded lines
+    private String expandLHS(final String lhs) {
+        final StringBuffer buf = new StringBuffer();
+        final String[] lines = lhs.split( "\n" ); // since we assembled the string, we know line breaks are \n
+        final String[] expanded = new String[lines.length]; // buffer for expanded lines
         int lastExpanded = -1;
         int lastColumn = -1;
-        for( int i = 0; i < lines.length; i++ ){
-            String trimmed = lines[i].trim();
+        for ( int i = 0; i < lines.length; i++ ) {
+            final String trimmed = lines[i].trim();
             expanded[++lastExpanded] = lines[i];
-            
-            if( trimmed.length() == 0 || trimmed.startsWith( "#" ) || trimmed.startsWith( "//" ) ) { // comments
+
+            if ( trimmed.length() == 0 || trimmed.startsWith( "#" ) || trimmed.startsWith( "//" ) ) { // comments
                 // do nothing
-            } else if( trimmed.startsWith( ">" ) ) { // passthrough code
+            } else if ( trimmed.startsWith( ">" ) ) { // passthrough code
                 // simply remove the passthrough mark character
-                expanded[lastExpanded] =  lines[i].replaceFirst( ">", " " );
+                expanded[lastExpanded] = lines[i].replaceFirst( ">",
+                                                                " " );
             } else { // regular expansion
                 // expand the expression
-                for( Iterator it = this.condition.iterator(); it.hasNext(); ) {
-                    DSLMappingEntry entry = (DSLMappingEntry) it.next();
-                    expanded[lastExpanded] = entry.getKeyPattern().matcher( expanded[lastExpanded] ).replaceAll( entry.getValuePattern() ); 
+                for ( final Iterator it = this.condition.iterator(); it.hasNext(); ) {
+                    final DSLMappingEntry entry = (DSLMappingEntry) it.next();
+                    expanded[lastExpanded] = entry.getKeyPattern().matcher( expanded[lastExpanded] ).replaceAll( entry.getValuePattern() );
                 }
 
                 // do we need to report errors for that?
-                if( lines[i].equals( expanded[lastExpanded] ) ) {
+                if ( lines[i].equals( expanded[lastExpanded] ) ) {
                     // report error
-                    this.addError( new ExpanderException("Unable to expand: ["+lines[i]+"]", i) );
+                    this.addError( new ExpanderException( "Unable to expand: [" + lines[i] + "]",
+                                                          i ) );
                 }
                 // but if the original starts with a "-", it means we need to add it
                 // as a constraint to the previous column
-                if( trimmed.startsWith( "-" ) && (! lines[i].equals( expanded[lastExpanded] )) ) {
+                if ( trimmed.startsWith( "-" ) && (!lines[i].equals( expanded[lastExpanded] )) ) {
                     int lastMatchStart = -1;
                     int lastMatchEnd = -1;
                     String constraints = "";
-                    if( lastColumn >= 0) {
-                        Matcher m2 = columnFinder.matcher( expanded[lastColumn] );
-                        while(m2.find()) {
+                    if ( lastColumn >= 0 ) {
+                        final Matcher m2 = columnFinder.matcher( expanded[lastColumn] );
+                        while ( m2.find() ) {
                             lastMatchStart = m2.start();
                             lastMatchEnd = m2.end();
-                            constraints = m2.group(1).trim();
+                            constraints = m2.group( 1 ).trim();
                         }
                     }
-                    if( lastMatchStart > -1 ) {
+                    if ( lastMatchStart > -1 ) {
                         // rebuilding previous column structure
-                        expanded[lastColumn] = expanded[lastColumn].substring( 0, lastMatchStart ) +
-                                               "( "+constraints+((constraints.length()==0)?"":", ")+expanded[lastExpanded].trim()+" )" +
-                                               expanded[lastColumn].substring( lastMatchEnd );
+                        expanded[lastColumn] = expanded[lastColumn].substring( 0,
+                                                                               lastMatchStart ) + "( " + constraints + ((constraints.length() == 0) ? "" : ", ") + expanded[lastExpanded].trim() + " )" + expanded[lastColumn].substring( lastMatchEnd );
                     } else {
                         // error, column not found to add constraint to
                         // TODO: can we report character position?
-                        this.addError( new ExpanderException("No column was found to add the constraint to: "+lines[i], i) );
+                        this.addError( new ExpanderException( "No column was found to add the constraint to: " + lines[i],
+                                                              i ) );
                     }
                     lastExpanded--;
                 } else {
@@ -243,11 +249,11 @@
                 }
             }
         }
-        for( int i = 0; i <= lastExpanded; i++ ) {
+        for ( int i = 0; i <= lastExpanded; i++ ) {
             buf.append( expanded[i] );
             buf.append( "\n" );
         }
-        
+
         return buf.toString();
     }
 
@@ -257,54 +263,56 @@
      * @param lhs
      * @return
      */
-    private String expandRHS(String lhs) {
-        StringBuffer buf = new StringBuffer();
-        String[] lines = lhs.split( "\n" ); // since we assembled the string, we know line breaks are \n
-        for( int i = 0; i < lines.length; i++ ){
-            String trimmed = lines[i].trim();
-            
-            if( trimmed.length() == 0 || trimmed.startsWith( "#" ) || trimmed.startsWith( "//" ) ) { // comments
+    private String expandRHS(final String lhs) {
+        final StringBuffer buf = new StringBuffer();
+        final String[] lines = lhs.split( "\n" ); // since we assembled the string, we know line breaks are \n
+        for ( int i = 0; i < lines.length; i++ ) {
+            final String trimmed = lines[i].trim();
+
+            if ( trimmed.length() == 0 || trimmed.startsWith( "#" ) || trimmed.startsWith( "//" ) ) { // comments
                 buf.append( lines[i] );
-            } else if( trimmed.startsWith( ">" ) ) { // passthrough code
-                buf.append( lines[i].replaceFirst( ">", "" ) );
+            } else if ( trimmed.startsWith( ">" ) ) { // passthrough code
+                buf.append( lines[i].replaceFirst( ">",
+                                                   "" ) );
             } else { // regular expansions
                 String expanded = lines[i];
-                for( Iterator it = this.consequence.iterator(); it.hasNext(); ) {
-                    DSLMappingEntry entry = (DSLMappingEntry) it.next();
-                    expanded = entry.getKeyPattern().matcher( expanded ).replaceAll( entry.getValuePattern() ); 
+                for ( final Iterator it = this.consequence.iterator(); it.hasNext(); ) {
+                    final DSLMappingEntry entry = (DSLMappingEntry) it.next();
+                    expanded = entry.getKeyPattern().matcher( expanded ).replaceAll( entry.getValuePattern() );
                 }
                 buf.append( expanded );
                 // do we need to report errors for that?
-                if( lines[i].equals( expanded ) ) {
+                if ( lines[i].equals( expanded ) ) {
                     // report error
-                    this.addError( new ExpanderException("Unable to expand: "+lines[i], i) );
+                    this.addError( new ExpanderException( "Unable to expand: " + lines[i],
+                                                          i ) );
                 }
             }
             buf.append( "\n" );
         }
-        
+
         return buf.toString();
     }
 
     // Reads the stream into a String
-    private String loadDrlFile( Reader drl ) throws IOException {
-        StringBuffer buf = new StringBuffer();
-        BufferedReader input = new BufferedReader( drl );
+    private String loadDrlFile(final Reader drl) throws IOException {
+        final StringBuffer buf = new StringBuffer();
+        final BufferedReader input = new BufferedReader( drl );
         String line = null;
-        while( (line = input.readLine()) != null ) {
+        while ( (line = input.readLine()) != null ) {
             buf.append( line );
             buf.append( "\n" );
         }
         return buf.toString();
     }
 
-    private void addError( DroolsError error ) {
-        if( this.errors == Collections.EMPTY_LIST ) {
+    private void addError(final DroolsError error) {
+        if ( this.errors == Collections.EMPTY_LIST ) {
             this.errors = new LinkedList();
         }
         this.errors.add( error );
     }
-    
+
     /**
      * @inheritDoc
      */
@@ -316,8 +324,7 @@
      * @inheritDoc
      */
     public boolean hasErrors() {
-        return ! this.errors.isEmpty();
+        return !this.errors.isEmpty();
     }
 
-
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpanderResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpanderResolver.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpanderResolver.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -56,14 +56,14 @@
      * This is the constructor most people should use.
      */
     public DefaultExpanderResolver(final Reader reader) throws IOException {
-        DSLMappingFile file = new DSLMappingFile();
-        if( file.parseAndLoad( reader ) ) {
+        final DSLMappingFile file = new DSLMappingFile();
+        if ( file.parseAndLoad( reader ) ) {
             final Expander expander = new DefaultExpander();
             expander.addDSLMapping( file.getMapping() );
             this.expanders.put( "*",
-                           expander );
+                                expander );
         } else {
-            throw new RuntimeDroolsException("Error parsing and loading DSL file."+file.getErrors());
+            throw new RuntimeDroolsException( "Error parsing and loading DSL file." + file.getErrors() );
         }
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/resource/util/ByteArrayClassLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/resource/util/ByteArrayClassLoader.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/resource/util/ByteArrayClassLoader.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -27,22 +27,24 @@
  * @author etirelli
  */
 public class ByteArrayClassLoader extends ClassLoader {
-    
+
     private final Map resources = new HashMap();
 
     public ByteArrayClassLoader(final ClassLoader parentClassLoader) {
         super( parentClassLoader );
     }
-    
-    public void addResource( String name, byte[] bytecode ) {
-        this.resources.put( name, bytecode );
+
+    public void addResource(final String name,
+                            final byte[] bytecode) {
+        this.resources.put( name,
+                            bytecode );
     }
 
     public Class fastFindClass(final String name) {
         final Class clazz = findLoadedClass( name );
 
         if ( clazz == null ) {
-            final byte[] clazzBytes = (byte[]) this.resources.get( convertClassToResourcePath(name) );
+            final byte[] clazzBytes = (byte[]) this.resources.get( convertClassToResourcePath( name ) );
             if ( clazzBytes != null ) {
                 return defineClass( name,
                                     clazzBytes,
@@ -95,36 +97,35 @@
             return new ByteArrayInputStream( bytes );
         } else {
             InputStream input = this.getParent().getResourceAsStream( name );
-            if( input == null ){
+            if ( input == null ) {
                 input = super.getResourceAsStream( name );
             }
             return input;
         }
     }
-    
-//    /**
-//     * org/my/Class.xxx -> org.my.Class
-//     */
-//    private static String convertResourceToClassName( final String pResourceName ) {
-//        return stripExtension(pResourceName).replace('/', '.');
-//    }
-//
+
+    //    /**
+    //     * org/my/Class.xxx -> org.my.Class
+    //     */
+    //    private static String convertResourceToClassName( final String pResourceName ) {
+    //        return stripExtension(pResourceName).replace('/', '.');
+    //    }
+    //
     /**
      * org.my.Class -> org/my/Class.class
      */
-    private static String convertClassToResourcePath( final String pName ) {
-        return pName.replace('.', '/') + ".class";
+    private static String convertClassToResourcePath(final String pName) {
+        return pName.replace( '.',
+                              '/' ) + ".class";
     }
 
-//    /**
-//     * org/my/Class.xxx -> org/my/Class
-//     */
-//    private static String stripExtension( final String pResourceName ) {
-//        final int i = pResourceName.lastIndexOf('.');
-//        final String withoutExtension = pResourceName.substring(0, i);
-//        return withoutExtension;
-//    }
-    
-    
+    //    /**
+    //     * org/my/Class.xxx -> org/my/Class
+    //     */
+    //    private static String stripExtension( final String pResourceName ) {
+    //        final int i = pResourceName.lastIndexOf('.');
+    //        final String withoutExtension = pResourceName.substring(0, i);
+    //        return withoutExtension;
+    //    }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/BuildContext.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/BuildContext.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/BuildContext.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -37,48 +37,45 @@
 public class BuildContext {
 
     // current package
-    private Package            pkg;
+    private Package                  pkg;
 
     // current rule
-    private Rule               rule;
-    
+    private Rule                     rule;
+
     // a stack for the rule building used
     // for declarations resolution
-    private Stack              buildStack;
+    private Stack                    buildStack;
 
     // current Rule descriptor
-    private RuleDescr          ruleDescr;
+    private RuleDescr                ruleDescr;
 
     // available declarationResolver 
     private DeclarationScopeResolver declarationResolver;
 
     // a simple counter for columns
-    private int                columnId = -1;
-    
+    private int                      columnId = -1;
+
     // errors found when building the current context
-    private List               errors;
+    private List                     errors;
 
-    
-    
     // the class name for the rule    
-    private String             ruleClass;
-    
+    private String                   ruleClass;
+
     // list of generated methods
-    private List               methods;
+    private List                     methods;
 
     // map<String invokerClassName, String invokerCode> of generated invokers
-    private Map                invokers;
+    private Map                      invokers;
 
     // map<String invokerClassName, ConditionalElement ce> of generated invoker lookups
-    private Map                invokerLookups;
+    private Map                      invokerLookups;
 
     // map<String invokerClassName, BaseDescr descr> of descriptor lookups
-    private Map                descrLookups;
+    private Map                      descrLookups;
 
     // a simple counter for generated names
-    private int                counter;
+    private int                      counter;
 
-
     /**
      * Default constructor
      */
@@ -92,7 +89,8 @@
         this.descrLookups = new HashMap();
         this.errors = new ArrayList();
         this.buildStack = new Stack();
-        this.declarationResolver = new DeclarationScopeResolver( new Map[]{this.pkg.getGlobals()}, this.buildStack );
+        this.declarationResolver = new DeclarationScopeResolver( new Map[]{this.pkg.getGlobals()},
+                                                                 this.buildStack );
         this.ruleDescr = ruleDescr;
 
         if ( ruleDescr instanceof QueryDescr ) {
@@ -108,7 +106,7 @@
      * @return
      */
     public List getErrors() {
-        return errors;
+        return this.errors;
     }
 
     /**
@@ -116,7 +114,7 @@
      * @return
      */
     public Package getPkg() {
-        return pkg;
+        return this.pkg;
     }
 
     /**
@@ -124,7 +122,7 @@
      * @return
      */
     public Rule getRule() {
-        return rule;
+        return this.rule;
     }
 
     /**
@@ -132,7 +130,7 @@
      * @return
      */
     public RuleDescr getRuleDescr() {
-        return ruleDescr;
+        return this.ruleDescr;
     }
 
     /**
@@ -140,14 +138,14 @@
      * @return
      */
     public DeclarationScopeResolver getDeclarationResolver() {
-        return declarationResolver;
+        return this.declarationResolver;
     }
 
     /**
      * Sets the available declarationResolver instance
      * @param declarationResolver
      */
-    public void setDeclarationResolver(DeclarationScopeResolver variables) {
+    public void setDeclarationResolver(final DeclarationScopeResolver variables) {
         this.declarationResolver = variables;
     }
 
@@ -156,10 +154,10 @@
      * @return
      */
     public Map getDescrLookups() {
-        return descrLookups;
+        return this.descrLookups;
     }
 
-    public void setDescrLookups(Map descrLookups) {
+    public void setDescrLookups(final Map descrLookups) {
         this.descrLookups = descrLookups;
     }
 
@@ -168,10 +166,10 @@
      * @return
      */
     public Map getInvokerLookups() {
-        return invokerLookups;
+        return this.invokerLookups;
     }
 
-    public void setInvokerLookups(Map invokerLookups) {
+    public void setInvokerLookups(final Map invokerLookups) {
         this.invokerLookups = invokerLookups;
     }
 
@@ -180,10 +178,10 @@
      * @return
      */
     public Map getInvokers() {
-        return invokers;
+        return this.invokers;
     }
 
-    public void setInvokers(Map invokers) {
+    public void setInvokers(final Map invokers) {
         this.invokers = invokers;
     }
 
@@ -192,10 +190,10 @@
      * @return
      */
     public List getMethods() {
-        return methods;
+        return this.methods;
     }
 
-    public void setMethods(List methods) {
+    public void setMethods(final List methods) {
         this.methods = methods;
     }
 
@@ -204,35 +202,35 @@
      * @return
      */
     public int getCurrentId() {
-        return counter;
+        return this.counter;
     }
 
     public int getNextId() {
-        return counter++;
+        return this.counter++;
     }
 
     public int getColumnId() {
-        return columnId;
+        return this.columnId;
     }
 
     public int getNextColumnId() {
-        return ++columnId;
+        return ++this.columnId;
     }
 
-    public void setColumnId(int columnId) {
+    public void setColumnId(final int columnId) {
         this.columnId = columnId;
     }
 
     public String getRuleClass() {
-        return ruleClass;
+        return this.ruleClass;
     }
 
-    public void setRuleClass(String ruleClass) {
+    public void setRuleClass(final String ruleClass) {
         this.ruleClass = ruleClass;
     }
 
     public Stack getBuildStack() {
-        return buildStack;
+        return this.buildStack;
     }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/CollectBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/CollectBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/CollectBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -34,25 +34,29 @@
     /* (non-Javadoc)
      * @see org.drools.semantics.java.builder.ConditionalElementBuilder#build(org.drools.semantics.java.builder.BuildContext, org.drools.semantics.java.builder.BuildUtils, org.drools.semantics.java.builder.ColumnBuilder, org.drools.lang.descr.BaseDescr)
      */
-    public ConditionalElement build(BuildContext context,
-                                    BuildUtils utils,
-                                    ColumnBuilder columnBuilder,
-                                    BaseDescr descr) {
-        
-        CollectDescr collectDescr = (CollectDescr) descr;
-        
-        Column sourceColumn = columnBuilder.build( context, utils, collectDescr.getSourceColumn() );
+    public ConditionalElement build(final BuildContext context,
+                                    final BuildUtils utils,
+                                    final ColumnBuilder columnBuilder,
+                                    final BaseDescr descr) {
 
+        final CollectDescr collectDescr = (CollectDescr) descr;
+
+        final Column sourceColumn = columnBuilder.build( context,
+                                                   utils,
+                                                   collectDescr.getSourceColumn() );
+
         if ( sourceColumn == null ) {
             return null;
         }
 
-        Column resultColumn = columnBuilder.build( context, utils, collectDescr.getResultColumn() );
+        final Column resultColumn = columnBuilder.build( context,
+                                                   utils,
+                                                   collectDescr.getResultColumn() );
 
         final String className = "collect" + context.getNextId();
         collectDescr.setClassMethodName( className );
 
-        Collect collect = new Collect( sourceColumn,
+        final Collect collect = new Collect( sourceColumn,
                                        resultColumn );
         return collect;
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ColumnBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ColumnBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ColumnBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -69,7 +69,7 @@
 
     private Dialect dialect;
 
-    public ColumnBuilder(Dialect dialect) {
+    public ColumnBuilder(final Dialect dialect) {
         this.dialect = dialect;
     }
 
@@ -102,15 +102,15 @@
             objectType = new FactTemplateObjectType( factTemplate );
         } else {
             try {
-                Class userProvidedClass = utils.getTypeResolver().resolveType( columnDescr.getObjectType() );
-                String shadowProxyName = ShadowProxyFactory.getProxyClassNameForClass( userProvidedClass );
+                final Class userProvidedClass = utils.getTypeResolver().resolveType( columnDescr.getObjectType() );
+                final String shadowProxyName = ShadowProxyFactory.getProxyClassNameForClass( userProvidedClass );
                 Class shadowClass = null;
                 try {
                     // if already loaded
                     shadowClass = context.getPkg().getPackageCompilationData().getClassLoader().loadClass( shadowProxyName );
-                } catch ( ClassNotFoundException cnfe ) {
+                } catch ( final ClassNotFoundException cnfe ) {
                     // otherwise, create and load
-                    byte[] proxyBytes = ShadowProxyFactory.getProxyBytes( userProvidedClass );
+                    final byte[] proxyBytes = ShadowProxyFactory.getProxyBytes( userProvidedClass );
                     if ( proxyBytes != null ) {
                         context.getPkg().getPackageCompilationData().write( ClassUtils.convertClassToResourcePath( shadowProxyName ),
                                                                             proxyBytes );
@@ -374,7 +374,7 @@
         final List tupleDeclarations = new ArrayList();
         final List factDeclarations = new ArrayList();
         for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
-            Declaration decl = (Declaration) context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
+            final Declaration decl = context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
             if ( decl.getColumn() == column ) {
                 factDeclarations.add( decl );
             } else {
@@ -388,14 +388,14 @@
                                      usedIdentifiers[NOT_BOUND_INDEX],
                                      factDeclarations );
 
-        Declaration[] previousDeclarations = (Declaration[]) tupleDeclarations.toArray( new Declaration[tupleDeclarations.size()] );
-        Declaration[] localDeclarations = (Declaration[]) factDeclarations.toArray( new Declaration[factDeclarations.size()] );
+        final Declaration[] previousDeclarations = (Declaration[]) tupleDeclarations.toArray( new Declaration[tupleDeclarations.size()] );
+        final Declaration[] localDeclarations = (Declaration[]) factDeclarations.toArray( new Declaration[factDeclarations.size()] );
 
         final PredicateConstraint predicateConstraint = new PredicateConstraint( previousDeclarations,
                                                                                  localDeclarations );
         column.addConstraint( predicateConstraint );
 
-        PredicateBuilder builder = (PredicateBuilder) dialect.getPredicateBuilder();
+        final PredicateBuilder builder = this.dialect.getPredicateBuilder();
 
         builder.build( context,
                        utils,
@@ -422,8 +422,8 @@
                                         final List factDeclarations) {
         // the following will create the implicit bindings
         for ( int i = 0, size = unboundIdentifiers.size(); i < size; i++ ) {
-            String identifier = (String) unboundIdentifiers.get( i );
-            FieldBindingDescr implicitBinding = new FieldBindingDescr( identifier,
+            final String identifier = (String) unboundIdentifiers.get( i );
+            final FieldBindingDescr implicitBinding = new FieldBindingDescr( identifier,
                                                                        identifier );
 
             final FieldExtractor extractor = getFieldExtractor( context,
@@ -486,13 +486,13 @@
             return null;
         }
 
-        final Declaration declaration = (Declaration) context.getDeclarationResolver().getDeclaration( variableRestrictionDescr.getIdentifier() );
-        
-//        if ( declaration == null ) {
-//            build( context, th)
-//            // lazily create teh declaration
-//        }        
+        final Declaration declaration = context.getDeclarationResolver().getDeclaration( variableRestrictionDescr.getIdentifier() );
 
+        //        if ( declaration == null ) {
+        //            build( context, th)
+        //            // lazily create teh declaration
+        //        }        
+
         if ( declaration == null ) {
             context.getErrors().add( new RuleError( context.getRule(),
                                                     variableRestrictionDescr,
@@ -579,7 +579,7 @@
         final List tupleDeclarations = new ArrayList();
         final List factDeclarations = new ArrayList();
         for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
-            Declaration declaration = (Declaration) context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
+            final Declaration declaration = context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
             if ( declaration.getColumn() == column ) {
                 factDeclarations.add( declaration );
             } else {
@@ -602,14 +602,14 @@
             return null;
         }
 
-        Declaration[] previousDeclarations = (Declaration[]) tupleDeclarations.toArray( new Declaration[tupleDeclarations.size()] );
-        Declaration[] localDeclarations = (Declaration[]) factDeclarations.toArray( new Declaration[factDeclarations.size()] );
+        final Declaration[] previousDeclarations = (Declaration[]) tupleDeclarations.toArray( new Declaration[tupleDeclarations.size()] );
+        final Declaration[] localDeclarations = (Declaration[]) factDeclarations.toArray( new Declaration[factDeclarations.size()] );
         final ReturnValueRestriction returnValueRestriction = new ReturnValueRestriction( extractor,
                                                                                           previousDeclarations,
                                                                                           localDeclarations,
                                                                                           evaluator );
 
-        ReturnValueBuilder builder = (ReturnValueBuilder) this.dialect.getReturnValueBuilder();
+        final ReturnValueBuilder builder = this.dialect.getReturnValueBuilder();
 
         builder.build( context,
                        utils,
@@ -627,7 +627,7 @@
                                              final BaseDescr descr,
                                              final ObjectType objectType,
                                              final String fieldName,
-                                             final boolean reportError ) {
+                                             final boolean reportError) {
         FieldExtractor extractor = null;
 
         if ( objectType.getValueType() == ValueType.FACTTEMPLATE_TYPE ) {
@@ -640,7 +640,7 @@
                 extractor = utils.getClassFieldExtractorCache().getExtractor( ((ClassObjectType) objectType).getClassType(),
                                                                               fieldName );
             } catch ( final RuntimeDroolsException e ) {
-                if( reportError ) {
+                if ( reportError ) {
                     context.getErrors().add( new RuleError( context.getRule(),
                                                             descr,
                                                             e,

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ConditionalElementBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ConditionalElementBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ConditionalElementBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -29,7 +29,7 @@
 public interface ConditionalElementBuilder {
 
     public ConditionalElement build(final BuildContext context,
-                                    final BuildUtils utils, 
+                                    final BuildUtils utils,
                                     final ColumnBuilder columnBuilder,
                                     final BaseDescr descr);
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/Dialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/Dialect.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/Dialect.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -5,37 +5,36 @@
 import org.codehaus.jfdi.interpreter.TypeResolver;
 import org.drools.lang.descr.FunctionDescr;
 import org.drools.lang.descr.RuleDescr;
-import org.drools.reteoo.builder.EvalBuilder;
 import org.drools.rule.Package;
 import org.drools.rule.Rule;
 
 public interface Dialect {
     ConditionalElementBuilder getEvalBuilder();
-    
+
     AccumulateBuilder getAccumulateBuilder();
-    
+
     PredicateBuilder getPredicateBuilder();
-    
+
     ReturnValueBuilder getReturnValueBuilder();
-    
-    ConsequenceBuilder getConsequenceBuilder();    
-    
+
+    ConsequenceBuilder getConsequenceBuilder();
+
     RuleClassBuilder getRuleClassBuilder();
-    
+
     FromBuilder getFromBuilder();
-    
+
     void compileAll();
-    
+
     void addRuleSemantics(final RuleBuilder builder,
                           final Rule rule,
                           final RuleDescr ruleDescr);
-    
+
     void addFunction(final FunctionDescr functionDescr,
                      TypeResolver typeResolver);
-    
+
     List getResults();
-    
+
     void init(Package pkg);
-    
+
     void init(RuleDescr ruleDescr);
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ForallBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ForallBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ForallBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -37,32 +37,36 @@
     /* (non-Javadoc)
      * @see org.drools.semantics.java.builder.ConditionalElementBuilder#build(org.drools.semantics.java.builder.BuildContext, org.drools.semantics.java.builder.BuildUtils, org.drools.semantics.java.builder.ColumnBuilder, org.drools.lang.descr.BaseDescr)
      */
-    public ConditionalElement build(BuildContext context,
-                                    BuildUtils utils,
-                                    ColumnBuilder columnBuilder,
-                                    BaseDescr descr) {
-        ForallDescr forallDescr = (ForallDescr) descr;
-        
-        Column baseColumn = columnBuilder.build( context, utils, forallDescr.getBaseColumn() );
+    public ConditionalElement build(final BuildContext context,
+                                    final BuildUtils utils,
+                                    final ColumnBuilder columnBuilder,
+                                    final BaseDescr descr) {
+        final ForallDescr forallDescr = (ForallDescr) descr;
 
+        final Column baseColumn = columnBuilder.build( context,
+                                                 utils,
+                                                 forallDescr.getBaseColumn() );
+
         if ( baseColumn == null ) {
             return null;
         }
 
-        Forall forall = new Forall( baseColumn );
-        
+        final Forall forall = new Forall( baseColumn );
+
         // adding the newly created forall CE to the build stack
         // this is necessary in case of local declaration usage
         context.getBuildStack().push( forall );
-        
-        for( Iterator it = forallDescr.getRemainingColumns().iterator(); it.hasNext(); ) {
-            Column anotherColumn = columnBuilder.build( context, utils, (ColumnDescr) it.next() );
+
+        for ( final Iterator it = forallDescr.getRemainingColumns().iterator(); it.hasNext(); ) {
+            final Column anotherColumn = columnBuilder.build( context,
+                                                        utils,
+                                                        (ColumnDescr) it.next() );
             forall.addRemainingColumn( anotherColumn );
         }
-        
+
         // poping the forall
         context.getBuildStack().pop();
-        
+
         return forall;
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/GroupElementBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/GroupElementBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/GroupElementBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -43,29 +43,29 @@
     /* (non-Javadoc)
      * @see org.drools.semantics.java.builder.ConditionalElementBuilder#build(org.drools.semantics.java.builder.BuildContext, org.drools.semantics.java.builder.BuildUtils, org.drools.semantics.java.builder.ColumnBuilder, org.drools.lang.descr.BaseDescr)
      */
-    public ConditionalElement build(BuildContext context,
-                                    BuildUtils utils,
-                                    ColumnBuilder columnBuilder,
-                                    BaseDescr descr) {
-        ConditionalElementDescr cedescr = (ConditionalElementDescr) descr;
+    public ConditionalElement build(final BuildContext context,
+                                    final BuildUtils utils,
+                                    final ColumnBuilder columnBuilder,
+                                    final BaseDescr descr) {
+        final ConditionalElementDescr cedescr = (ConditionalElementDescr) descr;
 
         final GroupElement ge = this.newGroupElementFor( cedescr.getClass() );
         context.getBuildStack().push( ge );
 
         // iterate over child descriptors
-        for ( Iterator it = cedescr.getDescrs().iterator(); it.hasNext(); ) {
+        for ( final Iterator it = cedescr.getDescrs().iterator(); it.hasNext(); ) {
             // gets child to build
-            BaseDescr child = (BaseDescr) it.next();
+            final BaseDescr child = (BaseDescr) it.next();
 
             // gets corresponding builder
-            ConditionalElementBuilder cebuilder = utils.getBuilder( child.getClass() );
+            final ConditionalElementBuilder cebuilder = utils.getBuilder( child.getClass() );
 
             if ( cebuilder != null ) {
-                ConditionalElement ce = cebuilder.build( context,
+                final ConditionalElement ce = cebuilder.build( context,
                                                          utils,
                                                          columnBuilder,
-                                                         (BaseDescr) child );
-                if( ce != null ) {
+                                                         child );
+                if ( ce != null ) {
                     ge.addChild( ce );
                 }
             } else if ( child instanceof ColumnDescr ) {
@@ -74,22 +74,22 @@
                                                            (ColumnDescr) child );
                 // in case there is a problem with the column building,
                 // builder will return null. Ex: ClassNotFound for the column type
-                if( column != null ) {
+                if ( column != null ) {
                     ge.addChild( column );
                 }
 
             } else {
-                throw new RuntimeDroolsException("BUG: no builder found for descriptor class "+child.getClass() );
+                throw new RuntimeDroolsException( "BUG: no builder found for descriptor class " + child.getClass() );
             }
 
         }
 
         context.getBuildStack().pop();
-        
+
         return ge;
     }
 
-    private GroupElement newGroupElementFor(Class descr) {
+    private GroupElement newGroupElementFor(final Class descr) {
         if ( AndDescr.class.isAssignableFrom( descr ) ) {
             return GroupElementFactory.newAndInstance();
         } else if ( OrDescr.class.isAssignableFrom( descr ) ) {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -43,13 +43,8 @@
 import org.drools.rule.Rule;
 import org.drools.rule.builder.dialect.java.BuildUtils;
 import org.drools.rule.builder.dialect.java.DeclarationTypeFixer;
-import org.drools.rule.builder.dialect.java.JavaAccumulateBuilder;
-import org.drools.rule.builder.dialect.java.JavaConsequenceBuilder;
-import org.drools.rule.builder.dialect.java.JavaEvalBuilder;
 import org.drools.rule.builder.dialect.java.JavaExprAnalyzer;
 import org.drools.rule.builder.dialect.java.KnowledgeHelperFixer;
-import org.drools.rule.builder.dialect.java.JavaRuleClassBuilder;
-import org.drools.rule.builder.dialect.mvel.MVELFromBuilder;
 
 /**
  * This builds the rule structure from an AST.
@@ -81,7 +76,7 @@
     // Constructor
     public RuleBuilder(final TypeResolver typeResolver,
                        final ClassFieldExtractorCache cache,
-                       Dialect dialect) {
+                       final Dialect dialect) {
 
         this.dialect = dialect;
 
@@ -90,43 +85,43 @@
         // if we want to
         this.builders = new HashMap();
 
-        builders.put( CollectDescr.class,
+        this.builders.put( CollectDescr.class,
                       new CollectBuilder() );
 
-        builders.put( ForallDescr.class,
+        this.builders.put( ForallDescr.class,
                       new ForallBuilder() );
-        GroupElementBuilder gebuilder = new GroupElementBuilder();
-        builders.put( AndDescr.class,
+        final GroupElementBuilder gebuilder = new GroupElementBuilder();
+        this.builders.put( AndDescr.class,
                       gebuilder );
-        builders.put( OrDescr.class,
+        this.builders.put( OrDescr.class,
                       gebuilder );
-        builders.put( NotDescr.class,
+        this.builders.put( NotDescr.class,
                       gebuilder );
-        builders.put( ExistsDescr.class,
+        this.builders.put( ExistsDescr.class,
                       gebuilder );
 
         // dialect specific        
         this.columnBuilder = new ColumnBuilder( this.dialect );
 
-        builders.put( FromDescr.class,
+        this.builders.put( FromDescr.class,
                       this.dialect.getFromBuilder() );
 
-        builders.put( AccumulateDescr.class,
+        this.builders.put( AccumulateDescr.class,
                       this.dialect.getAccumulateBuilder() );
 
-        builders.put( EvalDescr.class,
+        this.builders.put( EvalDescr.class,
                       this.dialect.getEvalBuilder() );
 
-        this.consequenceBuilder = (ConsequenceBuilder) this.dialect.getConsequenceBuilder();
+        this.consequenceBuilder = this.dialect.getConsequenceBuilder();
 
-        this.classBuilder = (RuleClassBuilder) this.dialect.getRuleClassBuilder();
+        this.classBuilder = this.dialect.getRuleClassBuilder();
 
         this.utils = new BuildUtils( new KnowledgeHelperFixer(),
                                      new DeclarationTypeFixer(),
                                      new JavaExprAnalyzer(),
                                      typeResolver,
                                      cache,
-                                     builders );
+                                     this.builders );
     }
 
     public Map getInvokers() {
@@ -178,9 +173,9 @@
         setAttributes( this.context.getRule(),
                        ruleDescr.getAttributes() );
 
-        ConditionalElementBuilder builder = utils.getBuilder( ruleDescr.getLhs().getClass() );
+        final ConditionalElementBuilder builder = this.utils.getBuilder( ruleDescr.getLhs().getClass() );
         if ( builder != null ) {
-            GroupElement ce = (GroupElement) builder.build( this.context,
+            final GroupElement ce = (GroupElement) builder.build( this.context,
                                                             this.utils,
                                                             this.columnBuilder,
                                                             ruleDescr.getLhs() );
@@ -238,7 +233,7 @@
                 rule.setRuleFlowGroup( attributeDescr.getValue() );
             } else if ( name.equals( "lock-on-active" ) ) {
                 if ( attributeDescr.getValue() == null ) {
-                    rule.setLockOnActive(true );
+                    rule.setLockOnActive( true );
                 } else {
                     rule.setLockOnActive( Boolean.valueOf( attributeDescr.getValue() ).booleanValue() );
                 }
@@ -252,11 +247,11 @@
                     rule.setEnabled( Boolean.valueOf( attributeDescr.getValue() ).booleanValue() );
                 }
             } else if ( name.equals( "date-effective" ) ) {
-                Calendar cal = Calendar.getInstance();
+                final Calendar cal = Calendar.getInstance();
                 cal.setTime( DateFactory.parseDate( attributeDescr.getValue() ) );
                 rule.setDateEffective( cal );
             } else if ( name.equals( "date-expires" ) ) {
-                Calendar cal = Calendar.getInstance();
+                final Calendar cal = Calendar.getInstance();
                 cal.setTime( DateFactory.parseDate( attributeDescr.getValue() ) );
                 rule.setDateExpires( cal );
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/BuildUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/BuildUtils.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/BuildUtils.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -32,7 +32,6 @@
 import org.drools.rule.Declaration;
 import org.drools.rule.builder.BuildContext;
 import org.drools.rule.builder.ConditionalElementBuilder;
-import org.drools.rule.builder.RuleBuilder;
 
 /**
  * A holder class for utility functions
@@ -49,7 +48,7 @@
                                                                                    AngleBracketTemplateLexer.class );
 
     private final KnowledgeHelperFixer     knowledgeHelperFixer;
-  
+
     private final DeclarationTypeFixer     typeFixer;
 
     private final JavaExprAnalyzer         analyzer;
@@ -57,7 +56,7 @@
     private final TypeResolver             typeResolver;
 
     private final ClassFieldExtractorCache classFieldExtractorCache;
-    
+
     private final Map                      builders;
 
     public BuildUtils(final KnowledgeHelperFixer knowledgeHelperFixer,
@@ -65,7 +64,7 @@
                       final JavaExprAnalyzer analyzer,
                       final TypeResolver typeResolver,
                       final ClassFieldExtractorCache classFieldExtractorCache,
-                      final Map builders ) {
+                      final Map builders) {
         this.knowledgeHelperFixer = knowledgeHelperFixer;
         this.typeFixer = typeFixer;
         this.analyzer = analyzer;
@@ -123,7 +122,7 @@
                                             final String[] globals) {
         final String[] declarationTypes = new String[declarations.length];
         for ( int i = 0, size = declarations.length; i < size; i++ ) {
-            declarationTypes[i] = this.typeFixer.fix( declarations[i] ); 
+            declarationTypes[i] = this.typeFixer.fix( declarations[i] );
         }
 
         final List globalTypes = new ArrayList( globals.length );
@@ -158,7 +157,7 @@
      * @return
      */
     public StringTemplateGroup getInvokerGroup() {
-        return invokerGroup;
+        return this.invokerGroup;
     }
 
     /**
@@ -166,7 +165,7 @@
      * @return
      */
     public StringTemplateGroup getRuleGroup() {
-        return ruleGroup;
+        return this.ruleGroup;
     }
 
     /**
@@ -174,7 +173,7 @@
      * @return
      */
     public KnowledgeHelperFixer getKnowledgeHelperFixer() {
-        return knowledgeHelperFixer;
+        return this.knowledgeHelperFixer;
     }
 
     /**
@@ -190,7 +189,7 @@
      * @return
      */
     public ClassFieldExtractorCache getClassFieldExtractorCache() {
-        return classFieldExtractorCache;
+        return this.classFieldExtractorCache;
     }
 
     /**
@@ -198,7 +197,7 @@
      * @return
      */
     public Map getBuilders() {
-        return builders;
+        return this.builders;
     }
 
     /**
@@ -206,15 +205,15 @@
      * @param descr
      * @return
      */
-    public ConditionalElementBuilder getBuilder(Class descr) {
-        return (ConditionalElementBuilder) builders.get( descr );
+    public ConditionalElementBuilder getBuilder(final Class descr) {
+        return (ConditionalElementBuilder) this.builders.get( descr );
     }
 
     /**
      * @return the typeFixer
      */
     public DeclarationTypeFixer getTypeFixer() {
-        return typeFixer;
+        return this.typeFixer;
     }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/DeclarationTypeFixer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/DeclarationTypeFixer.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/DeclarationTypeFixer.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -11,14 +11,15 @@
  *
  */
 public class DeclarationTypeFixer {
-    
-    public String fix(Declaration declaration) {
-        Class classType = declaration.getExtractor().getExtractToClass();
-        if (classType.isArray()) {
-            return classType.getComponentType().getName().concat("[]");
+
+    public String fix(final Declaration declaration) {
+        final Class classType = declaration.getExtractor().getExtractToClass();
+        if ( classType.isArray() ) {
+            return classType.getComponentType().getName().concat( "[]" );
         } else {
             // Does this replacement usefull in the declaration type ??
-            return classType.getName().replace('$', '.');
+            return classType.getName().replace( '$',
+                                                '.' );
         }
     }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -38,7 +38,8 @@
  */
 public class JavaAccumulateBuilder
     implements
-    ConditionalElementBuilder, AccumulateBuilder {
+    ConditionalElementBuilder,
+    AccumulateBuilder {
 
     /* (non-Javadoc)
      * @see org.drools.semantics.java.builder.ConditionalElementBuilder#build(org.drools.semantics.java.builder.BuildContext, org.drools.semantics.java.builder.BuildUtils, org.drools.semantics.java.builder.ColumnBuilder, org.drools.lang.descr.BaseDescr)
@@ -46,14 +47,14 @@
     /* (non-Javadoc)
      * @see org.drools.semantics.java.builder.AccumulateBuilder#build(org.drools.semantics.java.builder.BuildContext, org.drools.semantics.java.builder.BuildUtils, org.drools.semantics.java.builder.ColumnBuilder, org.drools.lang.descr.BaseDescr)
      */
-    public ConditionalElement build(BuildContext context,
-                                    BuildUtils utils,
-                                    ColumnBuilder columnBuilder,
-                                    BaseDescr descr) {
+    public ConditionalElement build(final BuildContext context,
+                                    final BuildUtils utils,
+                                    final ColumnBuilder columnBuilder,
+                                    final BaseDescr descr) {
 
-        AccumulateDescr accumDescr = (AccumulateDescr) descr;
+        final AccumulateDescr accumDescr = (AccumulateDescr) descr;
 
-        Column sourceColumn = columnBuilder.build( context,
+        final Column sourceColumn = columnBuilder.build( context,
                                                    utils,
                                                    accumDescr.getSourceColumn() );
 
@@ -61,7 +62,7 @@
             return null;
         }
 
-        Column resultColumn = columnBuilder.build( context,
+        final Column resultColumn = columnBuilder.build( context,
                                                    utils,
                                                    accumDescr.getResultColumn() );
 
@@ -69,11 +70,11 @@
         accumDescr.setClassMethodName( className );
 
         final List[] usedIdentifiers1 = utils.getUsedCIdentifiers( context,
-                                                                  accumDescr,
-                                                                  accumDescr.getInitCode() );
+                                                                   accumDescr,
+                                                                   accumDescr.getInitCode() );
         final List[] usedIdentifiers2 = utils.getUsedCIdentifiers( context,
-                                                                  accumDescr,
-                                                                  accumDescr.getActionCode() );
+                                                                   accumDescr,
+                                                                   accumDescr.getActionCode() );
         final List[] usedIdentifiers3 = utils.getUsedIdentifiers( context,
                                                                   accumDescr,
                                                                   accumDescr.getResultCode() );
@@ -88,7 +89,7 @@
 
         final Declaration[] declarations = new Declaration[requiredDeclarations.size()];
         for ( int i = 0, size = requiredDeclarations.size(); i < size; i++ ) {
-            declarations[i] = (Declaration) context.getDeclarationResolver().getDeclaration( (String) requiredDeclarations.get( i ) );
+            declarations[i] = context.getDeclarationResolver().getDeclaration( (String) requiredDeclarations.get( i ) );
         }
         final Declaration[] sourceDeclArr = (Declaration[]) sourceColumn.getOuterDeclarations().values().toArray( new Declaration[0] );
 
@@ -148,7 +149,7 @@
         st.setAttribute( "hashCode",
                          actionCode.hashCode() );
 
-        Accumulate accumulate = new Accumulate( sourceColumn,
+        final Accumulate accumulate = new Accumulate( sourceColumn,
                                                 resultColumn,
                                                 declarations,
                                                 sourceDeclArr );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -61,7 +61,7 @@
         final Declaration[] declarations = new Declaration[usedIdentifiers[0].size()];
 
         for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
-            declarations[i] = (Declaration) context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
+            declarations[i] = context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
         }
 
         utils.setStringTemplateAttributes( context,
@@ -92,8 +92,8 @@
         // Must use the rule declarations, so we use the same order as used in the generated invoker
         final List list = Arrays.asList( context.getRule().getDeclarations() );
 
-        final int[] indexes = new int[declarations.length];       
-        
+        final int[] indexes = new int[declarations.length];
+
         // have to user a String[] as boolean[] is broken in stringtemplate
         final String[] notColumns = new String[declarations.length];
         for ( int i = 0, length = declarations.length; i < length; i++ ) {
@@ -107,14 +107,15 @@
 
         st.setAttribute( "indexes",
                          indexes );
-        
-        st.setAttribute( "notColumns", notColumns);
 
+        st.setAttribute( "notColumns",
+                         notColumns );
+
         st.setAttribute( "text",
                          ruleDescr.getConsequence() );
 
-        final String invokerClassName = context.getPkg().getName() + "." + ruleDescr.getClassName() + utils.ucFirst( className ) + "Invoker";        
-        
+        final String invokerClassName = context.getPkg().getName() + "." + ruleDescr.getClassName() + utils.ucFirst( className ) + "Invoker";
+
         context.getInvokers().put( invokerClassName,
                                    st.toString() );
         context.getInvokerLookups().put( invokerClassName,

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -34,7 +34,6 @@
 import org.drools.lang.descr.NotDescr;
 import org.drools.lang.descr.OrDescr;
 import org.drools.lang.descr.RuleDescr;
-import org.drools.reteoo.builder.EvalBuilder;
 import org.drools.rule.LineMappings;
 import org.drools.rule.Package;
 import org.drools.rule.Rule;
@@ -59,14 +58,14 @@
     implements
     Dialect {
 
-    private JavaAccumulateBuilder accumulate = new JavaAccumulateBuilder();
-    private JavaConsequenceBuilder consequence = new JavaConsequenceBuilder();
-    private JavaEvalBuilder eval = new JavaEvalBuilder();
-    private JavaPredicateBuilder predicate = new JavaPredicateBuilder();
-    private JavaReturnValueBuilder returnValue = new JavaReturnValueBuilder();
-    private JavaRuleClassBuilder rule = new JavaRuleClassBuilder();
-    private MVELFromBuilder from = new MVELFromBuilder();
-    
+    private final JavaAccumulateBuilder       accumulate  = new JavaAccumulateBuilder();
+    private final JavaConsequenceBuilder      consequence = new JavaConsequenceBuilder();
+    private final JavaEvalBuilder             eval        = new JavaEvalBuilder();
+    private final JavaPredicateBuilder        predicate   = new JavaPredicateBuilder();
+    private final JavaReturnValueBuilder      returnValue = new JavaReturnValueBuilder();
+    private final JavaRuleClassBuilder        rule        = new JavaRuleClassBuilder();
+    private final MVELFromBuilder             from        = new MVELFromBuilder();
+
     private Package                     pkg;
     private JavaCompiler                compiler;
     private List                        generatedClassList;
@@ -80,21 +79,21 @@
     private Map                         errorHandlers;
 
     private List                        results;
-    
+
     // a map of registered builders
-    private Map                builders;
+    private Map                         builders;
 
     // the builder for columns
-    private ColumnBuilder      columnBuilder;
+    private ColumnBuilder               columnBuilder;
 
     // the builder for the consequence
-    private ConsequenceBuilder consequenceBuilder;
+    private ConsequenceBuilder          consequenceBuilder;
 
     // the builder for the rule class
-    private RuleClassBuilder   classBuilder;
+    private RuleClassBuilder            classBuilder;
 
     public JavaDialect(final Package pkg,
-                          PackageBuilderConfiguration configuration) {
+                       final PackageBuilderConfiguration configuration) {
         this.pkg = pkg;
         this.configuration = configuration;
         loadCompiler();
@@ -102,49 +101,49 @@
         if ( pkg != null ) {
             init( pkg );
         }
-        
+
         initBuilder();
-    }  
-    
+    }
+
     public void initBuilder() {
         // statically adding all builders to the map
         // but in the future we can move that to a configuration
         // if we want to
         this.builders = new HashMap();
 
-        builders.put( CollectDescr.class,
+        this.builders.put( CollectDescr.class,
                       new CollectBuilder() );
 
-        builders.put( ForallDescr.class,
+        this.builders.put( ForallDescr.class,
                       new ForallBuilder() );
-        GroupElementBuilder gebuilder = new GroupElementBuilder();
-        builders.put( AndDescr.class,
+        final GroupElementBuilder gebuilder = new GroupElementBuilder();
+        this.builders.put( AndDescr.class,
                       gebuilder );
-        builders.put( OrDescr.class,
+        this.builders.put( OrDescr.class,
                       gebuilder );
-        builders.put( NotDescr.class,
+        this.builders.put( NotDescr.class,
                       gebuilder );
-        builders.put( ExistsDescr.class,
+        this.builders.put( ExistsDescr.class,
                       gebuilder );
 
         // dialect specific        
         this.columnBuilder = new ColumnBuilder( this );
 
-        builders.put( FromDescr.class,
+        this.builders.put( FromDescr.class,
                       getFromBuilder() );
 
-        builders.put( AccumulateDescr.class,
+        this.builders.put( AccumulateDescr.class,
                       getAccumulateBuilder() );
 
-        builders.put( EvalDescr.class,
+        this.builders.put( EvalDescr.class,
                       getEvalBuilder() );
 
-        this.consequenceBuilder = (ConsequenceBuilder) getConsequenceBuilder();
+        this.consequenceBuilder = getConsequenceBuilder();
 
-        this.classBuilder = (RuleClassBuilder) getRuleClassBuilder();        
+        this.classBuilder = getRuleClassBuilder();
     }
-    
-    public void init(Package pkg) {
+
+    public void init(final Package pkg) {
         this.pkg = pkg;
         this.errorHandlers = new HashMap();
 
@@ -162,17 +161,15 @@
 
         this.results = new ArrayList();
     }
-    
-    public void init(RuleDescr ruleDescr) {
+
+    public void init(final RuleDescr ruleDescr) {
         final String ruleClassName = getUniqueLegalName( this.pkg.getName(),
                                                          ruleDescr.getName(),
                                                          "java",
                                                          this.src );
         ruleDescr.setClassName( ucFirst( ruleClassName ) );
-    }    
-    
-    
-    
+    }
+
     public AccumulateBuilder getAccumulateBuilder() {
         return this.accumulate;
     }
@@ -196,10 +193,10 @@
     public RuleClassBuilder getRuleClassBuilder() {
         return this.rule;
     }
-    
+
     public FromBuilder getFromBuilder() {
         return this.from;
-    }    
+    }
 
     /**
      * This actually triggers the compiling of all the resources.
@@ -293,8 +290,8 @@
         }
 
         // setup the line mappins for this rule
-        String name = pkg.getName() + "." + ucFirst( ruleDescr.getClassName() );
-        LineMappings mapping = new LineMappings( name );
+        final String name = this.pkg.getName() + "." + ucFirst( ruleDescr.getClassName() );
+        final LineMappings mapping = new LineMappings( name );
         mapping.setStartLine( ruleDescr.getConsequenceLine() );
         mapping.setOffset( ruleDescr.getConsequenceOffset() );
         this.lineMappings.put( name,
@@ -302,9 +299,9 @@
     }
 
     public void addFunction(final FunctionDescr functionDescr,
-                            TypeResolver typeResolver) {
+                            final TypeResolver typeResolver) {
 
-        String functionClassName = this.pkg.getName() + "." + ucFirst( functionDescr.getName() );
+        final String functionClassName = this.pkg.getName() + "." + ucFirst( functionDescr.getName() );
         this.pkg.addStaticImport( functionClassName + "." + functionDescr.getName() );
         functionDescr.setClassName( functionClassName );
 
@@ -316,12 +313,12 @@
                              builder.build( this.pkg,
                                             functionDescr,
                                             typeResolver,
-                                            lineMappings ),
+                                            this.lineMappings ),
                              this.src,
                              new FunctionErrorHandler( functionDescr,
                                                        "Function Compilation error" ) );
 
-        LineMappings mapping = new LineMappings( functionClassName );
+        final LineMappings mapping = new LineMappings( functionClassName );
         mapping.setStartLine( functionDescr.getLine() );
         mapping.setOffset( functionDescr.getOffset() );
         this.lineMappings.put( functionClassName,
@@ -353,7 +350,7 @@
         addClassName( fileName );
     }
 
-    public void addClassName(String className) {
+    public void addClassName(final String className) {
         this.generatedClassList.add( className );
     }
 
@@ -369,7 +366,7 @@
             case PackageBuilderConfiguration.ECLIPSE :
             default : {
                 final EclipseJavaCompilerSettings eclipseSettings = new EclipseJavaCompilerSettings();
-                Map map = eclipseSettings.getMap();
+                final Map map = eclipseSettings.getMap();
                 String lngLevel = this.configuration.getJavaLanguageLevel();
                 map.put( CompilerOptions.OPTION_TargetPlatform,
                          lngLevel );
@@ -428,6 +425,5 @@
     private String ucFirst(final String name) {
         return name.toUpperCase().charAt( 0 ) + name.substring( 1 );
     }
-    
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -51,10 +51,10 @@
                                     final ColumnBuilder columnBuilder,
                                     final BaseDescr descr) {
         // it must be an EvalDescr
-        EvalDescr evalDescr = (EvalDescr) descr;
+        final EvalDescr evalDescr = (EvalDescr) descr;
 
         final String className = "eval" + context.getNextId();
-        
+
         evalDescr.setClassMethodName( className );
 
         final List[] usedIdentifiers = utils.getUsedIdentifiers( context,
@@ -63,7 +63,7 @@
 
         final Declaration[] declarations = new Declaration[usedIdentifiers[0].size()];
         for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
-            declarations[i] = (Declaration) context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
+            declarations[i] = context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
         }
 
         final EvalCondition eval = new EvalCondition( declarations );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaExprAnalyzer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaExprAnalyzer.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaExprAnalyzer.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -104,9 +104,9 @@
      */
     private List[] analyze(final List identifiers,
                            final Set[] availableIdentifiers) throws RecognitionException {
-        Set notBound = new HashSet( identifiers );
-        final List[] used = new List[availableIdentifiers.length+1];
-        for ( int i = 0, length = used.length; i < length-1; i++ ) {
+        final Set notBound = new HashSet( identifiers );
+        final List[] used = new List[availableIdentifiers.length + 1];
+        for ( int i = 0, length = used.length; i < length - 1; i++ ) {
             used[i] = new ArrayList();
         }
 
@@ -120,7 +120,7 @@
                 }
             }
         }
-        used[used.length-1] = new ArrayList( notBound );
+        used[used.length - 1] = new ArrayList( notBound );
 
         return used;
         //--------------------------------------------------------        

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -58,15 +58,15 @@
         st.setAttribute( "parameterNames",
                          functionDescr.getParameterNames() );
 
-        Map params = new HashMap();
-        List names = functionDescr.getParameterNames();
-        List types = functionDescr.getParameterTypes();
+        final Map params = new HashMap();
+        final List names = functionDescr.getParameterNames();
+        final List types = functionDescr.getParameterTypes();
         try {
             for ( int i = 0, size = names.size(); i < size; i++ ) {
                 params.put( names.get( i ),
                             typeResolver.resolveType( (String) types.get( i ) ) );
             }
-        } catch ( ClassNotFoundException e ) {
+        } catch ( final ClassNotFoundException e ) {
             // todo : must be a better way so we don't have to try/catch each resolveType call
             throw new RuntimeDroolsException( e );
         }
@@ -74,11 +74,11 @@
         st.setAttribute( "text",
                          functionDescr.getText() );
 
-        String text = st.toString();
+        final String text = st.toString();
 
-        BufferedReader reader = new BufferedReader( new StringReader( text ) );
+        final BufferedReader reader = new BufferedReader( new StringReader( text ) );
         String line = null;
-        String lineStartsWith = "    public static " + functionDescr.getReturnType() + " " + functionDescr.getName();
+        final String lineStartsWith = "    public static " + functionDescr.getReturnType() + " " + functionDescr.getName();
         int offset = 0;
         try {
             while ( (line = reader.readLine()) != null ) {
@@ -88,13 +88,13 @@
                 }
             }
             functionDescr.setOffset( offset );
-        } catch ( IOException e ) {
+        } catch ( final IOException e ) {
             // won't ever happen, it's just reading over a string.
             throw new RuntimeDroolsException( "Error determining start offset with function" );
         }
 
-        String name = pkg.getName() + "." + ucFirst( functionDescr.getName() );
-        LineMappings mapping = new LineMappings( name );
+        final String name = pkg.getName() + "." + ucFirst( functionDescr.getName() );
+        final LineMappings mapping = new LineMappings( name );
         mapping.setStartLine( functionDescr.getLine() );
         mapping.setOffset( functionDescr.getOffset() );
         lineMappings.put( name,

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaReturnValueBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaReturnValueBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaReturnValueBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -9,7 +9,9 @@
 import org.drools.rule.builder.BuildContext;
 import org.drools.rule.builder.ReturnValueBuilder;
 
-public class JavaReturnValueBuilder implements ReturnValueBuilder {
+public class JavaReturnValueBuilder
+    implements
+    ReturnValueBuilder {
     public void build(final BuildContext context,
                       final BuildUtils utils,
                       final List[] usedIdentifiers,

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaRuleClassBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaRuleClassBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaRuleClassBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -26,14 +26,16 @@
  * @author etirelli
  *
  */
-public class JavaRuleClassBuilder implements RuleClassBuilder {
+public class JavaRuleClassBuilder
+    implements
+    RuleClassBuilder {
 
     /* (non-Javadoc)
      * @see org.drools.rule.builder.dialect.java.RuleClassBuilder#buildRule(org.drools.rule.builder.BuildContext, org.drools.rule.builder.dialect.java.BuildUtils, org.drools.lang.descr.RuleDescr)
      */
     public void buildRule(final BuildContext context,
-                           final BuildUtils utils,
-                           final RuleDescr ruleDescr) {
+                          final BuildUtils utils,
+                          final RuleDescr ruleDescr) {
         // If there is no compiled code, return
         if ( context.getMethods().isEmpty() ) {
             context.setRuleClass( null );
@@ -47,10 +49,10 @@
         for ( final Iterator it = context.getPkg().getImports().iterator(); it.hasNext(); ) {
             buffer.append( "import " + it.next() + ";" + lineSeparator );
         }
-        
+
         for ( final Iterator it = context.getPkg().getStaticImports().iterator(); it.hasNext(); ) {
             buffer.append( "import static " + it.next() + ";" + lineSeparator );
-        }        
+        }
 
         buffer.append( "public class " + utils.ucFirst( ruleDescr.getClassName() ) + " {" + lineSeparator );
         buffer.append( "    private static final long serialVersionUID  = 320L;" + lineSeparator );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixer.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixer.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -78,7 +78,7 @@
             }
 
             final String replacement = escapeDollarSigns( replacer,
-                                                    obj );
+                                                          obj );
             return pre + matcher.replaceAll( replacement ) + post;
 
         } else {
@@ -93,9 +93,9 @@
     private String escapeDollarSigns(final Replacer replacer,
                                      final String obj) {
         return KnowledgeHelperFixer.replace( replacer.getReplacement( obj ),
-                             "$",
-                             "\\$",
-                             256 );
+                                             "$",
+                                             "\\$",
+                                             256 );
     }
 
     static interface Replacer {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaParserLexer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaParserLexer.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaParserLexer.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,5505 +1,5331 @@
 // $ANTLR 3.0b5 D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g 2006-11-22 14:58:23
-
-	package org.drools.rule.builder.dialect.java.parser;
 
+package org.drools.rule.builder.dialect.java.parser;
 
 import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
 
 public class JavaParserLexer extends Lexer {
-    public static final int SR_ASSIGN=22;
-    public static final int COMMA=12;
-    public static final int MINUS=44;
-    public static final int T70=70;
-    public static final int T74=74;
-    public static final int T85=85;
-    public static final int BOR=31;
-    public static final int DOT=7;
-    public static final int SR=41;
-    public static final int T102=102;
-    public static final int LCURLY=9;
-    public static final int T114=114;
-    public static final int T103=103;
-    public static final int STRING_LITERAL=53;
-    public static final int LE=38;
-    public static final int T81=81;
-    public static final int RPAREN=14;
-    public static final int STAR_ASSIGN=19;
-    public static final int NUM_INT=51;
-    public static final int PLUS=43;
-    public static final int MINUS_ASSIGN=18;
-    public static final int T113=113;
-    public static final int T109=109;
-    public static final int IDENT=6;
-    public static final int DECIMAL_LITERAL=58;
-    public static final int T68=68;
-    public static final int T73=73;
-    public static final int T84=84;
-    public static final int MOD_ASSIGN=21;
-    public static final int T78=78;
-    public static final int T115=115;
-    public static final int WS=55;
-    public static final int LT=36;
-    public static final int BSR=42;
-    public static final int SL_ASSIGN=24;
-    public static final int T96=96;
-    public static final int T71=71;
-    public static final int T72=72;
-    public static final int T94=94;
-    public static final int LAND=30;
-    public static final int LBRACK=4;
-    public static final int T76=76;
-    public static final int NUM_FLOAT=54;
-    public static final int SEMI=10;
-    public static final int GE=39;
-    public static final int LNOT=50;
-    public static final int DIV_ASSIGN=20;
-    public static final int T75=75;
-    public static final int UNICODE_CHAR=66;
-    public static final int EQUAL=35;
-    public static final int T89=89;
-    public static final int OCTAL_DIGIT=65;
-    public static final int COLON=16;
-    public static final int SL=40;
-    public static final int T82=82;
-    public static final int DIV=45;
-    public static final int T100=100;
-    public static final int EXPONENT_PART=62;
-    public static final int T79=79;
-    public static final int LOR=29;
-    public static final int BNOT=49;
-    public static final int INC=47;
-    public static final int T93=93;
-    public static final int T107=107;
-    public static final int MOD=46;
-    public static final int OCTAL_LITERAL=60;
-    public static final int PLUS_ASSIGN=17;
-    public static final int T83=83;
-    public static final int QUESTION=28;
-    public static final int HEX_LITERAL=59;
-    public static final int T101=101;
-    public static final int FLOAT_TYPE_SUFFIX=63;
-    public static final int RCURLY=11;
-    public static final int T91=91;
-    public static final int T105=105;
-    public static final int T86=86;
-    public static final int CHAR_LITERAL=52;
-    public static final int BOR_ASSIGN=27;
-    public static final int ASSIGN=15;
-    public static final int LPAREN=13;
-    public static final int T111=111;
-    public static final int HEX_DIGIT=67;
-    public static final int T77=77;
-    public static final int ML_COMMENT=57;
-    public static final int SL_COMMENT=56;
-    public static final int BAND=33;
-    public static final int T106=106;
-    public static final int T112=112;
-    public static final int T69=69;
-    public static final int NOT_EQUAL=34;
-    public static final int BAND_ASSIGN=25;
-    public static final int T95=95;
-    public static final int DIGITS=61;
-    public static final int T110=110;
-    public static final int T108=108;
-    public static final int T92=92;
-    public static final int BXOR_ASSIGN=26;
-    public static final int GT=37;
-    public static final int BSR_ASSIGN=23;
-    public static final int T88=88;
-    public static final int T98=98;
-    public static final int T87=87;
-    public static final int T80=80;
-    public static final int DEC=48;
-    public static final int T97=97;
-    public static final int ESCAPE_SEQUENCE=64;
-    public static final int EOF=-1;
-    public static final int T104=104;
-    public static final int Tokens=116;
-    public static final int RBRACK=5;
-    public static final int T99=99;
-    public static final int STAR=8;
-    public static final int BXOR=32;
-    public static final int T90=90;
-    
-    	public static final CommonToken IGNORE_TOKEN = new CommonToken(null,0,99,0,0);
+    public static final int         SR_ASSIGN         = 22;
+    public static final int         COMMA             = 12;
+    public static final int         MINUS             = 44;
+    public static final int         T70               = 70;
+    public static final int         T74               = 74;
+    public static final int         T85               = 85;
+    public static final int         BOR               = 31;
+    public static final int         DOT               = 7;
+    public static final int         SR                = 41;
+    public static final int         T102              = 102;
+    public static final int         LCURLY            = 9;
+    public static final int         T114              = 114;
+    public static final int         T103              = 103;
+    public static final int         STRING_LITERAL    = 53;
+    public static final int         LE                = 38;
+    public static final int         T81               = 81;
+    public static final int         RPAREN            = 14;
+    public static final int         STAR_ASSIGN       = 19;
+    public static final int         NUM_INT           = 51;
+    public static final int         PLUS              = 43;
+    public static final int         MINUS_ASSIGN      = 18;
+    public static final int         T113              = 113;
+    public static final int         T109              = 109;
+    public static final int         IDENT             = 6;
+    public static final int         DECIMAL_LITERAL   = 58;
+    public static final int         T68               = 68;
+    public static final int         T73               = 73;
+    public static final int         T84               = 84;
+    public static final int         MOD_ASSIGN        = 21;
+    public static final int         T78               = 78;
+    public static final int         T115              = 115;
+    public static final int         WS                = 55;
+    public static final int         LT                = 36;
+    public static final int         BSR               = 42;
+    public static final int         SL_ASSIGN         = 24;
+    public static final int         T96               = 96;
+    public static final int         T71               = 71;
+    public static final int         T72               = 72;
+    public static final int         T94               = 94;
+    public static final int         LAND              = 30;
+    public static final int         LBRACK            = 4;
+    public static final int         T76               = 76;
+    public static final int         NUM_FLOAT         = 54;
+    public static final int         SEMI              = 10;
+    public static final int         GE                = 39;
+    public static final int         LNOT              = 50;
+    public static final int         DIV_ASSIGN        = 20;
+    public static final int         T75               = 75;
+    public static final int         UNICODE_CHAR      = 66;
+    public static final int         EQUAL             = 35;
+    public static final int         T89               = 89;
+    public static final int         OCTAL_DIGIT       = 65;
+    public static final int         COLON             = 16;
+    public static final int         SL                = 40;
+    public static final int         T82               = 82;
+    public static final int         DIV               = 45;
+    public static final int         T100              = 100;
+    public static final int         EXPONENT_PART     = 62;
+    public static final int         T79               = 79;
+    public static final int         LOR               = 29;
+    public static final int         BNOT              = 49;
+    public static final int         INC               = 47;
+    public static final int         T93               = 93;
+    public static final int         T107              = 107;
+    public static final int         MOD               = 46;
+    public static final int         OCTAL_LITERAL     = 60;
+    public static final int         PLUS_ASSIGN       = 17;
+    public static final int         T83               = 83;
+    public static final int         QUESTION          = 28;
+    public static final int         HEX_LITERAL       = 59;
+    public static final int         T101              = 101;
+    public static final int         FLOAT_TYPE_SUFFIX = 63;
+    public static final int         RCURLY            = 11;
+    public static final int         T91               = 91;
+    public static final int         T105              = 105;
+    public static final int         T86               = 86;
+    public static final int         CHAR_LITERAL      = 52;
+    public static final int         BOR_ASSIGN        = 27;
+    public static final int         ASSIGN            = 15;
+    public static final int         LPAREN            = 13;
+    public static final int         T111              = 111;
+    public static final int         HEX_DIGIT         = 67;
+    public static final int         T77               = 77;
+    public static final int         ML_COMMENT        = 57;
+    public static final int         SL_COMMENT        = 56;
+    public static final int         BAND              = 33;
+    public static final int         T106              = 106;
+    public static final int         T112              = 112;
+    public static final int         T69               = 69;
+    public static final int         NOT_EQUAL         = 34;
+    public static final int         BAND_ASSIGN       = 25;
+    public static final int         T95               = 95;
+    public static final int         DIGITS            = 61;
+    public static final int         T110              = 110;
+    public static final int         T108              = 108;
+    public static final int         T92               = 92;
+    public static final int         BXOR_ASSIGN       = 26;
+    public static final int         GT                = 37;
+    public static final int         BSR_ASSIGN        = 23;
+    public static final int         T88               = 88;
+    public static final int         T98               = 98;
+    public static final int         T87               = 87;
+    public static final int         T80               = 80;
+    public static final int         DEC               = 48;
+    public static final int         T97               = 97;
+    public static final int         ESCAPE_SEQUENCE   = 64;
+    public static final int         EOF               = -1;
+    public static final int         T104              = 104;
+    public static final int         Tokens            = 116;
+    public static final int         RBRACK            = 5;
+    public static final int         T99               = 99;
+    public static final int         STAR              = 8;
+    public static final int         BXOR              = 32;
+    public static final int         T90               = 90;
 
-    public JavaParserLexer() {;} 
-    public JavaParserLexer(CharStream input) {
-        super(input);
+    public static final CommonToken IGNORE_TOKEN      = new CommonToken( null,
+                                                                         0,
+                                                                         99,
+                                                                         0,
+                                                                         0 );
+
+    public JavaParserLexer() {
+        ;
     }
-    public String getGrammarFileName() { return "D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g"; }
 
+    public JavaParserLexer(final CharStream input) {
+        super( input );
+    }
+
+    public String getGrammarFileName() {
+        return "D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g";
+    }
+
     // $ANTLR start T68
     public void mT68() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T68;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T68;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:9:7: ( 'void' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:9:7: 'void'
             {
-            match("void"); 
+                match( "void" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T68
 
     // $ANTLR start T69
     public void mT69() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T69;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T69;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:10:7: ( 'boolean' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:10:7: 'boolean'
             {
-            match("boolean"); 
+                match( "boolean" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T69
 
     // $ANTLR start T70
     public void mT70() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T70;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T70;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:11:7: ( 'byte' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:11:7: 'byte'
             {
-            match("byte"); 
+                match( "byte" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T70
 
     // $ANTLR start T71
     public void mT71() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T71;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T71;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:12:7: ( 'char' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:12:7: 'char'
             {
-            match("char"); 
+                match( "char" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T71
 
     // $ANTLR start T72
     public void mT72() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T72;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T72;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:13:7: ( 'short' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:13:7: 'short'
             {
-            match("short"); 
+                match( "short" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T72
 
     // $ANTLR start T73
     public void mT73() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T73;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T73;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:14:7: ( 'int' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:14:7: 'int'
             {
-            match("int"); 
+                match( "int" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T73
 
     // $ANTLR start T74
     public void mT74() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T74;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T74;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:15:7: ( 'float' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:15:7: 'float'
             {
-            match("float"); 
+                match( "float" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T74
 
     // $ANTLR start T75
     public void mT75() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T75;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T75;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:16:7: ( 'long' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:16:7: 'long'
             {
-            match("long"); 
+                match( "long" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T75
 
     // $ANTLR start T76
     public void mT76() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T76;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T76;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:17:7: ( 'double' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:17:7: 'double'
             {
-            match("double"); 
+                match( "double" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T76
 
     // $ANTLR start T77
     public void mT77() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T77;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T77;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:18:7: ( 'private' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:18:7: 'private'
             {
-            match("private"); 
+                match( "private" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T77
 
     // $ANTLR start T78
     public void mT78() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T78;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T78;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:19:7: ( 'public' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:19:7: 'public'
             {
-            match("public"); 
+                match( "public" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T78
 
     // $ANTLR start T79
     public void mT79() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T79;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T79;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:20:7: ( 'protected' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:20:7: 'protected'
             {
-            match("protected"); 
+                match( "protected" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T79
 
     // $ANTLR start T80
     public void mT80() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T80;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T80;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:21:7: ( 'static' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:21:7: 'static'
             {
-            match("static"); 
+                match( "static" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T80
 
     // $ANTLR start T81
     public void mT81() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T81;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T81;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:22:7: ( 'transient' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:22:7: 'transient'
             {
-            match("transient"); 
+                match( "transient" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T81
 
     // $ANTLR start T82
     public void mT82() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T82;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T82;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:23:7: ( 'final' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:23:7: 'final'
             {
-            match("final"); 
+                match( "final" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T82
 
     // $ANTLR start T83
     public void mT83() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T83;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T83;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:24:7: ( 'abstract' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:24:7: 'abstract'
             {
-            match("abstract"); 
+                match( "abstract" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T83
 
     // $ANTLR start T84
     public void mT84() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T84;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T84;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:25:7: ( 'native' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:25:7: 'native'
             {
-            match("native"); 
+                match( "native" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T84
 
     // $ANTLR start T85
     public void mT85() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T85;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T85;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:26:7: ( 'threadsafe' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:26:7: 'threadsafe'
             {
-            match("threadsafe"); 
+                match( "threadsafe" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T85
 
     // $ANTLR start T86
     public void mT86() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T86;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T86;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:27:7: ( 'synchronized' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:27:7: 'synchronized'
             {
-            match("synchronized"); 
+                match( "synchronized" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T86
 
     // $ANTLR start T87
     public void mT87() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T87;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T87;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:28:7: ( 'volatile' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:28:7: 'volatile'
             {
-            match("volatile"); 
+                match( "volatile" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T87
 
     // $ANTLR start T88
     public void mT88() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T88;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T88;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:29:7: ( 'strictfp' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:29:7: 'strictfp'
             {
-            match("strictfp"); 
+                match( "strictfp" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T88
 
     // $ANTLR start T89
     public void mT89() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T89;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T89;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:30:7: ( 'class' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:30:7: 'class'
             {
-            match("class"); 
+                match( "class" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T89
 
     // $ANTLR start T90
     public void mT90() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T90;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T90;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:31:7: ( 'extends' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:31:7: 'extends'
             {
-            match("extends"); 
+                match( "extends" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T90
 
     // $ANTLR start T91
     public void mT91() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T91;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T91;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:32:7: ( 'interface' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:32:7: 'interface'
             {
-            match("interface"); 
+                match( "interface" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T91
 
     // $ANTLR start T92
     public void mT92() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T92;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T92;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:33:7: ( 'implements' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:33:7: 'implements'
             {
-            match("implements"); 
+                match( "implements" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T92
 
     // $ANTLR start T93
     public void mT93() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T93;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T93;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:34:7: ( 'this' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:34:7: 'this'
             {
-            match("this"); 
+                match( "this" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T93
 
     // $ANTLR start T94
     public void mT94() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T94;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T94;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:35:7: ( 'super' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:35:7: 'super'
             {
-            match("super"); 
+                match( "super" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T94
 
     // $ANTLR start T95
     public void mT95() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T95;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T95;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:36:7: ( 'throws' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:36:7: 'throws'
             {
-            match("throws"); 
+                match( "throws" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T95
 
     // $ANTLR start T96
     public void mT96() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T96;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T96;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:37:7: ( 'if' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:37:7: 'if'
             {
-            match("if"); 
+                match( "if" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T96
 
     // $ANTLR start T97
     public void mT97() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T97;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T97;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:38:7: ( 'else' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:38:7: 'else'
             {
-            match("else"); 
+                match( "else" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T97
 
     // $ANTLR start T98
     public void mT98() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T98;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T98;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:39:7: ( 'for' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:39:7: 'for'
             {
-            match("for"); 
+                match( "for" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T98
 
     // $ANTLR start T99
     public void mT99() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T99;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T99;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:40:7: ( 'while' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:40:7: 'while'
             {
-            match("while"); 
+                match( "while" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T99
 
     // $ANTLR start T100
     public void mT100() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T100;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T100;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:41:8: ( 'do' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:41:8: 'do'
             {
-            match("do"); 
+                match( "do" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T100
 
     // $ANTLR start T101
     public void mT101() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T101;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T101;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:42:8: ( 'break' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:42:8: 'break'
             {
-            match("break"); 
+                match( "break" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T101
 
     // $ANTLR start T102
     public void mT102() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T102;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T102;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:43:8: ( 'continue' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:43:8: 'continue'
             {
-            match("continue"); 
+                match( "continue" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T102
 
     // $ANTLR start T103
     public void mT103() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T103;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T103;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:44:8: ( 'return' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:44:8: 'return'
             {
-            match("return"); 
+                match( "return" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T103
 
     // $ANTLR start T104
     public void mT104() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T104;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T104;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:45:8: ( 'switch' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:45:8: 'switch'
             {
-            match("switch"); 
+                match( "switch" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T104
 
     // $ANTLR start T105
     public void mT105() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T105;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T105;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:46:8: ( 'throw' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:46:8: 'throw'
             {
-            match("throw"); 
+                match( "throw" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T105
 
     // $ANTLR start T106
     public void mT106() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T106;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T106;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:47:8: ( 'case' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:47:8: 'case'
             {
-            match("case"); 
+                match( "case" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T106
 
     // $ANTLR start T107
     public void mT107() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T107;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T107;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:48:8: ( 'default' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:48:8: 'default'
             {
-            match("default"); 
+                match( "default" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T107
 
     // $ANTLR start T108
     public void mT108() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T108;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T108;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:49:8: ( 'try' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:49:8: 'try'
             {
-            match("try"); 
+                match( "try" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T108
 
     // $ANTLR start T109
     public void mT109() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T109;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T109;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:50:8: ( 'finally' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:50:8: 'finally'
             {
-            match("finally"); 
+                match( "finally" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T109
 
     // $ANTLR start T110
     public void mT110() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T110;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T110;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:51:8: ( 'catch' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:51:8: 'catch'
             {
-            match("catch"); 
+                match( "catch" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T110
 
     // $ANTLR start T111
     public void mT111() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T111;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T111;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:52:8: ( 'instanceof' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:52:8: 'instanceof'
             {
-            match("instanceof"); 
+                match( "instanceof" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T111
 
     // $ANTLR start T112
     public void mT112() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T112;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T112;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:53:8: ( 'true' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:53:8: 'true'
             {
-            match("true"); 
+                match( "true" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T112
 
     // $ANTLR start T113
     public void mT113() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T113;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T113;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:54:8: ( 'false' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:54:8: 'false'
             {
-            match("false"); 
+                match( "false" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T113
 
     // $ANTLR start T114
     public void mT114() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T114;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T114;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:55:8: ( 'null' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:55:8: 'null'
             {
-            match("null"); 
+                match( "null" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T114
 
     // $ANTLR start T115
     public void mT115() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = T115;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = T115;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:56:8: ( 'new' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:56:8: 'new'
             {
-            match("new"); 
+                match( "new" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end T115
 
     // $ANTLR start QUESTION
     public void mQUESTION() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = QUESTION;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = QUESTION;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:914:13: ( '?' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:914:13: '?'
             {
-            match('?'); 
+                match( '?' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end QUESTION
 
     // $ANTLR start LPAREN
     public void mLPAREN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = LPAREN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = LPAREN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:917:12: ( '(' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:917:12: '('
             {
-            match('('); 
+                match( '(' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end LPAREN
 
     // $ANTLR start RPAREN
     public void mRPAREN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = RPAREN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = RPAREN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:920:12: ( ')' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:920:12: ')'
             {
-            match(')'); 
+                match( ')' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end RPAREN
 
     // $ANTLR start LBRACK
     public void mLBRACK() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = LBRACK;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = LBRACK;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:923:12: ( '[' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:923:12: '['
             {
-            match('['); 
+                match( '[' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end LBRACK
 
     // $ANTLR start RBRACK
     public void mRBRACK() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = RBRACK;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = RBRACK;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:926:12: ( ']' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:926:12: ']'
             {
-            match(']'); 
+                match( ']' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end RBRACK
 
     // $ANTLR start LCURLY
     public void mLCURLY() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = LCURLY;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = LCURLY;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:929:12: ( '{' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:929:12: '{'
             {
-            match('{'); 
+                match( '{' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end LCURLY
 
     // $ANTLR start RCURLY
     public void mRCURLY() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = RCURLY;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = RCURLY;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:932:12: ( '}' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:932:12: '}'
             {
-            match('}'); 
+                match( '}' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end RCURLY
 
     // $ANTLR start COLON
     public void mCOLON() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = COLON;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = COLON;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:935:11: ( ':' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:935:11: ':'
             {
-            match(':'); 
+                match( ':' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end COLON
 
     // $ANTLR start COMMA
     public void mCOMMA() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = COMMA;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = COMMA;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:938:11: ( ',' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:938:11: ','
             {
-            match(','); 
+                match( ',' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end COMMA
 
     // $ANTLR start DOT
     public void mDOT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = DOT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = DOT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:940:10: ( '.' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:940:10: '.'
             {
-            match('.'); 
+                match( '.' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end DOT
 
     // $ANTLR start ASSIGN
     public void mASSIGN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = ASSIGN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = ASSIGN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:942:12: ( '=' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:942:12: '='
             {
-            match('='); 
+                match( '=' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end ASSIGN
 
     // $ANTLR start EQUAL
     public void mEQUAL() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = EQUAL;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = EQUAL;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:945:11: ( '==' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:945:11: '=='
             {
-            match("=="); 
+                match( "==" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end EQUAL
 
     // $ANTLR start LNOT
     public void mLNOT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = LNOT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = LNOT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:948:10: ( '!' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:948:10: '!'
             {
-            match('!'); 
+                match( '!' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end LNOT
 
     // $ANTLR start BNOT
     public void mBNOT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = BNOT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = BNOT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:951:10: ( '~' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:951:10: '~'
             {
-            match('~'); 
+                match( '~' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end BNOT
 
     // $ANTLR start NOT_EQUAL
     public void mNOT_EQUAL() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = NOT_EQUAL;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = NOT_EQUAL;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:954:14: ( '!=' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:954:14: '!='
             {
-            match("!="); 
+                match( "!=" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end NOT_EQUAL
 
     // $ANTLR start DIV
     public void mDIV() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = DIV;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = DIV;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:957:10: ( '/' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:957:10: '/'
             {
-            match('/'); 
+                match( '/' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end DIV
 
     // $ANTLR start DIV_ASSIGN
     public void mDIV_ASSIGN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = DIV_ASSIGN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = DIV_ASSIGN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:960:15: ( '/=' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:960:15: '/='
             {
-            match("/="); 
+                match( "/=" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end DIV_ASSIGN
 
     // $ANTLR start PLUS
     public void mPLUS() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = PLUS;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = PLUS;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:963:10: ( '+' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:963:10: '+'
             {
-            match('+'); 
+                match( '+' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end PLUS
 
     // $ANTLR start PLUS_ASSIGN
     public void mPLUS_ASSIGN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = PLUS_ASSIGN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = PLUS_ASSIGN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:966:16: ( '+=' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:966:16: '+='
             {
-            match("+="); 
+                match( "+=" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end PLUS_ASSIGN
 
     // $ANTLR start INC
     public void mINC() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = INC;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = INC;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:969:10: ( '++' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:969:10: '++'
             {
-            match("++"); 
+                match( "++" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end INC
 
     // $ANTLR start MINUS
     public void mMINUS() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = MINUS;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = MINUS;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:972:11: ( '-' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:972:11: '-'
             {
-            match('-'); 
+                match( '-' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end MINUS
 
     // $ANTLR start MINUS_ASSIGN
     public void mMINUS_ASSIGN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = MINUS_ASSIGN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = MINUS_ASSIGN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:975:16: ( '-=' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:975:16: '-='
             {
-            match("-="); 
+                match( "-=" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end MINUS_ASSIGN
 
     // $ANTLR start DEC
     public void mDEC() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = DEC;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = DEC;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:978:10: ( '--' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:978:10: '--'
             {
-            match("--"); 
+                match( "--" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end DEC
 
     // $ANTLR start STAR
     public void mSTAR() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = STAR;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = STAR;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:981:10: ( '*' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:981:10: '*'
             {
-            match('*'); 
+                match( '*' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end STAR
 
     // $ANTLR start STAR_ASSIGN
     public void mSTAR_ASSIGN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = STAR_ASSIGN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = STAR_ASSIGN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:984:16: ( '*=' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:984:16: '*='
             {
-            match("*="); 
+                match( "*=" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end STAR_ASSIGN
 
     // $ANTLR start MOD
     public void mMOD() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = MOD;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = MOD;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:987:10: ( '%' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:987:10: '%'
             {
-            match('%'); 
+                match( '%' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end MOD
 
     // $ANTLR start MOD_ASSIGN
     public void mMOD_ASSIGN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = MOD_ASSIGN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = MOD_ASSIGN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:990:15: ( '%=' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:990:15: '%='
             {
-            match("%="); 
+                match( "%=" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end MOD_ASSIGN
 
     // $ANTLR start SR
     public void mSR() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = SR;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = SR;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:993:9: ( '>>' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:993:9: '>>'
             {
-            match(">>"); 
+                match( ">>" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end SR
 
     // $ANTLR start SR_ASSIGN
     public void mSR_ASSIGN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = SR_ASSIGN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = SR_ASSIGN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:996:14: ( '>>=' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:996:14: '>>='
             {
-            match(">>="); 
+                match( ">>=" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end SR_ASSIGN
 
     // $ANTLR start BSR
     public void mBSR() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = BSR;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = BSR;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:999:10: ( '>>>' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:999:10: '>>>'
             {
-            match(">>>"); 
+                match( ">>>" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end BSR
 
     // $ANTLR start BSR_ASSIGN
     public void mBSR_ASSIGN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = BSR_ASSIGN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = BSR_ASSIGN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1002:15: ( '>>>=' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1002:15: '>>>='
             {
-            match(">>>="); 
+                match( ">>>=" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end BSR_ASSIGN
 
     // $ANTLR start GE
     public void mGE() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = GE;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = GE;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1005:9: ( '>=' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1005:9: '>='
             {
-            match(">="); 
+                match( ">=" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end GE
 
     // $ANTLR start GT
     public void mGT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = GT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = GT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1008:9: ( '>' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1008:9: '>'
             {
-            match('>'); 
+                match( '>' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end GT
 
     // $ANTLR start SL
     public void mSL() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = SL;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = SL;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1011:9: ( '<<' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1011:9: '<<'
             {
-            match("<<"); 
+                match( "<<" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end SL
 
     // $ANTLR start SL_ASSIGN
     public void mSL_ASSIGN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = SL_ASSIGN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = SL_ASSIGN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1014:14: ( '<<=' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1014:14: '<<='
             {
-            match("<<="); 
+                match( "<<=" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end SL_ASSIGN
 
     // $ANTLR start LE
     public void mLE() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = LE;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = LE;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1017:9: ( '<=' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1017:9: '<='
             {
-            match("<="); 
+                match( "<=" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end LE
 
     // $ANTLR start LT
     public void mLT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = LT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = LT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1020:9: ( '<' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1020:9: '<'
             {
-            match('<'); 
+                match( '<' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end LT
 
     // $ANTLR start BXOR
     public void mBXOR() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = BXOR;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = BXOR;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1023:10: ( '^' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1023:10: '^'
             {
-            match('^'); 
+                match( '^' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end BXOR
 
     // $ANTLR start BXOR_ASSIGN
     public void mBXOR_ASSIGN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = BXOR_ASSIGN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = BXOR_ASSIGN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1026:16: ( '^=' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1026:16: '^='
             {
-            match("^="); 
+                match( "^=" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end BXOR_ASSIGN
 
     // $ANTLR start BOR
     public void mBOR() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = BOR;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = BOR;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1029:10: ( '|' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1029:10: '|'
             {
-            match('|'); 
+                match( '|' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end BOR
 
     // $ANTLR start BOR_ASSIGN
     public void mBOR_ASSIGN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = BOR_ASSIGN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = BOR_ASSIGN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1032:15: ( '|=' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1032:15: '|='
             {
-            match("|="); 
+                match( "|=" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end BOR_ASSIGN
 
     // $ANTLR start LOR
     public void mLOR() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = LOR;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = LOR;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1035:10: ( '||' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1035:10: '||'
             {
-            match("||"); 
+                match( "||" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end LOR
 
     // $ANTLR start BAND
     public void mBAND() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = BAND;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = BAND;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1038:10: ( '&' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1038:10: '&'
             {
-            match('&'); 
+                match( '&' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end BAND
 
     // $ANTLR start BAND_ASSIGN
     public void mBAND_ASSIGN() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = BAND_ASSIGN;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = BAND_ASSIGN;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1041:16: ( '&=' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1041:16: '&='
             {
-            match("&="); 
+                match( "&=" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end BAND_ASSIGN
 
     // $ANTLR start LAND
     public void mLAND() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = LAND;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = LAND;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1044:10: ( '&&' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1044:10: '&&'
             {
-            match("&&"); 
+                match( "&&" );
 
+            }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end LAND
 
     // $ANTLR start SEMI
     public void mSEMI() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = SEMI;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = SEMI;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1047:10: ( ';' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1047:10: ';'
             {
-            match(';'); 
+                match( ';' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end SEMI
 
     // $ANTLR start WS
     public void mWS() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = WS;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
+            this.ruleNestingLevel++;
+            final int _type = WS;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
             int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1053:6: ( ( ' ' | '\\t' | '\\f' | ( '\\r\\n' | '\\r' | '\\n' ) )+ )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1053:6: ( ' ' | '\\t' | '\\f' | ( '\\r\\n' | '\\r' | '\\n' ) )+
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1053:6: ( ' ' | '\\t' | '\\f' | ( '\\r\\n' | '\\r' | '\\n' ) )+
-            int cnt2=0;
-            loop2:
-            do {
-                int alt2=5;
-                switch ( input.LA(1) ) {
-                case ' ':
-                    alt2=1;
-                    break;
-                case '\t':
-                    alt2=2;
-                    break;
-                case '\f':
-                    alt2=3;
-                    break;
-                case '\n':
-                case '\r':
-                    alt2=4;
-                    break;
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1053:6: ( ' ' | '\\t' | '\\f' | ( '\\r\\n' | '\\r' | '\\n' ) )+
+                int cnt2 = 0;
+                loop2 : do {
+                    int alt2 = 5;
+                    switch ( this.input.LA( 1 ) ) {
+                        case ' ' :
+                            alt2 = 1;
+                            break;
+                        case '\t' :
+                            alt2 = 2;
+                            break;
+                        case '\f' :
+                            alt2 = 3;
+                            break;
+                        case '\n' :
+                        case '\r' :
+                            alt2 = 4;
+                            break;
 
-                }
+                    }
 
-                switch (alt2) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1053:8: ' '
-            	    {
-            	    match(' '); 
+                    switch ( alt2 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1053:8: ' '
+                        {
+                            match( ' ' );
 
-            	    }
-            	    break;
-            	case 2 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1054:5: '\\t'
-            	    {
-            	    match('\t'); 
+                        }
+                            break;
+                        case 2 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1054:5: '\\t'
+                        {
+                            match( '\t' );
 
-            	    }
-            	    break;
-            	case 3 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1055:5: '\\f'
-            	    {
-            	    match('\f'); 
+                        }
+                            break;
+                        case 3 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1055:5: '\\f'
+                        {
+                            match( '\f' );
 
-            	    }
-            	    break;
-            	case 4 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1057:5: ( '\\r\\n' | '\\r' | '\\n' )
-            	    {
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1057:5: ( '\\r\\n' | '\\r' | '\\n' )
-            	    int alt1=3;
-            	    int LA1_0 = input.LA(1);
-            	    if ( (LA1_0=='\r') ) {
-            	        int LA1_1 = input.LA(2);
-            	        if ( (LA1_1=='\n') ) {
-            	            alt1=1;
-            	        }
-            	        else {
-            	            alt1=2;}
-            	    }
-            	    else if ( (LA1_0=='\n') ) {
-            	        alt1=3;
-            	    }
-            	    else {
-            	        NoViableAltException nvae =
-            	            new NoViableAltException("1057:5: ( '\\r\\n' | '\\r' | '\\n' )", 1, 0, input);
+                        }
+                            break;
+                        case 4 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1057:5: ( '\\r\\n' | '\\r' | '\\n' )
+                        {
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1057:5: ( '\\r\\n' | '\\r' | '\\n' )
+                            int alt1 = 3;
+                            final int LA1_0 = this.input.LA( 1 );
+                            if ( (LA1_0 == '\r') ) {
+                                final int LA1_1 = this.input.LA( 2 );
+                                if ( (LA1_1 == '\n') ) {
+                                    alt1 = 1;
+                                } else {
+                                    alt1 = 2;
+                                }
+                            } else if ( (LA1_0 == '\n') ) {
+                                alt1 = 3;
+                            } else {
+                                final NoViableAltException nvae = new NoViableAltException( "1057:5: ( '\\r\\n' | '\\r' | '\\n' )",
+                                                                                      1,
+                                                                                      0,
+                                                                                      this.input );
 
-            	        throw nvae;
-            	    }
-            	    switch (alt1) {
-            	        case 1 :
-            	            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1057:7: '\\r\\n'
-            	            {
-            	            match("\r\n"); 
+                                throw nvae;
+                            }
+                            switch ( alt1 ) {
+                                case 1 :
+                                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1057:7: '\\r\\n'
+                                {
+                                    match( "\r\n" );
 
+                                }
+                                    break;
+                                case 2 :
+                                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1058:6: '\\r'
+                                {
+                                    match( '\r' );
 
-            	            }
-            	            break;
-            	        case 2 :
-            	            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1058:6: '\\r'
-            	            {
-            	            match('\r'); 
+                                }
+                                    break;
+                                case 3 :
+                                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1059:6: '\\n'
+                                {
+                                    match( '\n' );
 
-            	            }
-            	            break;
-            	        case 3 :
-            	            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1059:6: '\\n'
-            	            {
-            	            match('\n'); 
+                                }
+                                    break;
 
-            	            }
-            	            break;
+                            }
 
-            	    }
+                        }
+                            break;
 
+                        default :
+                            if ( cnt2 >= 1 ) {
+                                break loop2;
+                            }
+                            final EarlyExitException eee = new EarlyExitException( 2,
+                                                                             this.input );
+                            throw eee;
+                    }
+                    cnt2++;
+                } while ( true );
 
-            	    }
-            	    break;
+                _channel = HIDDEN; /*token = JavaParser.IGNORE_TOKEN;*/
 
-            	default :
-            	    if ( cnt2 >= 1 ) break loop2;
-                        EarlyExitException eee =
-                            new EarlyExitException(2, input);
-                        throw eee;
-                }
-                cnt2++;
-            } while (true);
+            }
 
-             _channel=HIDDEN; /*token = JavaParser.IGNORE_TOKEN;*/ 
-
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end WS
 
     // $ANTLR start SL_COMMENT
     public void mSL_COMMENT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = SL_COMMENT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
+            this.ruleNestingLevel++;
+            final int _type = SL_COMMENT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
             int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1069:4: ( '//' ( options {greedy=false; } : . )* ( '\\r' )? '\\n' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1069:4: '//' ( options {greedy=false; } : . )* ( '\\r' )? '\\n'
             {
-            match("//"); 
+                match( "//" );
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1069:9: ( options {greedy=false; } : . )*
-            loop3:
-            do {
-                int alt3=2;
-                int LA3_0 = input.LA(1);
-                if ( (LA3_0=='\r') ) {
-                    alt3=2;
-                }
-                else if ( (LA3_0=='\n') ) {
-                    alt3=2;
-                }
-                else if ( ((LA3_0>='\u0000' && LA3_0<='\t')||(LA3_0>='\u000B' && LA3_0<='\f')||(LA3_0>='\u000E' && LA3_0<='\uFFFE')) ) {
-                    alt3=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1069:9: ( options {greedy=false; } : . )*
+                loop3 : do {
+                    int alt3 = 2;
+                    final int LA3_0 = this.input.LA( 1 );
+                    if ( (LA3_0 == '\r') ) {
+                        alt3 = 2;
+                    } else if ( (LA3_0 == '\n') ) {
+                        alt3 = 2;
+                    } else if ( ((LA3_0 >= '\u0000' && LA3_0 <= '\t') || (LA3_0 >= '\u000B' && LA3_0 <= '\f') || (LA3_0 >= '\u000E' && LA3_0 <= '\uFFFE')) ) {
+                        alt3 = 1;
+                    }
 
+                    switch ( alt3 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1069:36: .
+                        {
+                            matchAny();
 
-                switch (alt3) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1069:36: .
-            	    {
-            	    matchAny(); 
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            break loop3;
+                    }
+                } while ( true );
 
-            	default :
-            	    break loop3;
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1069:40: ( '\\r' )?
+                int alt4 = 2;
+                final int LA4_0 = this.input.LA( 1 );
+                if ( (LA4_0 == '\r') ) {
+                    alt4 = 1;
                 }
-            } while (true);
-
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1069:40: ( '\\r' )?
-            int alt4=2;
-            int LA4_0 = input.LA(1);
-            if ( (LA4_0=='\r') ) {
-                alt4=1;
-            }
-            switch (alt4) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1069:41: '\\r'
+                switch ( alt4 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1069:41: '\\r'
                     {
-                    match('\r'); 
+                        match( '\r' );
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-            match('\n'); 
-            _channel=HIDDEN; /*token = JavaParser.IGNORE_TOKEN;*/
+                match( '\n' );
+                _channel = HIDDEN; /*token = JavaParser.IGNORE_TOKEN;*/
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end SL_COMMENT
 
     // $ANTLR start ML_COMMENT
     public void mML_COMMENT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = ML_COMMENT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
+            this.ruleNestingLevel++;
+            final int _type = ML_COMMENT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
             int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1077:4: ( '/*' ( options {greedy=false; } : . )* '*/' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1077:4: '/*' ( options {greedy=false; } : . )* '*/'
             {
-            match("/*"); 
+                match( "/*" );
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1078:3: ( options {greedy=false; } : . )*
-            loop5:
-            do {
-                int alt5=2;
-                int LA5_0 = input.LA(1);
-                if ( (LA5_0=='*') ) {
-                    int LA5_1 = input.LA(2);
-                    if ( (LA5_1=='/') ) {
-                        alt5=2;
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1078:3: ( options {greedy=false; } : . )*
+                loop5 : do {
+                    int alt5 = 2;
+                    final int LA5_0 = this.input.LA( 1 );
+                    if ( (LA5_0 == '*') ) {
+                        final int LA5_1 = this.input.LA( 2 );
+                        if ( (LA5_1 == '/') ) {
+                            alt5 = 2;
+                        } else if ( ((LA5_1 >= '\u0000' && LA5_1 <= '.') || (LA5_1 >= '0' && LA5_1 <= '\uFFFE')) ) {
+                            alt5 = 1;
+                        }
+
+                    } else if ( ((LA5_0 >= '\u0000' && LA5_0 <= ')') || (LA5_0 >= '+' && LA5_0 <= '\uFFFE')) ) {
+                        alt5 = 1;
                     }
-                    else if ( ((LA5_1>='\u0000' && LA5_1<='.')||(LA5_1>='0' && LA5_1<='\uFFFE')) ) {
-                        alt5=1;
-                    }
 
+                    switch ( alt5 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1078:31: .
+                        {
+                            matchAny();
 
-                }
-                else if ( ((LA5_0>='\u0000' && LA5_0<=')')||(LA5_0>='+' && LA5_0<='\uFFFE')) ) {
-                    alt5=1;
-                }
+                        }
+                            break;
 
+                        default :
+                            break loop5;
+                    }
+                } while ( true );
 
-                switch (alt5) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1078:31: .
-            	    {
-            	    matchAny(); 
+                match( "*/" );
 
-            	    }
-            	    break;
+                _channel = HIDDEN;/*token = JavaParser.IGNORE_TOKEN;*/
 
-            	default :
-            	    break loop5;
-                }
-            } while (true);
+            }
 
-            match("*/"); 
-
-            _channel=HIDDEN;/*token = JavaParser.IGNORE_TOKEN;*/
-
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end ML_COMMENT
 
     // $ANTLR start IDENT
     public void mIDENT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = IDENT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = IDENT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1084:4: ( ('a'..'z'|'A'..'Z'|'_'|'$') ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'$'))* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1084:4: ('a'..'z'|'A'..'Z'|'_'|'$') ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'$'))*
             {
-            if ( input.LA(1)=='$'||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-                input.consume();
+                if ( this.input.LA( 1 ) == '$' || (this.input.LA( 1 ) >= 'A' && this.input.LA( 1 ) <= 'Z') || this.input.LA( 1 ) == '_' || (this.input.LA( 1 ) >= 'a' && this.input.LA( 1 ) <= 'z') ) {
+                    this.input.consume();
 
-            }
-            else {
-                MismatchedSetException mse =
-                    new MismatchedSetException(null,input);
-                recover(mse);    throw mse;
-            }
-
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1084:32: ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'$'))*
-            loop6:
-            do {
-                int alt6=2;
-                int LA6_0 = input.LA(1);
-                if ( (LA6_0=='$'||(LA6_0>='0' && LA6_0<='9')||(LA6_0>='A' && LA6_0<='Z')||LA6_0=='_'||(LA6_0>='a' && LA6_0<='z')) ) {
-                    alt6=1;
+                } else {
+                    final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                             this.input );
+                    recover( mse );
+                    throw mse;
                 }
 
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1084:32: ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'$'))*
+                loop6 : do {
+                    int alt6 = 2;
+                    final int LA6_0 = this.input.LA( 1 );
+                    if ( (LA6_0 == '$' || (LA6_0 >= '0' && LA6_0 <= '9') || (LA6_0 >= 'A' && LA6_0 <= 'Z') || LA6_0 == '_' || (LA6_0 >= 'a' && LA6_0 <= 'z')) ) {
+                        alt6 = 1;
+                    }
 
-                switch (alt6) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1084:33: ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'$')
-            	    {
-            	    if ( input.LA(1)=='$'||(input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-            	        input.consume();
+                    switch ( alt6 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1084:33: ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'$')
+                        {
+                            if ( this.input.LA( 1 ) == '$' || (this.input.LA( 1 ) >= '0' && this.input.LA( 1 ) <= '9') || (this.input.LA( 1 ) >= 'A' && this.input.LA( 1 ) <= 'Z') || this.input.LA( 1 ) == '_' || (this.input.LA( 1 ) >= 'a' && this.input.LA( 1 ) <= 'z') ) {
+                                this.input.consume();
 
-            	    }
-            	    else {
-            	        MismatchedSetException mse =
-            	            new MismatchedSetException(null,input);
-            	        recover(mse);    throw mse;
-            	    }
+                            } else {
+                                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                         this.input );
+                                recover( mse );
+                                throw mse;
+                            }
 
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            break loop6;
+                    }
+                } while ( true );
 
-            	default :
-            	    break loop6;
-                }
-            } while (true);
+            }
 
-
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end IDENT
 
     // $ANTLR start NUM_INT
     public void mNUM_INT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = NUM_INT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = NUM_INT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1090:7: ( DECIMAL_LITERAL | HEX_LITERAL | OCTAL_LITERAL )
-            int alt7=3;
-            int LA7_0 = input.LA(1);
-            if ( ((LA7_0>='1' && LA7_0<='9')) ) {
-                alt7=1;
-            }
-            else if ( (LA7_0=='0') ) {
-                int LA7_2 = input.LA(2);
-                if ( (LA7_2=='X'||LA7_2=='x') ) {
-                    alt7=2;
+            int alt7 = 3;
+            final int LA7_0 = this.input.LA( 1 );
+            if ( ((LA7_0 >= '1' && LA7_0 <= '9')) ) {
+                alt7 = 1;
+            } else if ( (LA7_0 == '0') ) {
+                final int LA7_2 = this.input.LA( 2 );
+                if ( (LA7_2 == 'X' || LA7_2 == 'x') ) {
+                    alt7 = 2;
+                } else {
+                    alt7 = 3;
                 }
-                else {
-                    alt7=3;}
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("1089:1: NUM_INT : ( DECIMAL_LITERAL | HEX_LITERAL | OCTAL_LITERAL );", 7, 0, input);
+            } else {
+                final NoViableAltException nvae = new NoViableAltException( "1089:1: NUM_INT : ( DECIMAL_LITERAL | HEX_LITERAL | OCTAL_LITERAL );",
+                                                                      7,
+                                                                      0,
+                                                                      this.input );
 
                 throw nvae;
             }
-            switch (alt7) {
+            switch ( alt7 ) {
                 case 1 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1090:7: DECIMAL_LITERAL
-                    {
-                    mDECIMAL_LITERAL(); 
+                {
+                    mDECIMAL_LITERAL();
 
-                    }
+                }
                     break;
                 case 2 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1091:7: HEX_LITERAL
-                    {
-                    mHEX_LITERAL(); 
+                {
+                    mHEX_LITERAL();
 
-                    }
+                }
                     break;
                 case 3 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1092:7: OCTAL_LITERAL
-                    {
-                    mOCTAL_LITERAL(); 
+                {
+                    mOCTAL_LITERAL();
 
-                    }
+                }
                     break;
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end NUM_INT
 
     // $ANTLR start DECIMAL_LITERAL
     public void mDECIMAL_LITERAL() throws RecognitionException {
         try {
-            ruleNestingLevel++;
+            this.ruleNestingLevel++;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1096:18: ( '1' .. '9' ( '0' .. '9' )* ( ('l'|'L'))? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1096:18: '1' .. '9' ( '0' .. '9' )* ( ('l'|'L'))?
             {
-            matchRange('1','9'); 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1096:27: ( '0' .. '9' )*
-            loop8:
-            do {
-                int alt8=2;
-                int LA8_0 = input.LA(1);
-                if ( ((LA8_0>='0' && LA8_0<='9')) ) {
-                    alt8=1;
-                }
+                matchRange( '1',
+                            '9' );
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1096:27: ( '0' .. '9' )*
+                loop8 : do {
+                    int alt8 = 2;
+                    final int LA8_0 = this.input.LA( 1 );
+                    if ( ((LA8_0 >= '0' && LA8_0 <= '9')) ) {
+                        alt8 = 1;
+                    }
 
+                    switch ( alt8 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1096:28: '0' .. '9'
+                        {
+                            matchRange( '0',
+                                        '9' );
 
-                switch (alt8) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1096:28: '0' .. '9'
-            	    {
-            	    matchRange('0','9'); 
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            break loop8;
+                    }
+                } while ( true );
 
-            	default :
-            	    break loop8;
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1096:39: ( ('l'|'L'))?
+                int alt9 = 2;
+                final int LA9_0 = this.input.LA( 1 );
+                if ( (LA9_0 == 'L' || LA9_0 == 'l') ) {
+                    alt9 = 1;
                 }
-            } while (true);
-
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1096:39: ( ('l'|'L'))?
-            int alt9=2;
-            int LA9_0 = input.LA(1);
-            if ( (LA9_0=='L'||LA9_0=='l') ) {
-                alt9=1;
-            }
-            switch (alt9) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1096:40: ('l'|'L')
+                switch ( alt9 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1096:40: ('l'|'L')
                     {
-                    if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
-                        input.consume();
+                        if ( this.input.LA( 1 ) == 'L' || this.input.LA( 1 ) == 'l' ) {
+                            this.input.consume();
 
-                    }
-                    else {
-                        MismatchedSetException mse =
-                            new MismatchedSetException(null,input);
-                        recover(mse);    throw mse;
-                    }
+                        } else {
+                            final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                     this.input );
+                            recover( mse );
+                            throw mse;
+                        }
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end DECIMAL_LITERAL
 
     // $ANTLR start HEX_LITERAL
     public void mHEX_LITERAL() throws RecognitionException {
         try {
-            ruleNestingLevel++;
+            this.ruleNestingLevel++;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1099:14: ( '0' ('x'|'X') ( ('0'..'9'|'a'..'f'|'A'..'F'))+ ( ('l'|'L'))? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1099:14: '0' ('x'|'X') ( ('0'..'9'|'a'..'f'|'A'..'F'))+ ( ('l'|'L'))?
             {
-            match('0'); 
-            if ( input.LA(1)=='X'||input.LA(1)=='x' ) {
-                input.consume();
+                match( '0' );
+                if ( this.input.LA( 1 ) == 'X' || this.input.LA( 1 ) == 'x' ) {
+                    this.input.consume();
 
-            }
-            else {
-                MismatchedSetException mse =
-                    new MismatchedSetException(null,input);
-                recover(mse);    throw mse;
-            }
-
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1099:28: ( ('0'..'9'|'a'..'f'|'A'..'F'))+
-            int cnt10=0;
-            loop10:
-            do {
-                int alt10=2;
-                int LA10_0 = input.LA(1);
-                if ( ((LA10_0>='0' && LA10_0<='9')||(LA10_0>='A' && LA10_0<='F')||(LA10_0>='a' && LA10_0<='f')) ) {
-                    alt10=1;
+                } else {
+                    final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                             this.input );
+                    recover( mse );
+                    throw mse;
                 }
 
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1099:28: ( ('0'..'9'|'a'..'f'|'A'..'F'))+
+                int cnt10 = 0;
+                loop10 : do {
+                    int alt10 = 2;
+                    final int LA10_0 = this.input.LA( 1 );
+                    if ( ((LA10_0 >= '0' && LA10_0 <= '9') || (LA10_0 >= 'A' && LA10_0 <= 'F') || (LA10_0 >= 'a' && LA10_0 <= 'f')) ) {
+                        alt10 = 1;
+                    }
 
-                switch (alt10) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1099:29: ('0'..'9'|'a'..'f'|'A'..'F')
-            	    {
-            	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f') ) {
-            	        input.consume();
+                    switch ( alt10 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1099:29: ('0'..'9'|'a'..'f'|'A'..'F')
+                        {
+                            if ( (this.input.LA( 1 ) >= '0' && this.input.LA( 1 ) <= '9') || (this.input.LA( 1 ) >= 'A' && this.input.LA( 1 ) <= 'F') || (this.input.LA( 1 ) >= 'a' && this.input.LA( 1 ) <= 'f') ) {
+                                this.input.consume();
 
-            	    }
-            	    else {
-            	        MismatchedSetException mse =
-            	            new MismatchedSetException(null,input);
-            	        recover(mse);    throw mse;
-            	    }
+                            } else {
+                                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                         this.input );
+                                recover( mse );
+                                throw mse;
+                            }
 
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            if ( cnt10 >= 1 ) {
+                                break loop10;
+                            }
+                            final EarlyExitException eee = new EarlyExitException( 10,
+                                                                             this.input );
+                            throw eee;
+                    }
+                    cnt10++;
+                } while ( true );
 
-            	default :
-            	    if ( cnt10 >= 1 ) break loop10;
-                        EarlyExitException eee =
-                            new EarlyExitException(10, input);
-                        throw eee;
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1099:58: ( ('l'|'L'))?
+                int alt11 = 2;
+                final int LA11_0 = this.input.LA( 1 );
+                if ( (LA11_0 == 'L' || LA11_0 == 'l') ) {
+                    alt11 = 1;
                 }
-                cnt10++;
-            } while (true);
-
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1099:58: ( ('l'|'L'))?
-            int alt11=2;
-            int LA11_0 = input.LA(1);
-            if ( (LA11_0=='L'||LA11_0=='l') ) {
-                alt11=1;
-            }
-            switch (alt11) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1099:59: ('l'|'L')
+                switch ( alt11 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1099:59: ('l'|'L')
                     {
-                    if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
-                        input.consume();
+                        if ( this.input.LA( 1 ) == 'L' || this.input.LA( 1 ) == 'l' ) {
+                            this.input.consume();
 
-                    }
-                    else {
-                        MismatchedSetException mse =
-                            new MismatchedSetException(null,input);
-                        recover(mse);    throw mse;
-                    }
+                        } else {
+                            final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                     this.input );
+                            recover( mse );
+                            throw mse;
+                        }
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end HEX_LITERAL
 
     // $ANTLR start OCTAL_LITERAL
     public void mOCTAL_LITERAL() throws RecognitionException {
         try {
-            ruleNestingLevel++;
+            this.ruleNestingLevel++;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1102:16: ( '0' ( '0' .. '7' )* ( ('l'|'L'))? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1102:16: '0' ( '0' .. '7' )* ( ('l'|'L'))?
             {
-            match('0'); 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1102:20: ( '0' .. '7' )*
-            loop12:
-            do {
-                int alt12=2;
-                int LA12_0 = input.LA(1);
-                if ( ((LA12_0>='0' && LA12_0<='7')) ) {
-                    alt12=1;
-                }
+                match( '0' );
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1102:20: ( '0' .. '7' )*
+                loop12 : do {
+                    int alt12 = 2;
+                    final int LA12_0 = this.input.LA( 1 );
+                    if ( ((LA12_0 >= '0' && LA12_0 <= '7')) ) {
+                        alt12 = 1;
+                    }
 
+                    switch ( alt12 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1102:21: '0' .. '7'
+                        {
+                            matchRange( '0',
+                                        '7' );
 
-                switch (alt12) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1102:21: '0' .. '7'
-            	    {
-            	    matchRange('0','7'); 
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            break loop12;
+                    }
+                } while ( true );
 
-            	default :
-            	    break loop12;
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1102:32: ( ('l'|'L'))?
+                int alt13 = 2;
+                final int LA13_0 = this.input.LA( 1 );
+                if ( (LA13_0 == 'L' || LA13_0 == 'l') ) {
+                    alt13 = 1;
                 }
-            } while (true);
-
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1102:32: ( ('l'|'L'))?
-            int alt13=2;
-            int LA13_0 = input.LA(1);
-            if ( (LA13_0=='L'||LA13_0=='l') ) {
-                alt13=1;
-            }
-            switch (alt13) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1102:33: ('l'|'L')
+                switch ( alt13 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1102:33: ('l'|'L')
                     {
-                    if ( input.LA(1)=='L'||input.LA(1)=='l' ) {
-                        input.consume();
+                        if ( this.input.LA( 1 ) == 'L' || this.input.LA( 1 ) == 'l' ) {
+                            this.input.consume();
 
-                    }
-                    else {
-                        MismatchedSetException mse =
-                            new MismatchedSetException(null,input);
-                        recover(mse);    throw mse;
-                    }
+                        } else {
+                            final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                     this.input );
+                            recover( mse );
+                            throw mse;
+                        }
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end OCTAL_LITERAL
 
     // $ANTLR start NUM_FLOAT
     public void mNUM_FLOAT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = NUM_FLOAT;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = NUM_FLOAT;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1105:11: ( DIGITS '.' ( DIGITS )? ( EXPONENT_PART )? ( FLOAT_TYPE_SUFFIX )? | '.' DIGITS ( EXPONENT_PART )? ( FLOAT_TYPE_SUFFIX )? | DIGITS EXPONENT_PART FLOAT_TYPE_SUFFIX | DIGITS EXPONENT_PART | DIGITS FLOAT_TYPE_SUFFIX )
-            int alt19=5;
-            alt19 = dfa19.predict(input);
-            switch (alt19) {
+            int alt19 = 5;
+            alt19 = this.dfa19.predict( this.input );
+            switch ( alt19 ) {
                 case 1 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1105:11: DIGITS '.' ( DIGITS )? ( EXPONENT_PART )? ( FLOAT_TYPE_SUFFIX )?
-                    {
-                    mDIGITS(); 
-                    match('.'); 
+                {
+                    mDIGITS();
+                    match( '.' );
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1105:22: ( DIGITS )?
-                    int alt14=2;
-                    int LA14_0 = input.LA(1);
-                    if ( ((LA14_0>='0' && LA14_0<='9')) ) {
-                        alt14=1;
+                    int alt14 = 2;
+                    final int LA14_0 = this.input.LA( 1 );
+                    if ( ((LA14_0 >= '0' && LA14_0 <= '9')) ) {
+                        alt14 = 1;
                     }
-                    switch (alt14) {
+                    switch ( alt14 ) {
                         case 1 :
                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1105:23: DIGITS
-                            {
-                            mDIGITS(); 
+                        {
+                            mDIGITS();
 
-                            }
+                        }
                             break;
 
                     }
 
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1105:32: ( EXPONENT_PART )?
-                    int alt15=2;
-                    int LA15_0 = input.LA(1);
-                    if ( (LA15_0=='E'||LA15_0=='e') ) {
-                        alt15=1;
+                    int alt15 = 2;
+                    final int LA15_0 = this.input.LA( 1 );
+                    if ( (LA15_0 == 'E' || LA15_0 == 'e') ) {
+                        alt15 = 1;
                     }
-                    switch (alt15) {
+                    switch ( alt15 ) {
                         case 1 :
                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1105:33: EXPONENT_PART
-                            {
-                            mEXPONENT_PART(); 
+                        {
+                            mEXPONENT_PART();
 
-                            }
+                        }
                             break;
 
                     }
 
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1105:49: ( FLOAT_TYPE_SUFFIX )?
-                    int alt16=2;
-                    int LA16_0 = input.LA(1);
-                    if ( (LA16_0=='D'||LA16_0=='F'||LA16_0=='d'||LA16_0=='f') ) {
-                        alt16=1;
+                    int alt16 = 2;
+                    final int LA16_0 = this.input.LA( 1 );
+                    if ( (LA16_0 == 'D' || LA16_0 == 'F' || LA16_0 == 'd' || LA16_0 == 'f') ) {
+                        alt16 = 1;
                     }
-                    switch (alt16) {
+                    switch ( alt16 ) {
                         case 1 :
                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1105:50: FLOAT_TYPE_SUFFIX
-                            {
-                            mFLOAT_TYPE_SUFFIX(); 
+                        {
+                            mFLOAT_TYPE_SUFFIX();
 
-                            }
+                        }
                             break;
 
                     }
 
-
-                    }
+                }
                     break;
                 case 2 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1106:7: '.' DIGITS ( EXPONENT_PART )? ( FLOAT_TYPE_SUFFIX )?
-                    {
-                    match('.'); 
-                    mDIGITS(); 
+                {
+                    match( '.' );
+                    mDIGITS();
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1106:18: ( EXPONENT_PART )?
-                    int alt17=2;
-                    int LA17_0 = input.LA(1);
-                    if ( (LA17_0=='E'||LA17_0=='e') ) {
-                        alt17=1;
+                    int alt17 = 2;
+                    final int LA17_0 = this.input.LA( 1 );
+                    if ( (LA17_0 == 'E' || LA17_0 == 'e') ) {
+                        alt17 = 1;
                     }
-                    switch (alt17) {
+                    switch ( alt17 ) {
                         case 1 :
                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1106:19: EXPONENT_PART
-                            {
-                            mEXPONENT_PART(); 
+                        {
+                            mEXPONENT_PART();
 
-                            }
+                        }
                             break;
 
                     }
 
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1106:35: ( FLOAT_TYPE_SUFFIX )?
-                    int alt18=2;
-                    int LA18_0 = input.LA(1);
-                    if ( (LA18_0=='D'||LA18_0=='F'||LA18_0=='d'||LA18_0=='f') ) {
-                        alt18=1;
+                    int alt18 = 2;
+                    final int LA18_0 = this.input.LA( 1 );
+                    if ( (LA18_0 == 'D' || LA18_0 == 'F' || LA18_0 == 'd' || LA18_0 == 'f') ) {
+                        alt18 = 1;
                     }
-                    switch (alt18) {
+                    switch ( alt18 ) {
                         case 1 :
                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1106:36: FLOAT_TYPE_SUFFIX
-                            {
-                            mFLOAT_TYPE_SUFFIX(); 
+                        {
+                            mFLOAT_TYPE_SUFFIX();
 
-                            }
+                        }
                             break;
 
                     }
 
-
-                    }
+                }
                     break;
                 case 3 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1107:11: DIGITS EXPONENT_PART FLOAT_TYPE_SUFFIX
-                    {
-                    mDIGITS(); 
-                    mEXPONENT_PART(); 
-                    mFLOAT_TYPE_SUFFIX(); 
+                {
+                    mDIGITS();
+                    mEXPONENT_PART();
+                    mFLOAT_TYPE_SUFFIX();
 
-                    }
+                }
                     break;
                 case 4 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1108:11: DIGITS EXPONENT_PART
-                    {
-                    mDIGITS(); 
-                    mEXPONENT_PART(); 
+                {
+                    mDIGITS();
+                    mEXPONENT_PART();
 
-                    }
+                }
                     break;
                 case 5 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1109:11: DIGITS FLOAT_TYPE_SUFFIX
-                    {
-                    mDIGITS(); 
-                    mFLOAT_TYPE_SUFFIX(); 
+                {
+                    mDIGITS();
+                    mFLOAT_TYPE_SUFFIX();
 
-                    }
+                }
                     break;
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end NUM_FLOAT
 
     // $ANTLR start DIGITS
     public void mDIGITS() throws RecognitionException {
         try {
-            ruleNestingLevel++;
+            this.ruleNestingLevel++;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1114:10: ( ( '0' .. '9' )+ )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1114:10: ( '0' .. '9' )+
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1114:10: ( '0' .. '9' )+
-            int cnt20=0;
-            loop20:
-            do {
-                int alt20=2;
-                int LA20_0 = input.LA(1);
-                if ( ((LA20_0>='0' && LA20_0<='9')) ) {
-                    alt20=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1114:10: ( '0' .. '9' )+
+                int cnt20 = 0;
+                loop20 : do {
+                    int alt20 = 2;
+                    final int LA20_0 = this.input.LA( 1 );
+                    if ( ((LA20_0 >= '0' && LA20_0 <= '9')) ) {
+                        alt20 = 1;
+                    }
 
+                    switch ( alt20 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1114:11: '0' .. '9'
+                        {
+                            matchRange( '0',
+                                        '9' );
 
-                switch (alt20) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1114:11: '0' .. '9'
-            	    {
-            	    matchRange('0','9'); 
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            if ( cnt20 >= 1 ) {
+                                break loop20;
+                            }
+                            final EarlyExitException eee = new EarlyExitException( 20,
+                                                                             this.input );
+                            throw eee;
+                    }
+                    cnt20++;
+                } while ( true );
 
-            	default :
-            	    if ( cnt20 >= 1 ) break loop20;
-                        EarlyExitException eee =
-                            new EarlyExitException(20, input);
-                        throw eee;
-                }
-                cnt20++;
-            } while (true);
-
-
             }
 
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end DIGITS
 
     // $ANTLR start EXPONENT_PART
     public void mEXPONENT_PART() throws RecognitionException {
         try {
-            ruleNestingLevel++;
+            this.ruleNestingLevel++;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1122:16: ( ('e'|'E') ( ('+'|'-'))? DIGITS )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1122:16: ('e'|'E') ( ('+'|'-'))? DIGITS
             {
-            if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
-                input.consume();
+                if ( this.input.LA( 1 ) == 'E' || this.input.LA( 1 ) == 'e' ) {
+                    this.input.consume();
 
-            }
-            else {
-                MismatchedSetException mse =
-                    new MismatchedSetException(null,input);
-                recover(mse);    throw mse;
-            }
+                } else {
+                    final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                             this.input );
+                    recover( mse );
+                    throw mse;
+                }
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1122:26: ( ('+'|'-'))?
-            int alt21=2;
-            int LA21_0 = input.LA(1);
-            if ( (LA21_0=='+'||LA21_0=='-') ) {
-                alt21=1;
-            }
-            switch (alt21) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1122:27: ('+'|'-')
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1122:26: ( ('+'|'-'))?
+                int alt21 = 2;
+                final int LA21_0 = this.input.LA( 1 );
+                if ( (LA21_0 == '+' || LA21_0 == '-') ) {
+                    alt21 = 1;
+                }
+                switch ( alt21 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1122:27: ('+'|'-')
                     {
-                    if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
-                        input.consume();
+                        if ( this.input.LA( 1 ) == '+' || this.input.LA( 1 ) == '-' ) {
+                            this.input.consume();
 
-                    }
-                    else {
-                        MismatchedSetException mse =
-                            new MismatchedSetException(null,input);
-                        recover(mse);    throw mse;
-                    }
+                        } else {
+                            final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                     this.input );
+                            recover( mse );
+                            throw mse;
+                        }
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-            mDIGITS(); 
+                mDIGITS();
 
             }
 
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end EXPONENT_PART
 
     // $ANTLR start FLOAT_TYPE_SUFFIX
     public void mFLOAT_TYPE_SUFFIX() throws RecognitionException {
         try {
-            ruleNestingLevel++;
+            this.ruleNestingLevel++;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1125:23: ( ('f'|'F'|'d'|'D'))
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1125:23: ('f'|'F'|'d'|'D')
             {
-            if ( input.LA(1)=='D'||input.LA(1)=='F'||input.LA(1)=='d'||input.LA(1)=='f' ) {
-                input.consume();
+                if ( this.input.LA( 1 ) == 'D' || this.input.LA( 1 ) == 'F' || this.input.LA( 1 ) == 'd' || this.input.LA( 1 ) == 'f' ) {
+                    this.input.consume();
 
-            }
-            else {
-                MismatchedSetException mse =
-                    new MismatchedSetException(null,input);
-                recover(mse);    throw mse;
-            }
+                } else {
+                    final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                             this.input );
+                    recover( mse );
+                    throw mse;
+                }
 
-
             }
 
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end FLOAT_TYPE_SUFFIX
 
     // $ANTLR start CHAR_LITERAL
     public void mCHAR_LITERAL() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = CHAR_LITERAL;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = CHAR_LITERAL;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1129:7: ( '\\'' (~ ('\\''|'\\\\') | ESCAPE_SEQUENCE ) '\\'' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1129:7: '\\'' (~ ('\\''|'\\\\') | ESCAPE_SEQUENCE ) '\\''
             {
-            match('\''); 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1130:7: (~ ('\\''|'\\\\') | ESCAPE_SEQUENCE )
-            int alt22=2;
-            int LA22_0 = input.LA(1);
-            if ( ((LA22_0>='\u0000' && LA22_0<='&')||(LA22_0>='(' && LA22_0<='[')||(LA22_0>=']' && LA22_0<='\uFFFE')) ) {
-                alt22=1;
-            }
-            else if ( (LA22_0=='\\') ) {
-                alt22=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("1130:7: (~ ('\\''|'\\\\') | ESCAPE_SEQUENCE )", 22, 0, input);
+                match( '\'' );
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1130:7: (~ ('\\''|'\\\\') | ESCAPE_SEQUENCE )
+                int alt22 = 2;
+                final int LA22_0 = this.input.LA( 1 );
+                if ( ((LA22_0 >= '\u0000' && LA22_0 <= '&') || (LA22_0 >= '(' && LA22_0 <= '[') || (LA22_0 >= ']' && LA22_0 <= '\uFFFE')) ) {
+                    alt22 = 1;
+                } else if ( (LA22_0 == '\\') ) {
+                    alt22 = 2;
+                } else {
+                    final NoViableAltException nvae = new NoViableAltException( "1130:7: (~ ('\\''|'\\\\') | ESCAPE_SEQUENCE )",
+                                                                          22,
+                                                                          0,
+                                                                          this.input );
 
-                throw nvae;
-            }
-            switch (alt22) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1130:9: ~ ('\\''|'\\\\')
+                    throw nvae;
+                }
+                switch ( alt22 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1130:9: ~ ('\\''|'\\\\')
                     {
-                    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
-                        input.consume();
+                        if ( (this.input.LA( 1 ) >= '\u0000' && this.input.LA( 1 ) <= '&') || (this.input.LA( 1 ) >= '(' && this.input.LA( 1 ) <= '[') || (this.input.LA( 1 ) >= ']' && this.input.LA( 1 ) <= '\uFFFE') ) {
+                            this.input.consume();
 
-                    }
-                    else {
-                        MismatchedSetException mse =
-                            new MismatchedSetException(null,input);
-                        recover(mse);    throw mse;
-                    }
+                        } else {
+                            final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                     this.input );
+                            recover( mse );
+                            throw mse;
+                        }
 
-
                     }
-                    break;
-                case 2 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1131:9: ESCAPE_SEQUENCE
+                        break;
+                    case 2 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1131:9: ESCAPE_SEQUENCE
                     {
-                    mESCAPE_SEQUENCE(); 
+                        mESCAPE_SEQUENCE();
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-            match('\''); 
+                match( '\'' );
 
             }
 
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
+            }
 
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end CHAR_LITERAL
 
     // $ANTLR start STRING_LITERAL
     public void mSTRING_LITERAL() throws RecognitionException {
         try {
-            ruleNestingLevel++;
-            int _type = STRING_LITERAL;
-            int _start = getCharIndex();
-            int _line = getLine();
-            int _charPosition = getCharPositionInLine();
-            int _channel = Token.DEFAULT_CHANNEL;
+            this.ruleNestingLevel++;
+            final int _type = STRING_LITERAL;
+            final int _start = getCharIndex();
+            final int _line = getLine();
+            final int _charPosition = getCharPositionInLine();
+            final int _channel = Token.DEFAULT_CHANNEL;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1138:7: ( '\\\"' (~ ('\\\"'|'\\\\') | ESCAPE_SEQUENCE )* '\\\"' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1138:7: '\\\"' (~ ('\\\"'|'\\\\') | ESCAPE_SEQUENCE )* '\\\"'
             {
-            match('\"'); 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1139:7: (~ ('\\\"'|'\\\\') | ESCAPE_SEQUENCE )*
-            loop23:
-            do {
-                int alt23=3;
-                int LA23_0 = input.LA(1);
-                if ( ((LA23_0>='\u0000' && LA23_0<='!')||(LA23_0>='#' && LA23_0<='[')||(LA23_0>=']' && LA23_0<='\uFFFE')) ) {
-                    alt23=1;
-                }
-                else if ( (LA23_0=='\\') ) {
-                    alt23=2;
-                }
+                match( '\"' );
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1139:7: (~ ('\\\"'|'\\\\') | ESCAPE_SEQUENCE )*
+                loop23 : do {
+                    int alt23 = 3;
+                    final int LA23_0 = this.input.LA( 1 );
+                    if ( ((LA23_0 >= '\u0000' && LA23_0 <= '!') || (LA23_0 >= '#' && LA23_0 <= '[') || (LA23_0 >= ']' && LA23_0 <= '\uFFFE')) ) {
+                        alt23 = 1;
+                    } else if ( (LA23_0 == '\\') ) {
+                        alt23 = 2;
+                    }
 
+                    switch ( alt23 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1139:9: ~ ('\\\"'|'\\\\')
+                        {
+                            if ( (this.input.LA( 1 ) >= '\u0000' && this.input.LA( 1 ) <= '!') || (this.input.LA( 1 ) >= '#' && this.input.LA( 1 ) <= '[') || (this.input.LA( 1 ) >= ']' && this.input.LA( 1 ) <= '\uFFFE') ) {
+                                this.input.consume();
 
-                switch (alt23) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1139:9: ~ ('\\\"'|'\\\\')
-            	    {
-            	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
-            	        input.consume();
+                            } else {
+                                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                         this.input );
+                                recover( mse );
+                                throw mse;
+                            }
 
-            	    }
-            	    else {
-            	        MismatchedSetException mse =
-            	            new MismatchedSetException(null,input);
-            	        recover(mse);    throw mse;
-            	    }
+                        }
+                            break;
+                        case 2 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1140:9: ESCAPE_SEQUENCE
+                        {
+                            mESCAPE_SEQUENCE();
 
+                        }
+                            break;
 
-            	    }
-            	    break;
-            	case 2 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1140:9: ESCAPE_SEQUENCE
-            	    {
-            	    mESCAPE_SEQUENCE(); 
+                        default :
+                            break loop23;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
+                match( '\"' );
 
-            	default :
-            	    break loop23;
-                }
-            } while (true);
+            }
 
-            match('\"'); 
-
+            if ( this.token == null && this.ruleNestingLevel == 1 ) {
+                emit( _type,
+                      _line,
+                      _charPosition,
+                      _channel,
+                      _start,
+                      getCharIndex() - 1 );
             }
 
-
-
-                    if ( token==null && ruleNestingLevel==1 ) {
-                        emit(_type,_line,_charPosition,_channel,_start,getCharIndex()-1);
-                    }
-
-                        }
-        finally {
-            ruleNestingLevel--;
+        } finally {
+            this.ruleNestingLevel--;
         }
     }
+
     // $ANTLR end STRING_LITERAL
 
     // $ANTLR start ESCAPE_SEQUENCE
     public void mESCAPE_SEQUENCE() throws RecognitionException {
         try {
-            ruleNestingLevel++;
+            this.ruleNestingLevel++;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1147:7: ( '\\\\' 'b' | '\\\\' 't' | '\\\\' 'n' | '\\\\' 'f' | '\\\\' 'r' | '\\\\' '\\\"' | '\\\\' '\\'' | '\\\\' '\\\\' | '\\\\' '0' .. '3' OCTAL_DIGIT OCTAL_DIGIT | '\\\\' OCTAL_DIGIT OCTAL_DIGIT | '\\\\' OCTAL_DIGIT | UNICODE_CHAR )
-            int alt24=12;
-            int LA24_0 = input.LA(1);
-            if ( (LA24_0=='\\') ) {
-                switch ( input.LA(2) ) {
-                case 'r':
-                    alt24=5;
-                    break;
-                case '\\':
-                    alt24=8;
-                    break;
-                case 't':
-                    alt24=2;
-                    break;
-                case 'f':
-                    alt24=4;
-                    break;
-                case '\'':
-                    alt24=7;
-                    break;
-                case 'u':
-                    alt24=12;
-                    break;
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                    int LA24_8 = input.LA(3);
-                    if ( ((LA24_8>='0' && LA24_8<='7')) ) {
-                        int LA24_14 = input.LA(4);
-                        if ( ((LA24_14>='0' && LA24_14<='7')) ) {
-                            alt24=9;
+            int alt24 = 12;
+            final int LA24_0 = this.input.LA( 1 );
+            if ( (LA24_0 == '\\') ) {
+                switch ( this.input.LA( 2 ) ) {
+                    case 'r' :
+                        alt24 = 5;
+                        break;
+                    case '\\' :
+                        alt24 = 8;
+                        break;
+                    case 't' :
+                        alt24 = 2;
+                        break;
+                    case 'f' :
+                        alt24 = 4;
+                        break;
+                    case '\'' :
+                        alt24 = 7;
+                        break;
+                    case 'u' :
+                        alt24 = 12;
+                        break;
+                    case '0' :
+                    case '1' :
+                    case '2' :
+                    case '3' :
+                        final int LA24_8 = this.input.LA( 3 );
+                        if ( ((LA24_8 >= '0' && LA24_8 <= '7')) ) {
+                            final int LA24_14 = this.input.LA( 4 );
+                            if ( ((LA24_14 >= '0' && LA24_14 <= '7')) ) {
+                                alt24 = 9;
+                            } else {
+                                alt24 = 10;
+                            }
+                        } else {
+                            alt24 = 11;
                         }
-                        else {
-                            alt24=10;}
-                    }
-                    else {
-                        alt24=11;}
-                    break;
-                case 'b':
-                    alt24=1;
-                    break;
-                case 'n':
-                    alt24=3;
-                    break;
-                case '\"':
-                    alt24=6;
-                    break;
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                    int LA24_12 = input.LA(3);
-                    if ( ((LA24_12>='0' && LA24_12<='7')) ) {
-                        alt24=10;
-                    }
-                    else {
-                        alt24=11;}
-                    break;
-                default:
-                    NoViableAltException nvae =
-                        new NoViableAltException("1145:1: fragment ESCAPE_SEQUENCE : ( '\\\\' 'b' | '\\\\' 't' | '\\\\' 'n' | '\\\\' 'f' | '\\\\' 'r' | '\\\\' '\\\"' | '\\\\' '\\'' | '\\\\' '\\\\' | '\\\\' '0' .. '3' OCTAL_DIGIT OCTAL_DIGIT | '\\\\' OCTAL_DIGIT OCTAL_DIGIT | '\\\\' OCTAL_DIGIT | UNICODE_CHAR );", 24, 1, input);
+                        break;
+                    case 'b' :
+                        alt24 = 1;
+                        break;
+                    case 'n' :
+                        alt24 = 3;
+                        break;
+                    case '\"' :
+                        alt24 = 6;
+                        break;
+                    case '4' :
+                    case '5' :
+                    case '6' :
+                    case '7' :
+                        final int LA24_12 = this.input.LA( 3 );
+                        if ( ((LA24_12 >= '0' && LA24_12 <= '7')) ) {
+                            alt24 = 10;
+                        } else {
+                            alt24 = 11;
+                        }
+                        break;
+                    default :
+                        final NoViableAltException nvae = new NoViableAltException( "1145:1: fragment ESCAPE_SEQUENCE : ( '\\\\' 'b' | '\\\\' 't' | '\\\\' 'n' | '\\\\' 'f' | '\\\\' 'r' | '\\\\' '\\\"' | '\\\\' '\\'' | '\\\\' '\\\\' | '\\\\' '0' .. '3' OCTAL_DIGIT OCTAL_DIGIT | '\\\\' OCTAL_DIGIT OCTAL_DIGIT | '\\\\' OCTAL_DIGIT | UNICODE_CHAR );",
+                                                                              24,
+                                                                              1,
+                                                                              this.input );
 
-                    throw nvae;
+                        throw nvae;
                 }
 
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("1145:1: fragment ESCAPE_SEQUENCE : ( '\\\\' 'b' | '\\\\' 't' | '\\\\' 'n' | '\\\\' 'f' | '\\\\' 'r' | '\\\\' '\\\"' | '\\\\' '\\'' | '\\\\' '\\\\' | '\\\\' '0' .. '3' OCTAL_DIGIT OCTAL_DIGIT | '\\\\' OCTAL_DIGIT OCTAL_DIGIT | '\\\\' OCTAL_DIGIT | UNICODE_CHAR );", 24, 0, input);
+            } else {
+                final NoViableAltException nvae = new NoViableAltException( "1145:1: fragment ESCAPE_SEQUENCE : ( '\\\\' 'b' | '\\\\' 't' | '\\\\' 'n' | '\\\\' 'f' | '\\\\' 'r' | '\\\\' '\\\"' | '\\\\' '\\'' | '\\\\' '\\\\' | '\\\\' '0' .. '3' OCTAL_DIGIT OCTAL_DIGIT | '\\\\' OCTAL_DIGIT OCTAL_DIGIT | '\\\\' OCTAL_DIGIT | UNICODE_CHAR );",
+                                                                      24,
+                                                                      0,
+                                                                      this.input );
 
                 throw nvae;
             }
-            switch (alt24) {
+            switch ( alt24 ) {
                 case 1 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1147:7: '\\\\' 'b'
-                    {
-                    match('\\'); 
-                    match('b'); 
+                {
+                    match( '\\' );
+                    match( 'b' );
 
-                    }
+                }
                     break;
                 case 2 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1148:9: '\\\\' 't'
-                    {
-                    match('\\'); 
-                    match('t'); 
+                {
+                    match( '\\' );
+                    match( 't' );
 
-                    }
+                }
                     break;
                 case 3 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1149:9: '\\\\' 'n'
-                    {
-                    match('\\'); 
-                    match('n'); 
+                {
+                    match( '\\' );
+                    match( 'n' );
 
-                    }
+                }
                     break;
                 case 4 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1150:9: '\\\\' 'f'
-                    {
-                    match('\\'); 
-                    match('f'); 
+                {
+                    match( '\\' );
+                    match( 'f' );
 
-                    }
+                }
                     break;
                 case 5 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1151:9: '\\\\' 'r'
-                    {
-                    match('\\'); 
-                    match('r'); 
+                {
+                    match( '\\' );
+                    match( 'r' );
 
-                    }
+                }
                     break;
                 case 6 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1152:9: '\\\\' '\\\"'
-                    {
-                    match('\\'); 
-                    match('\"'); 
+                {
+                    match( '\\' );
+                    match( '\"' );
 
-                    }
+                }
                     break;
                 case 7 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1153:9: '\\\\' '\\''
-                    {
-                    match('\\'); 
-                    match('\''); 
+                {
+                    match( '\\' );
+                    match( '\'' );
 
-                    }
+                }
                     break;
                 case 8 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1154:9: '\\\\' '\\\\'
-                    {
-                    match('\\'); 
-                    match('\\'); 
+                {
+                    match( '\\' );
+                    match( '\\' );
 
-                    }
+                }
                     break;
                 case 9 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1155:7: '\\\\' '0' .. '3' OCTAL_DIGIT OCTAL_DIGIT
-                    {
-                    match('\\'); 
-                    matchRange('0','3'); 
-                    mOCTAL_DIGIT(); 
-                    mOCTAL_DIGIT(); 
+                {
+                    match( '\\' );
+                    matchRange( '0',
+                                '3' );
+                    mOCTAL_DIGIT();
+                    mOCTAL_DIGIT();
 
-                    }
+                }
                     break;
                 case 10 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1156:9: '\\\\' OCTAL_DIGIT OCTAL_DIGIT
-                    {
-                    match('\\'); 
-                    mOCTAL_DIGIT(); 
-                    mOCTAL_DIGIT(); 
+                {
+                    match( '\\' );
+                    mOCTAL_DIGIT();
+                    mOCTAL_DIGIT();
 
-                    }
+                }
                     break;
                 case 11 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1157:9: '\\\\' OCTAL_DIGIT
-                    {
-                    match('\\'); 
-                    mOCTAL_DIGIT(); 
+                {
+                    match( '\\' );
+                    mOCTAL_DIGIT();
 
-                    }
+                }
                     break;
                 case 12 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1158:4: UNICODE_CHAR
-                    {
-                    mUNICODE_CHAR(); 
+                {
+                    mUNICODE_CHAR();
 
-                    }
+                }
                     break;
 
             }
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end ESCAPE_SEQUENCE
 
     // $ANTLR start UNICODE_CHAR
     public void mUNICODE_CHAR() throws RecognitionException {
         try {
-            ruleNestingLevel++;
+            this.ruleNestingLevel++;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1163:4: ( '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1163:4: '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
             {
-            match('\\'); 
-            match('u'); 
-            mHEX_DIGIT(); 
-            mHEX_DIGIT(); 
-            mHEX_DIGIT(); 
-            mHEX_DIGIT(); 
+                match( '\\' );
+                match( 'u' );
+                mHEX_DIGIT();
+                mHEX_DIGIT();
+                mHEX_DIGIT();
+                mHEX_DIGIT();
 
             }
 
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end UNICODE_CHAR
 
     // $ANTLR start HEX_DIGIT
     public void mHEX_DIGIT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
+            this.ruleNestingLevel++;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1168:2: ( ('0'..'9'|'a'..'f'|'A'..'F'))
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1168:4: ('0'..'9'|'a'..'f'|'A'..'F')
             {
-            if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f') ) {
-                input.consume();
+                if ( (this.input.LA( 1 ) >= '0' && this.input.LA( 1 ) <= '9') || (this.input.LA( 1 ) >= 'A' && this.input.LA( 1 ) <= 'F') || (this.input.LA( 1 ) >= 'a' && this.input.LA( 1 ) <= 'f') ) {
+                    this.input.consume();
 
-            }
-            else {
-                MismatchedSetException mse =
-                    new MismatchedSetException(null,input);
-                recover(mse);    throw mse;
-            }
+                } else {
+                    final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                             this.input );
+                    recover( mse );
+                    throw mse;
+                }
 
-
             }
 
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end HEX_DIGIT
 
     // $ANTLR start OCTAL_DIGIT
     public void mOCTAL_DIGIT() throws RecognitionException {
         try {
-            ruleNestingLevel++;
+            this.ruleNestingLevel++;
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1173:4: ( '0' .. '7' )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1173:4: '0' .. '7'
             {
-            matchRange('0','7'); 
+                matchRange( '0',
+                            '7' );
 
             }
 
+        } finally {
+            this.ruleNestingLevel--;
         }
-        finally {
-            ruleNestingLevel--;
-        }
     }
+
     // $ANTLR end OCTAL_DIGIT
 
     public void mTokens() throws RecognitionException {
         // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:10: ( T68 | T69 | T70 | T71 | T72 | T73 | T74 | T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | T84 | T85 | T86 | T87 | T88 | T89 | T90 | T91 | T92 | T93 | T94 | T95 | T96 | T97 | T98 | T99 | T100 | T101 | T102 | T103 | T104 | T105 | T106 | T107 | T108 | T109 | T110 | T111 | T112 | T113 | T114 | T115 | QUESTION | LPAREN | RPAREN | LBRACK | RBRACK | LCURLY | RCURLY | COLON | COMMA | DOT | ASSIGN | EQUAL | LNOT | BNOT | NOT_EQUAL | DIV | DIV_ASSIGN | PLUS | PLUS_ASSIGN | INC | MINUS | MINUS_ASSIGN | DEC | STAR | STAR_ASSIGN | MOD | MOD_ASSIGN | SR | SR_ASSIGN | BSR | BSR_ASSIGN | GE | GT | SL | SL_ASSIGN | LE | LT | BXOR | BXOR_ASSIGN | BOR | BOR_ASSIGN | LOR | BAND | BAND_ASSIGN | LAND | SEMI | WS | SL_COMMENT | ML_COMMENT | IDENT | NUM_INT | NUM_FLOAT | CHAR_LITERAL | STRING_LITERAL )
-        int alt25=102;
-        alt25 = dfa25.predict(input);
-        switch (alt25) {
+        int alt25 = 102;
+        alt25 = this.dfa25.predict( this.input );
+        switch ( alt25 ) {
             case 1 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:10: T68
-                {
-                mT68(); 
+            {
+                mT68();
 
-                }
+            }
                 break;
             case 2 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:14: T69
-                {
-                mT69(); 
+            {
+                mT69();
 
-                }
+            }
                 break;
             case 3 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:18: T70
-                {
-                mT70(); 
+            {
+                mT70();
 
-                }
+            }
                 break;
             case 4 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:22: T71
-                {
-                mT71(); 
+            {
+                mT71();
 
-                }
+            }
                 break;
             case 5 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:26: T72
-                {
-                mT72(); 
+            {
+                mT72();
 
-                }
+            }
                 break;
             case 6 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:30: T73
-                {
-                mT73(); 
+            {
+                mT73();
 
-                }
+            }
                 break;
             case 7 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:34: T74
-                {
-                mT74(); 
+            {
+                mT74();
 
-                }
+            }
                 break;
             case 8 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:38: T75
-                {
-                mT75(); 
+            {
+                mT75();
 
-                }
+            }
                 break;
             case 9 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:42: T76
-                {
-                mT76(); 
+            {
+                mT76();
 
-                }
+            }
                 break;
             case 10 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:46: T77
-                {
-                mT77(); 
+            {
+                mT77();
 
-                }
+            }
                 break;
             case 11 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:50: T78
-                {
-                mT78(); 
+            {
+                mT78();
 
-                }
+            }
                 break;
             case 12 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:54: T79
-                {
-                mT79(); 
+            {
+                mT79();
 
-                }
+            }
                 break;
             case 13 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:58: T80
-                {
-                mT80(); 
+            {
+                mT80();
 
-                }
+            }
                 break;
             case 14 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:62: T81
-                {
-                mT81(); 
+            {
+                mT81();
 
-                }
+            }
                 break;
             case 15 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:66: T82
-                {
-                mT82(); 
+            {
+                mT82();
 
-                }
+            }
                 break;
             case 16 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:70: T83
-                {
-                mT83(); 
+            {
+                mT83();
 
-                }
+            }
                 break;
             case 17 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:74: T84
-                {
-                mT84(); 
+            {
+                mT84();
 
-                }
+            }
                 break;
             case 18 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:78: T85
-                {
-                mT85(); 
+            {
+                mT85();
 
-                }
+            }
                 break;
             case 19 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:82: T86
-                {
-                mT86(); 
+            {
+                mT86();
 
-                }
+            }
                 break;
             case 20 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:86: T87
-                {
-                mT87(); 
+            {
+                mT87();
 
-                }
+            }
                 break;
             case 21 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:90: T88
-                {
-                mT88(); 
+            {
+                mT88();
 
-                }
+            }
                 break;
             case 22 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:94: T89
-                {
-                mT89(); 
+            {
+                mT89();
 
-                }
+            }
                 break;
             case 23 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:98: T90
-                {
-                mT90(); 
+            {
+                mT90();
 
-                }
+            }
                 break;
             case 24 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:102: T91
-                {
-                mT91(); 
+            {
+                mT91();
 
-                }
+            }
                 break;
             case 25 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:106: T92
-                {
-                mT92(); 
+            {
+                mT92();
 
-                }
+            }
                 break;
             case 26 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:110: T93
-                {
-                mT93(); 
+            {
+                mT93();
 
-                }
+            }
                 break;
             case 27 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:114: T94
-                {
-                mT94(); 
+            {
+                mT94();
 
-                }
+            }
                 break;
             case 28 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:118: T95
-                {
-                mT95(); 
+            {
+                mT95();
 
-                }
+            }
                 break;
             case 29 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:122: T96
-                {
-                mT96(); 
+            {
+                mT96();
 
-                }
+            }
                 break;
             case 30 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:126: T97
-                {
-                mT97(); 
+            {
+                mT97();
 
-                }
+            }
                 break;
             case 31 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:130: T98
-                {
-                mT98(); 
+            {
+                mT98();
 
-                }
+            }
                 break;
             case 32 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:134: T99
-                {
-                mT99(); 
+            {
+                mT99();
 
-                }
+            }
                 break;
             case 33 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:138: T100
-                {
-                mT100(); 
+            {
+                mT100();
 
-                }
+            }
                 break;
             case 34 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:143: T101
-                {
-                mT101(); 
+            {
+                mT101();
 
-                }
+            }
                 break;
             case 35 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:148: T102
-                {
-                mT102(); 
+            {
+                mT102();
 
-                }
+            }
                 break;
             case 36 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:153: T103
-                {
-                mT103(); 
+            {
+                mT103();
 
-                }
+            }
                 break;
             case 37 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:158: T104
-                {
-                mT104(); 
+            {
+                mT104();
 
-                }
+            }
                 break;
             case 38 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:163: T105
-                {
-                mT105(); 
+            {
+                mT105();
 
-                }
+            }
                 break;
             case 39 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:168: T106
-                {
-                mT106(); 
+            {
+                mT106();
 
-                }
+            }
                 break;
             case 40 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:173: T107
-                {
-                mT107(); 
+            {
+                mT107();
 
-                }
+            }
                 break;
             case 41 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:178: T108
-                {
-                mT108(); 
+            {
+                mT108();
 
-                }
+            }
                 break;
             case 42 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:183: T109
-                {
-                mT109(); 
+            {
+                mT109();
 
-                }
+            }
                 break;
             case 43 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:188: T110
-                {
-                mT110(); 
+            {
+                mT110();
 
-                }
+            }
                 break;
             case 44 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:193: T111
-                {
-                mT111(); 
+            {
+                mT111();
 
-                }
+            }
                 break;
             case 45 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:198: T112
-                {
-                mT112(); 
+            {
+                mT112();
 
-                }
+            }
                 break;
             case 46 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:203: T113
-                {
-                mT113(); 
+            {
+                mT113();
 
-                }
+            }
                 break;
             case 47 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:208: T114
-                {
-                mT114(); 
+            {
+                mT114();
 
-                }
+            }
                 break;
             case 48 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:213: T115
-                {
-                mT115(); 
+            {
+                mT115();
 
-                }
+            }
                 break;
             case 49 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:218: QUESTION
-                {
-                mQUESTION(); 
+            {
+                mQUESTION();
 
-                }
+            }
                 break;
             case 50 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:227: LPAREN
-                {
-                mLPAREN(); 
+            {
+                mLPAREN();
 
-                }
+            }
                 break;
             case 51 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:234: RPAREN
-                {
-                mRPAREN(); 
+            {
+                mRPAREN();
 
-                }
+            }
                 break;
             case 52 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:241: LBRACK
-                {
-                mLBRACK(); 
+            {
+                mLBRACK();
 
-                }
+            }
                 break;
             case 53 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:248: RBRACK
-                {
-                mRBRACK(); 
+            {
+                mRBRACK();
 
-                }
+            }
                 break;
             case 54 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:255: LCURLY
-                {
-                mLCURLY(); 
+            {
+                mLCURLY();
 
-                }
+            }
                 break;
             case 55 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:262: RCURLY
-                {
-                mRCURLY(); 
+            {
+                mRCURLY();
 
-                }
+            }
                 break;
             case 56 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:269: COLON
-                {
-                mCOLON(); 
+            {
+                mCOLON();
 
-                }
+            }
                 break;
             case 57 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:275: COMMA
-                {
-                mCOMMA(); 
+            {
+                mCOMMA();
 
-                }
+            }
                 break;
             case 58 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:281: DOT
-                {
-                mDOT(); 
+            {
+                mDOT();
 
-                }
+            }
                 break;
             case 59 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:285: ASSIGN
-                {
-                mASSIGN(); 
+            {
+                mASSIGN();
 
-                }
+            }
                 break;
             case 60 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:292: EQUAL
-                {
-                mEQUAL(); 
+            {
+                mEQUAL();
 
-                }
+            }
                 break;
             case 61 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:298: LNOT
-                {
-                mLNOT(); 
+            {
+                mLNOT();
 
-                }
+            }
                 break;
             case 62 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:303: BNOT
-                {
-                mBNOT(); 
+            {
+                mBNOT();
 
-                }
+            }
                 break;
             case 63 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:308: NOT_EQUAL
-                {
-                mNOT_EQUAL(); 
+            {
+                mNOT_EQUAL();
 
-                }
+            }
                 break;
             case 64 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:318: DIV
-                {
-                mDIV(); 
+            {
+                mDIV();
 
-                }
+            }
                 break;
             case 65 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:322: DIV_ASSIGN
-                {
-                mDIV_ASSIGN(); 
+            {
+                mDIV_ASSIGN();
 
-                }
+            }
                 break;
             case 66 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:333: PLUS
-                {
-                mPLUS(); 
+            {
+                mPLUS();
 
-                }
+            }
                 break;
             case 67 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:338: PLUS_ASSIGN
-                {
-                mPLUS_ASSIGN(); 
+            {
+                mPLUS_ASSIGN();
 
-                }
+            }
                 break;
             case 68 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:350: INC
-                {
-                mINC(); 
+            {
+                mINC();
 
-                }
+            }
                 break;
             case 69 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:354: MINUS
-                {
-                mMINUS(); 
+            {
+                mMINUS();
 
-                }
+            }
                 break;
             case 70 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:360: MINUS_ASSIGN
-                {
-                mMINUS_ASSIGN(); 
+            {
+                mMINUS_ASSIGN();
 
-                }
+            }
                 break;
             case 71 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:373: DEC
-                {
-                mDEC(); 
+            {
+                mDEC();
 
-                }
+            }
                 break;
             case 72 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:377: STAR
-                {
-                mSTAR(); 
+            {
+                mSTAR();
 
-                }
+            }
                 break;
             case 73 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:382: STAR_ASSIGN
-                {
-                mSTAR_ASSIGN(); 
+            {
+                mSTAR_ASSIGN();
 
-                }
+            }
                 break;
             case 74 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:394: MOD
-                {
-                mMOD(); 
+            {
+                mMOD();
 
-                }
+            }
                 break;
             case 75 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:398: MOD_ASSIGN
-                {
-                mMOD_ASSIGN(); 
+            {
+                mMOD_ASSIGN();
 
-                }
+            }
                 break;
             case 76 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:409: SR
-                {
-                mSR(); 
+            {
+                mSR();
 
-                }
+            }
                 break;
             case 77 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:412: SR_ASSIGN
-                {
-                mSR_ASSIGN(); 
+            {
+                mSR_ASSIGN();
 
-                }
+            }
                 break;
             case 78 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:422: BSR
-                {
-                mBSR(); 
+            {
+                mBSR();
 
-                }
+            }
                 break;
             case 79 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:426: BSR_ASSIGN
-                {
-                mBSR_ASSIGN(); 
+            {
+                mBSR_ASSIGN();
 
-                }
+            }
                 break;
             case 80 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:437: GE
-                {
-                mGE(); 
+            {
+                mGE();
 
-                }
+            }
                 break;
             case 81 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:440: GT
-                {
-                mGT(); 
+            {
+                mGT();
 
-                }
+            }
                 break;
             case 82 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:443: SL
-                {
-                mSL(); 
+            {
+                mSL();
 
-                }
+            }
                 break;
             case 83 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:446: SL_ASSIGN
-                {
-                mSL_ASSIGN(); 
+            {
+                mSL_ASSIGN();
 
-                }
+            }
                 break;
             case 84 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:456: LE
-                {
-                mLE(); 
+            {
+                mLE();
 
-                }
+            }
                 break;
             case 85 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:459: LT
-                {
-                mLT(); 
+            {
+                mLT();
 
-                }
+            }
                 break;
             case 86 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:462: BXOR
-                {
-                mBXOR(); 
+            {
+                mBXOR();
 
-                }
+            }
                 break;
             case 87 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:467: BXOR_ASSIGN
-                {
-                mBXOR_ASSIGN(); 
+            {
+                mBXOR_ASSIGN();
 
-                }
+            }
                 break;
             case 88 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:479: BOR
-                {
-                mBOR(); 
+            {
+                mBOR();
 
-                }
+            }
                 break;
             case 89 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:483: BOR_ASSIGN
-                {
-                mBOR_ASSIGN(); 
+            {
+                mBOR_ASSIGN();
 
-                }
+            }
                 break;
             case 90 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:494: LOR
-                {
-                mLOR(); 
+            {
+                mLOR();
 
-                }
+            }
                 break;
             case 91 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:498: BAND
-                {
-                mBAND(); 
+            {
+                mBAND();
 
-                }
+            }
                 break;
             case 92 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:503: BAND_ASSIGN
-                {
-                mBAND_ASSIGN(); 
+            {
+                mBAND_ASSIGN();
 
-                }
+            }
                 break;
             case 93 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:515: LAND
-                {
-                mLAND(); 
+            {
+                mLAND();
 
-                }
+            }
                 break;
             case 94 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:520: SEMI
-                {
-                mSEMI(); 
+            {
+                mSEMI();
 
-                }
+            }
                 break;
             case 95 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:525: WS
-                {
-                mWS(); 
+            {
+                mWS();
 
-                }
+            }
                 break;
             case 96 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:528: SL_COMMENT
-                {
-                mSL_COMMENT(); 
+            {
+                mSL_COMMENT();
 
-                }
+            }
                 break;
             case 97 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:539: ML_COMMENT
-                {
-                mML_COMMENT(); 
+            {
+                mML_COMMENT();
 
-                }
+            }
                 break;
             case 98 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:550: IDENT
-                {
-                mIDENT(); 
+            {
+                mIDENT();
 
-                }
+            }
                 break;
             case 99 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:556: NUM_INT
-                {
-                mNUM_INT(); 
+            {
+                mNUM_INT();
 
-                }
+            }
                 break;
             case 100 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:564: NUM_FLOAT
-                {
-                mNUM_FLOAT(); 
+            {
+                mNUM_FLOAT();
 
-                }
+            }
                 break;
             case 101 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:574: CHAR_LITERAL
-                {
-                mCHAR_LITERAL(); 
+            {
+                mCHAR_LITERAL();
 
-                }
+            }
                 break;
             case 102 :
                 // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:1:587: STRING_LITERAL
-                {
-                mSTRING_LITERAL(); 
+            {
+                mSTRING_LITERAL();
 
-                }
+            }
                 break;
 
         }
 
     }
 
+    protected DFA19              dfa19            = new DFA19( this );
+    protected DFA25              dfa25            = new DFA25( this );
+    public static final String   DFA19_eotS       = "\7\uffff\1\10\2\uffff";
+    public static final String   DFA19_eofS       = "\12\uffff";
+    public static final String   DFA19_minS       = "\2\56\2\uffff\1\53\1\uffff\2\60\2\uffff";
+    public static final String   DFA19_maxS       = "\1\71\1\146\2\uffff\1\71\1\uffff\1\71\1\146\2\uffff";
+    public static final String   DFA19_acceptS    = "\2\uffff\1\2\1\5\1\uffff\1\1\2\uffff\1\4\1\3";
+    public static final String   DFA19_specialS   = "\12\uffff}>";
+    public static final String[] DFA19_transition = {"\1\2\1\uffff\12\1", "\1\5\1\uffff\12\1\12\uffff\1\3\1\4\1\3\35\uffff\1\3\1\4\1\3", "", "", "\1\6\1\uffff\1\6\2\uffff\12\7", "", "\12\7",
+            "\12\7\12\uffff\1\11\1\uffff\1\11\35\uffff\1\11\1\uffff\1\11", "", ""};
 
-    protected DFA19 dfa19 = new DFA19(this);
-    protected DFA25 dfa25 = new DFA25(this);
-    public static final String DFA19_eotS =
-        "\7\uffff\1\10\2\uffff";
-    public static final String DFA19_eofS =
-        "\12\uffff";
-    public static final String DFA19_minS =
-        "\2\56\2\uffff\1\53\1\uffff\2\60\2\uffff";
-    public static final String DFA19_maxS =
-        "\1\71\1\146\2\uffff\1\71\1\uffff\1\71\1\146\2\uffff";
-    public static final String DFA19_acceptS =
-        "\2\uffff\1\2\1\5\1\uffff\1\1\2\uffff\1\4\1\3";
-    public static final String DFA19_specialS =
-        "\12\uffff}>";
-    public static final String[] DFA19_transition = {
-        "\1\2\1\uffff\12\1",
-        "\1\5\1\uffff\12\1\12\uffff\1\3\1\4\1\3\35\uffff\1\3\1\4\1\3",
-        "",
-        "",
-        "\1\6\1\uffff\1\6\2\uffff\12\7",
-        "",
-        "\12\7",
-        "\12\7\12\uffff\1\11\1\uffff\1\11\35\uffff\1\11\1\uffff\1\11",
-        "",
-        ""
-    };
-
     class DFA19 extends DFA {
-        public DFA19(BaseRecognizer recognizer) {
+        public DFA19(final BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 19;
-            this.eot = DFA.unpackEncodedString(DFA19_eotS);
-            this.eof = DFA.unpackEncodedString(DFA19_eofS);
-            this.min = DFA.unpackEncodedStringToUnsignedChars(DFA19_minS);
-            this.max = DFA.unpackEncodedStringToUnsignedChars(DFA19_maxS);
-            this.accept = DFA.unpackEncodedString(DFA19_acceptS);
-            this.special = DFA.unpackEncodedString(DFA19_specialS);
-            int numStates = DFA19_transition.length;
+            this.eot = DFA.unpackEncodedString( DFA19_eotS );
+            this.eof = DFA.unpackEncodedString( DFA19_eofS );
+            this.min = DFA.unpackEncodedStringToUnsignedChars( DFA19_minS );
+            this.max = DFA.unpackEncodedStringToUnsignedChars( DFA19_maxS );
+            this.accept = DFA.unpackEncodedString( DFA19_acceptS );
+            this.special = DFA.unpackEncodedString( DFA19_specialS );
+            final int numStates = DFA19_transition.length;
             this.transition = new short[numStates][];
-            for (int i=0; i<numStates; i++) {
-                transition[i] = DFA.unpackEncodedString(DFA19_transition[i]);
+            for ( int i = 0; i < numStates; i++ ) {
+                this.transition[i] = DFA.unpackEncodedString( DFA19_transition[i] );
             }
         }
+
         public String getDescription() {
             return "1104:1: NUM_FLOAT : ( DIGITS '.' ( DIGITS )? ( EXPONENT_PART )? ( FLOAT_TYPE_SUFFIX )? | '.' DIGITS ( EXPONENT_PART )? ( FLOAT_TYPE_SUFFIX )? | DIGITS EXPONENT_PART FLOAT_TYPE_SUFFIX | DIGITS EXPONENT_PART | DIGITS FLOAT_TYPE_SUFFIX );";
         }
     }
-    public static final String DFA25_eotS =
-        "\1\uffff\17\51\11\uffff\1\122\1\124\1\126\1\uffff\1\132\1\135\1"+
-        "\140\1\142\1\144\1\147\1\152\1\154\1\157\1\162\3\uffff\2\163\2\uffff"+
-        "\17\51\1\u0089\5\51\1\u0090\15\51\25\uffff\1\u00a4\1\uffff\1\u00a6"+
-        "\13\uffff\2\163\21\51\1\u00b9\1\51\1\uffff\1\u00bb\5\51\1\uffff"+
-        "\4\51\1\u00c5\7\51\1\u00ce\4\51\1\u00d4\4\uffff\1\u00d5\3\51\1\u00d9"+
-        "\1\u00da\1\51\1\u00dc\12\51\1\uffff\1\51\1\uffff\3\51\1\u00eb\5"+
-        "\51\1\uffff\1\51\1\u00f2\2\51\1\u00f5\1\51\1\u00f7\1\51\1\uffff"+
-        "\1\u00f9\3\51\3\uffff\2\51\1\u00ff\2\uffff\1\u0100\1\uffff\1\u0101"+
-        "\1\51\1\u0103\4\51\1\u0108\3\51\1\u010c\1\u010e\1\u010f\1\uffff"+
-        "\6\51\1\uffff\1\51\1\u0118\1\uffff\1\51\1\uffff\1\51\1\uffff\1\51"+
-        "\1\u011c\3\51\3\uffff\1\51\1\uffff\2\51\1\u0123\1\u0124\1\uffff"+
-        "\3\51\1\uffff\1\51\2\uffff\1\u0129\1\51\1\u012b\4\51\1\u0130\1\uffff"+
-        "\1\51\1\u0132\1\51\1\uffff\1\u0134\1\51\1\u0136\3\51\2\uffff\3\51"+
-        "\1\u013d\1\uffff\1\u013e\1\uffff\1\51\1\u0140\2\51\1\uffff\1\51"+
-        "\1\uffff\1\u0144\1\uffff\1\u0145\1\uffff\1\u0146\1\51\1\u0148\3"+
-        "\51\2\uffff\1\51\1\uffff\2\51\1\u014f\3\uffff\1\51\1\uffff\1\51"+
-        "\1\u0152\1\51\1\u0154\1\u0155\1\51\1\uffff\1\51\1\u0158\1\uffff"+
-        "\1\u0159\2\uffff\1\u015a\1\51\3\uffff\1\u015c\1\uffff";
-    public static final String DFA25_eofS =
-        "\u015d\uffff";
-    public static final String DFA25_minS =
-        "\1\11\2\157\1\141\1\150\1\146\1\141\1\157\1\145\1\162\1\150\1\142"+
-        "\1\141\1\154\1\150\1\145\11\uffff\1\60\2\75\1\uffff\1\52\1\53\1"+
-        "\55\3\75\1\74\2\75\1\46\3\uffff\2\56\2\uffff\1\151\1\157\1\145\1"+
-        "\164\1\163\2\141\1\156\1\160\1\156\1\141\1\151\1\157\1\160\1\163"+
-        "\1\44\1\162\1\154\1\156\1\157\1\156\1\44\1\146\1\142\1\151\1\141"+
-        "\1\151\1\163\1\154\1\164\1\167\1\163\1\164\1\151\1\164\25\uffff"+
-        "\1\75\1\uffff\1\75\13\uffff\2\56\1\144\1\141\1\154\1\141\2\145\1"+
-        "\143\1\162\1\163\1\164\1\145\1\143\1\151\2\164\1\162\1\154\1\44"+
-        "\1\164\1\uffff\1\44\1\163\2\141\1\147\1\142\1\uffff\1\141\1\154"+
-        "\1\164\1\166\1\44\1\156\2\145\1\163\1\164\1\154\1\151\1\44\2\145"+
-        "\1\154\1\165\1\75\4\uffff\1\44\1\164\1\145\1\153\2\44\1\150\1\44"+
-        "\1\163\1\151\1\162\1\150\1\143\1\151\1\143\1\164\1\145\1\162\1\uffff"+
-        "\1\141\1\uffff\1\145\1\154\1\164\1\44\1\154\1\165\1\151\1\145\1"+
-        "\141\1\uffff\1\163\1\44\1\141\1\167\1\44\1\162\1\44\1\166\1\uffff"+
-        "\1\44\1\156\1\145\1\162\3\uffff\1\151\1\141\1\44\2\uffff\1\44\1"+
-        "\uffff\1\44\1\156\1\44\1\162\1\164\1\143\1\150\1\44\1\155\1\146"+
-        "\1\156\3\44\1\uffff\1\145\1\154\2\143\1\164\1\151\1\uffff\1\144"+
-        "\1\44\1\uffff\1\141\1\uffff\1\145\1\uffff\1\144\1\44\1\156\1\154"+
-        "\1\156\3\uffff\1\165\1\uffff\1\157\1\146\2\44\1\uffff\1\145\1\141"+
-        "\1\143\1\uffff\1\171\2\uffff\1\44\1\164\1\44\1\164\2\145\1\163\1"+
-        "\44\1\uffff\1\143\1\44\1\163\1\uffff\1\44\1\145\1\44\1\145\1\156"+
-        "\1\160\2\uffff\1\156\1\143\1\145\1\44\1\uffff\1\44\1\uffff\1\145"+
-        "\1\44\1\156\1\141\1\uffff\1\164\1\uffff\1\44\1\uffff\1\44\1\uffff"+
-        "\1\44\1\151\1\44\1\164\1\145\1\157\2\uffff\1\144\1\uffff\1\164\1"+
-        "\146\1\44\3\uffff\1\172\1\uffff\1\163\1\44\1\146\2\44\1\145\1\uffff"+
-        "\1\145\1\44\1\uffff\1\44\2\uffff\1\44\1\144\3\uffff\1\44\1\uffff";
-    public static final String DFA25_maxS =
-        "\1\176\1\157\1\171\1\157\1\171\1\156\3\157\1\165\1\162\1\142\1\165"+
-        "\1\170\1\150\1\145\11\uffff\1\71\2\75\1\uffff\5\75\1\76\2\75\1\174"+
-        "\1\75\3\uffff\2\146\2\uffff\1\154\1\157\1\145\2\164\2\141\1\156"+
-        "\1\160\1\156\1\162\1\151\1\157\1\160\1\164\1\172\1\162\1\154\1\156"+
-        "\1\157\1\156\1\172\1\146\1\142\1\157\1\171\1\162\1\163\1\154\1\164"+
-        "\1\167\1\163\1\164\1\151\1\164\25\uffff\1\76\1\uffff\1\75\13\uffff"+
-        "\2\146\1\144\1\141\1\154\1\141\2\145\1\143\1\162\1\163\1\164\1\145"+
-        "\1\143\1\151\2\164\1\162\1\154\1\172\1\164\1\uffff\1\172\1\163\2"+
-        "\141\1\147\1\142\1\uffff\1\141\1\154\1\164\1\166\1\172\1\156\1\145"+
-        "\1\157\1\163\1\164\1\154\1\151\1\172\2\145\1\154\1\165\1\75\4\uffff"+
-        "\1\172\1\164\1\145\1\153\2\172\1\150\1\172\1\163\1\151\1\162\1\150"+
-        "\1\143\1\151\1\143\1\164\1\145\1\162\1\uffff\1\141\1\uffff\1\145"+
-        "\1\154\1\164\1\172\1\154\1\165\1\151\1\145\1\141\1\uffff\1\163\1"+
-        "\172\1\141\1\167\1\172\1\162\1\172\1\166\1\uffff\1\172\1\156\1\145"+
-        "\1\162\3\uffff\1\151\1\141\1\172\2\uffff\1\172\1\uffff\1\172\1\156"+
-        "\1\172\1\162\1\164\1\143\1\150\1\172\1\155\1\146\1\156\3\172\1\uffff"+
-        "\1\145\1\154\2\143\1\164\1\151\1\uffff\1\144\1\172\1\uffff\1\141"+
-        "\1\uffff\1\145\1\uffff\1\144\1\172\1\156\1\154\1\156\3\uffff\1\165"+
-        "\1\uffff\1\157\1\146\2\172\1\uffff\1\145\1\141\1\143\1\uffff\1\171"+
-        "\2\uffff\1\172\1\164\1\172\1\164\2\145\1\163\1\172\1\uffff\1\143"+
-        "\1\172\1\163\1\uffff\1\172\1\145\1\172\1\145\1\156\1\160\2\uffff"+
-        "\1\156\1\143\1\145\1\172\1\uffff\1\172\1\uffff\1\145\1\172\1\156"+
-        "\1\141\1\uffff\1\164\1\uffff\1\172\1\uffff\1\172\1\uffff\1\172\1"+
-        "\151\1\172\1\164\1\145\1\157\2\uffff\1\144\1\uffff\1\164\1\146\1"+
-        "\172\3\uffff\1\172\1\uffff\1\163\1\172\1\146\2\172\1\145\1\uffff"+
-        "\1\145\1\172\1\uffff\1\172\2\uffff\1\172\1\144\3\uffff\1\172\1\uffff";
-    public static final String DFA25_acceptS =
-        "\20\uffff\1\61\1\62\1\63\1\64\1\65\1\66\1\67\1\70\1\71\3\uffff\1"+
-        "\76\12\uffff\1\136\1\137\1\142\2\uffff\1\145\1\146\43\uffff\1\144"+
-        "\1\72\1\74\1\73\1\77\1\75\1\140\1\141\1\101\1\100\1\103\1\104\1"+
-        "\102\1\107\1\106\1\105\1\111\1\110\1\113\1\112\1\120\1\uffff\1\121"+
-        "\1\uffff\1\124\1\125\1\127\1\126\1\132\1\131\1\130\1\135\1\134\1"+
-        "\133\1\143\25\uffff\1\35\6\uffff\1\41\22\uffff\1\115\1\114\1\123"+
-        "\1\122\22\uffff\1\6\1\uffff\1\37\11\uffff\1\51\10\uffff\1\60\4\uffff"+
-        "\1\117\1\116\1\1\3\uffff\1\3\1\47\1\uffff\1\4\16\uffff\1\10\6\uffff"+
-        "\1\55\2\uffff\1\32\1\uffff\1\57\1\uffff\1\36\5\uffff\1\42\1\53\1"+
-        "\26\1\uffff\1\33\4\uffff\1\5\3\uffff\1\56\1\uffff\1\17\1\7\10\uffff"+
-        "\1\46\3\uffff\1\40\6\uffff\1\15\1\45\4\uffff\1\11\1\uffff\1\13\4"+
-        "\uffff\1\34\1\uffff\1\21\1\uffff\1\44\1\uffff\1\2\6\uffff\1\52\1"+
-        "\50\1\uffff\1\12\3\uffff\1\27\1\24\1\43\1\uffff\1\25\6\uffff\1\20"+
-        "\2\uffff\1\30\1\uffff\1\14\1\16\2\uffff\1\31\1\54\1\22\1\uffff\1"+
-        "\23";
-    public static final String DFA25_specialS =
-        "\u015d\uffff}>";
+
+    public static final String   DFA25_eotS       = "\1\uffff\17\51\11\uffff\1\122\1\124\1\126\1\uffff\1\132\1\135\1" + "\140\1\142\1\144\1\147\1\152\1\154\1\157\1\162\3\uffff\2\163\2\uffff"
+                                                    + "\17\51\1\u0089\5\51\1\u0090\15\51\25\uffff\1\u00a4\1\uffff\1\u00a6" + "\13\uffff\2\163\21\51\1\u00b9\1\51\1\uffff\1\u00bb\5\51\1\uffff"
+                                                    + "\4\51\1\u00c5\7\51\1\u00ce\4\51\1\u00d4\4\uffff\1\u00d5\3\51\1\u00d9" + "\1\u00da\1\51\1\u00dc\12\51\1\uffff\1\51\1\uffff\3\51\1\u00eb\5"
+                                                    + "\51\1\uffff\1\51\1\u00f2\2\51\1\u00f5\1\51\1\u00f7\1\51\1\uffff" + "\1\u00f9\3\51\3\uffff\2\51\1\u00ff\2\uffff\1\u0100\1\uffff\1\u0101"
+                                                    + "\1\51\1\u0103\4\51\1\u0108\3\51\1\u010c\1\u010e\1\u010f\1\uffff" + "\6\51\1\uffff\1\51\1\u0118\1\uffff\1\51\1\uffff\1\51\1\uffff\1\51"
+                                                    + "\1\u011c\3\51\3\uffff\1\51\1\uffff\2\51\1\u0123\1\u0124\1\uffff" + "\3\51\1\uffff\1\51\2\uffff\1\u0129\1\51\1\u012b\4\51\1\u0130\1\uffff"
+                                                    + "\1\51\1\u0132\1\51\1\uffff\1\u0134\1\51\1\u0136\3\51\2\uffff\3\51" + "\1\u013d\1\uffff\1\u013e\1\uffff\1\51\1\u0140\2\51\1\uffff\1\51"
+                                                    + "\1\uffff\1\u0144\1\uffff\1\u0145\1\uffff\1\u0146\1\51\1\u0148\3" + "\51\2\uffff\1\51\1\uffff\2\51\1\u014f\3\uffff\1\51\1\uffff\1\51"
+                                                    + "\1\u0152\1\51\1\u0154\1\u0155\1\51\1\uffff\1\51\1\u0158\1\uffff" + "\1\u0159\2\uffff\1\u015a\1\51\3\uffff\1\u015c\1\uffff";
+    public static final String   DFA25_eofS       = "\u015d\uffff";
+    public static final String   DFA25_minS       = "\1\11\2\157\1\141\1\150\1\146\1\141\1\157\1\145\1\162\1\150\1\142" + "\1\141\1\154\1\150\1\145\11\uffff\1\60\2\75\1\uffff\1\52\1\53\1"
+                                                    + "\55\3\75\1\74\2\75\1\46\3\uffff\2\56\2\uffff\1\151\1\157\1\145\1" + "\164\1\163\2\141\1\156\1\160\1\156\1\141\1\151\1\157\1\160\1\163"
+                                                    + "\1\44\1\162\1\154\1\156\1\157\1\156\1\44\1\146\1\142\1\151\1\141" + "\1\151\1\163\1\154\1\164\1\167\1\163\1\164\1\151\1\164\25\uffff"
+                                                    + "\1\75\1\uffff\1\75\13\uffff\2\56\1\144\1\141\1\154\1\141\2\145\1" + "\143\1\162\1\163\1\164\1\145\1\143\1\151\2\164\1\162\1\154\1\44"
+                                                    + "\1\164\1\uffff\1\44\1\163\2\141\1\147\1\142\1\uffff\1\141\1\154" + "\1\164\1\166\1\44\1\156\2\145\1\163\1\164\1\154\1\151\1\44\2\145"
+                                                    + "\1\154\1\165\1\75\4\uffff\1\44\1\164\1\145\1\153\2\44\1\150\1\44" + "\1\163\1\151\1\162\1\150\1\143\1\151\1\143\1\164\1\145\1\162\1\uffff"
+                                                    + "\1\141\1\uffff\1\145\1\154\1\164\1\44\1\154\1\165\1\151\1\145\1" + "\141\1\uffff\1\163\1\44\1\141\1\167\1\44\1\162\1\44\1\166\1\uffff"
+                                                    + "\1\44\1\156\1\145\1\162\3\uffff\1\151\1\141\1\44\2\uffff\1\44\1" + "\uffff\1\44\1\156\1\44\1\162\1\164\1\143\1\150\1\44\1\155\1\146"
+                                                    + "\1\156\3\44\1\uffff\1\145\1\154\2\143\1\164\1\151\1\uffff\1\144" + "\1\44\1\uffff\1\141\1\uffff\1\145\1\uffff\1\144\1\44\1\156\1\154"
+                                                    + "\1\156\3\uffff\1\165\1\uffff\1\157\1\146\2\44\1\uffff\1\145\1\141" + "\1\143\1\uffff\1\171\2\uffff\1\44\1\164\1\44\1\164\2\145\1\163\1"
+                                                    + "\44\1\uffff\1\143\1\44\1\163\1\uffff\1\44\1\145\1\44\1\145\1\156" + "\1\160\2\uffff\1\156\1\143\1\145\1\44\1\uffff\1\44\1\uffff\1\145"
+                                                    + "\1\44\1\156\1\141\1\uffff\1\164\1\uffff\1\44\1\uffff\1\44\1\uffff" + "\1\44\1\151\1\44\1\164\1\145\1\157\2\uffff\1\144\1\uffff\1\164\1"
+                                                    + "\146\1\44\3\uffff\1\172\1\uffff\1\163\1\44\1\146\2\44\1\145\1\uffff" + "\1\145\1\44\1\uffff\1\44\2\uffff\1\44\1\144\3\uffff\1\44\1\uffff";
+    public static final String   DFA25_maxS       = "\1\176\1\157\1\171\1\157\1\171\1\156\3\157\1\165\1\162\1\142\1\165" + "\1\170\1\150\1\145\11\uffff\1\71\2\75\1\uffff\5\75\1\76\2\75\1\174"
+                                                    + "\1\75\3\uffff\2\146\2\uffff\1\154\1\157\1\145\2\164\2\141\1\156" + "\1\160\1\156\1\162\1\151\1\157\1\160\1\164\1\172\1\162\1\154\1\156"
+                                                    + "\1\157\1\156\1\172\1\146\1\142\1\157\1\171\1\162\1\163\1\154\1\164" + "\1\167\1\163\1\164\1\151\1\164\25\uffff\1\76\1\uffff\1\75\13\uffff"
+                                                    + "\2\146\1\144\1\141\1\154\1\141\2\145\1\143\1\162\1\163\1\164\1\145" + "\1\143\1\151\2\164\1\162\1\154\1\172\1\164\1\uffff\1\172\1\163\2"
+                                                    + "\141\1\147\1\142\1\uffff\1\141\1\154\1\164\1\166\1\172\1\156\1\145" + "\1\157\1\163\1\164\1\154\1\151\1\172\2\145\1\154\1\165\1\75\4\uffff"
+                                                    + "\1\172\1\164\1\145\1\153\2\172\1\150\1\172\1\163\1\151\1\162\1\150" + "\1\143\1\151\1\143\1\164\1\145\1\162\1\uffff\1\141\1\uffff\1\145"
+                                                    + "\1\154\1\164\1\172\1\154\1\165\1\151\1\145\1\141\1\uffff\1\163\1" + "\172\1\141\1\167\1\172\1\162\1\172\1\166\1\uffff\1\172\1\156\1\145"
+                                                    + "\1\162\3\uffff\1\151\1\141\1\172\2\uffff\1\172\1\uffff\1\172\1\156" + "\1\172\1\162\1\164\1\143\1\150\1\172\1\155\1\146\1\156\3\172\1\uffff"
+                                                    + "\1\145\1\154\2\143\1\164\1\151\1\uffff\1\144\1\172\1\uffff\1\141" + "\1\uffff\1\145\1\uffff\1\144\1\172\1\156\1\154\1\156\3\uffff\1\165"
+                                                    + "\1\uffff\1\157\1\146\2\172\1\uffff\1\145\1\141\1\143\1\uffff\1\171" + "\2\uffff\1\172\1\164\1\172\1\164\2\145\1\163\1\172\1\uffff\1\143"
+                                                    + "\1\172\1\163\1\uffff\1\172\1\145\1\172\1\145\1\156\1\160\2\uffff" + "\1\156\1\143\1\145\1\172\1\uffff\1\172\1\uffff\1\145\1\172\1\156"
+                                                    + "\1\141\1\uffff\1\164\1\uffff\1\172\1\uffff\1\172\1\uffff\1\172\1" + "\151\1\172\1\164\1\145\1\157\2\uffff\1\144\1\uffff\1\164\1\146\1"
+                                                    + "\172\3\uffff\1\172\1\uffff\1\163\1\172\1\146\2\172\1\145\1\uffff" + "\1\145\1\172\1\uffff\1\172\2\uffff\1\172\1\144\3\uffff\1\172\1\uffff";
+    public static final String   DFA25_acceptS    = "\20\uffff\1\61\1\62\1\63\1\64\1\65\1\66\1\67\1\70\1\71\3\uffff\1" + "\76\12\uffff\1\136\1\137\1\142\2\uffff\1\145\1\146\43\uffff\1\144"
+                                                    + "\1\72\1\74\1\73\1\77\1\75\1\140\1\141\1\101\1\100\1\103\1\104\1" + "\102\1\107\1\106\1\105\1\111\1\110\1\113\1\112\1\120\1\uffff\1\121"
+                                                    + "\1\uffff\1\124\1\125\1\127\1\126\1\132\1\131\1\130\1\135\1\134\1" + "\133\1\143\25\uffff\1\35\6\uffff\1\41\22\uffff\1\115\1\114\1\123"
+                                                    + "\1\122\22\uffff\1\6\1\uffff\1\37\11\uffff\1\51\10\uffff\1\60\4\uffff" + "\1\117\1\116\1\1\3\uffff\1\3\1\47\1\uffff\1\4\16\uffff\1\10\6\uffff"
+                                                    + "\1\55\2\uffff\1\32\1\uffff\1\57\1\uffff\1\36\5\uffff\1\42\1\53\1" + "\26\1\uffff\1\33\4\uffff\1\5\3\uffff\1\56\1\uffff\1\17\1\7\10\uffff"
+                                                    + "\1\46\3\uffff\1\40\6\uffff\1\15\1\45\4\uffff\1\11\1\uffff\1\13\4" + "\uffff\1\34\1\uffff\1\21\1\uffff\1\44\1\uffff\1\2\6\uffff\1\52\1"
+                                                    + "\50\1\uffff\1\12\3\uffff\1\27\1\24\1\43\1\uffff\1\25\6\uffff\1\20" + "\2\uffff\1\30\1\uffff\1\14\1\16\2\uffff\1\31\1\54\1\22\1\uffff\1" + "\23";
+    public static final String   DFA25_specialS   = "\u015d\uffff}>";
     public static final String[] DFA25_transition = {
-        "\2\50\1\uffff\2\50\22\uffff\1\50\1\33\1\55\1\uffff\1\51\1\41\1\46"+
-        "\1\54\1\21\1\22\1\40\1\36\1\30\1\37\1\31\1\35\1\53\11\52\1\27\1"+
-        "\47\1\43\1\32\1\42\1\20\1\uffff\32\51\1\23\1\uffff\1\24\1\44\1\51"+
-        "\1\uffff\1\13\1\2\1\3\1\10\1\15\1\6\2\51\1\5\2\51\1\7\1\51\1\14"+
-        "\1\51\1\11\1\51\1\17\1\4\1\12\1\51\1\1\1\16\3\51\1\25\1\45\1\26"+
-        "\1\34",
-        "\1\56",
-        "\1\57\2\uffff\1\60\6\uffff\1\61",
-        "\1\62\6\uffff\1\63\3\uffff\1\64\2\uffff\1\65",
-        "\1\72\13\uffff\1\70\1\66\1\uffff\1\71\1\uffff\1\67",
-        "\1\75\6\uffff\1\73\1\74",
-        "\1\77\7\uffff\1\100\2\uffff\1\101\2\uffff\1\76",
-        "\1\102",
-        "\1\104\11\uffff\1\103",
-        "\1\106\2\uffff\1\105",
-        "\1\110\11\uffff\1\107",
-        "\1\111",
-        "\1\113\3\uffff\1\114\17\uffff\1\112",
-        "\1\115\13\uffff\1\116",
-        "\1\117",
-        "\1\120",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "\12\121",
-        "\1\123",
-        "\1\125",
-        "",
-        "\1\130\4\uffff\1\127\15\uffff\1\131",
-        "\1\134\21\uffff\1\133",
-        "\1\136\17\uffff\1\137",
-        "\1\141",
-        "\1\143",
-        "\1\145\1\146",
-        "\1\150\1\151",
-        "\1\153",
-        "\1\156\76\uffff\1\155",
-        "\1\160\26\uffff\1\161",
-        "",
-        "",
-        "",
-        "\1\121\1\uffff\12\164\12\uffff\3\121\35\uffff\3\121",
-        "\1\121\1\uffff\10\165\2\121\12\uffff\3\121\35\uffff\3\121",
-        "",
-        "",
-        "\1\166\2\uffff\1\167",
-        "\1\170",
-        "\1\171",
-        "\1\172",
-        "\1\173\1\174",
-        "\1\175",
-        "\1\176",
-        "\1\177",
-        "\1\u0080",
-        "\1\u0081",
-        "\1\u0083\20\uffff\1\u0082",
-        "\1\u0084",
-        "\1\u0085",
-        "\1\u0086",
-        "\1\u0088\1\u0087",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u008a",
-        "\1\u008b",
-        "\1\u008c",
-        "\1\u008d",
-        "\1\u008e",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\24\51\1"+
-        "\u008f\5\51",
-        "\1\u0091",
-        "\1\u0092",
-        "\1\u0094\5\uffff\1\u0093",
-        "\1\u0096\23\uffff\1\u0097\3\uffff\1\u0095",
-        "\1\u0099\10\uffff\1\u0098",
-        "\1\u009a",
-        "\1\u009b",
-        "\1\u009c",
-        "\1\u009d",
-        "\1\u009e",
-        "\1\u009f",
-        "\1\u00a0",
-        "\1\u00a1",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "\1\u00a3\1\u00a2",
-        "",
-        "\1\u00a5",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "\1\121\1\uffff\12\164\12\uffff\3\121\35\uffff\3\121",
-        "\1\121\1\uffff\10\165\2\121\12\uffff\3\121\35\uffff\3\121",
-        "\1\u00a7",
-        "\1\u00a8",
-        "\1\u00a9",
-        "\1\u00aa",
-        "\1\u00ab",
-        "\1\u00ac",
-        "\1\u00ad",
-        "\1\u00ae",
-        "\1\u00af",
-        "\1\u00b0",
-        "\1\u00b1",
-        "\1\u00b2",
-        "\1\u00b3",
-        "\1\u00b4",
-        "\1\u00b5",
-        "\1\u00b6",
-        "\1\u00b7",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\4\51\1\u00b8"+
-        "\25\51",
-        "\1\u00ba",
-        "",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u00bc",
-        "\1\u00bd",
-        "\1\u00be",
-        "\1\u00bf",
-        "\1\u00c0",
-        "",
-        "\1\u00c1",
-        "\1\u00c2",
-        "\1\u00c3",
-        "\1\u00c4",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u00c6",
-        "\1\u00c7",
-        "\1\u00c8\11\uffff\1\u00c9",
-        "\1\u00ca",
-        "\1\u00cb",
-        "\1\u00cc",
-        "\1\u00cd",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u00cf",
-        "\1\u00d0",
-        "\1\u00d1",
-        "\1\u00d2",
-        "\1\u00d3",
-        "",
-        "",
-        "",
-        "",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u00d6",
-        "\1\u00d7",
-        "\1\u00d8",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u00db",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u00dd",
-        "\1\u00de",
-        "\1\u00df",
-        "\1\u00e0",
-        "\1\u00e1",
-        "\1\u00e2",
-        "\1\u00e3",
-        "\1\u00e4",
-        "\1\u00e5",
-        "\1\u00e6",
-        "",
-        "\1\u00e7",
-        "",
-        "\1\u00e8",
-        "\1\u00e9",
-        "\1\u00ea",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u00ec",
-        "\1\u00ed",
-        "\1\u00ee",
-        "\1\u00ef",
-        "\1\u00f0",
-        "",
-        "\1\u00f1",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u00f3",
-        "\1\u00f4",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u00f6",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u00f8",
-        "",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u00fa",
-        "\1\u00fb",
-        "\1\u00fc",
-        "",
-        "",
-        "",
-        "\1\u00fd",
-        "\1\u00fe",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "",
-        "",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u0102",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u0104",
-        "\1\u0105",
-        "\1\u0106",
-        "\1\u0107",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u0109",
-        "\1\u010a",
-        "\1\u010b",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\13\51\1"+
-        "\u010d\16\51",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "",
-        "\1\u0110",
-        "\1\u0111",
-        "\1\u0112",
-        "\1\u0113",
-        "\1\u0114",
-        "\1\u0115",
-        "",
-        "\1\u0116",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\22\51\1"+
-        "\u0117\7\51",
-        "",
-        "\1\u0119",
-        "",
-        "\1\u011a",
-        "",
-        "\1\u011b",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u011d",
-        "\1\u011e",
-        "\1\u011f",
-        "",
-        "",
-        "",
-        "\1\u0120",
-        "",
-        "\1\u0121",
-        "\1\u0122",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "",
-        "\1\u0125",
-        "\1\u0126",
-        "\1\u0127",
-        "",
-        "\1\u0128",
-        "",
-        "",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u012a",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u012c",
-        "\1\u012d",
-        "\1\u012e",
-        "\1\u012f",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "",
-        "\1\u0131",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u0133",
-        "",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u0135",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u0137",
-        "\1\u0138",
-        "\1\u0139",
-        "",
-        "",
-        "\1\u013a",
-        "\1\u013b",
-        "\1\u013c",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "",
-        "\1\u013f",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u0141",
-        "\1\u0142",
-        "",
-        "\1\u0143",
-        "",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u0147",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u0149",
-        "\1\u014a",
-        "\1\u014b",
-        "",
-        "",
-        "\1\u014c",
-        "",
-        "\1\u014d",
-        "\1\u014e",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "",
-        "",
-        "",
-        "\1\u0150",
-        "",
-        "\1\u0151",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u0153",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u0156",
-        "",
-        "\1\u0157",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "",
-        "",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        "\1\u015b",
-        "",
-        "",
-        "",
-        "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
-        ""
-    };
+            "\2\50\1\uffff\2\50\22\uffff\1\50\1\33\1\55\1\uffff\1\51\1\41\1\46" + "\1\54\1\21\1\22\1\40\1\36\1\30\1\37\1\31\1\35\1\53\11\52\1\27\1" + "\47\1\43\1\32\1\42\1\20\1\uffff\32\51\1\23\1\uffff\1\24\1\44\1\51"
+                    + "\1\uffff\1\13\1\2\1\3\1\10\1\15\1\6\2\51\1\5\2\51\1\7\1\51\1\14" + "\1\51\1\11\1\51\1\17\1\4\1\12\1\51\1\1\1\16\3\51\1\25\1\45\1\26" + "\1\34", "\1\56", "\1\57\2\uffff\1\60\6\uffff\1\61",
+            "\1\62\6\uffff\1\63\3\uffff\1\64\2\uffff\1\65", "\1\72\13\uffff\1\70\1\66\1\uffff\1\71\1\uffff\1\67", "\1\75\6\uffff\1\73\1\74", "\1\77\7\uffff\1\100\2\uffff\1\101\2\uffff\1\76", "\1\102", "\1\104\11\uffff\1\103", "\1\106\2\uffff\1\105",
+            "\1\110\11\uffff\1\107", "\1\111", "\1\113\3\uffff\1\114\17\uffff\1\112", "\1\115\13\uffff\1\116", "\1\117", "\1\120", "", "", "", "", "", "", "", "", "", "\12\121", "\1\123", "\1\125", "", "\1\130\4\uffff\1\127\15\uffff\1\131",
+            "\1\134\21\uffff\1\133", "\1\136\17\uffff\1\137", "\1\141", "\1\143", "\1\145\1\146", "\1\150\1\151", "\1\153", "\1\156\76\uffff\1\155", "\1\160\26\uffff\1\161", "", "", "", "\1\121\1\uffff\12\164\12\uffff\3\121\35\uffff\3\121",
+            "\1\121\1\uffff\10\165\2\121\12\uffff\3\121\35\uffff\3\121", "", "", "\1\166\2\uffff\1\167", "\1\170", "\1\171", "\1\172", "\1\173\1\174", "\1\175", "\1\176", "\1\177", "\1\u0080", "\1\u0081", "\1\u0083\20\uffff\1\u0082", "\1\u0084",
+            "\1\u0085", "\1\u0086", "\1\u0088\1\u0087", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u008a", "\1\u008b", "\1\u008c", "\1\u008d", "\1\u008e",
+            "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\24\51\1" + "\u008f\5\51", "\1\u0091", "\1\u0092", "\1\u0094\5\uffff\1\u0093", "\1\u0096\23\uffff\1\u0097\3\uffff\1\u0095", "\1\u0099\10\uffff\1\u0098", "\1\u009a", "\1\u009b",
+            "\1\u009c", "\1\u009d", "\1\u009e", "\1\u009f", "\1\u00a0", "\1\u00a1", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "\1\u00a3\1\u00a2", "", "\1\u00a5", "", "", "", "", "", "", "", "", "", "", "",
+            "\1\121\1\uffff\12\164\12\uffff\3\121\35\uffff\3\121", "\1\121\1\uffff\10\165\2\121\12\uffff\3\121\35\uffff\3\121", "\1\u00a7", "\1\u00a8", "\1\u00a9", "\1\u00aa", "\1\u00ab", "\1\u00ac", "\1\u00ad", "\1\u00ae", "\1\u00af", "\1\u00b0",
+            "\1\u00b1", "\1\u00b2", "\1\u00b3", "\1\u00b4", "\1\u00b5", "\1\u00b6", "\1\u00b7", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\4\51\1\u00b8" + "\25\51", "\1\u00ba", "",
+            "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u00bc", "\1\u00bd", "\1\u00be", "\1\u00bf", "\1\u00c0", "", "\1\u00c1", "\1\u00c2", "\1\u00c3", "\1\u00c4",
+            "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u00c6", "\1\u00c7", "\1\u00c8\11\uffff\1\u00c9", "\1\u00ca", "\1\u00cb", "\1\u00cc", "\1\u00cd", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\1\u00cf", "\1\u00d0", "\1\u00d1", "\1\u00d2", "\1\u00d3", "", "", "", "", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u00d6", "\1\u00d7", "\1\u00d8",
+            "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u00db", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u00dd", "\1\u00de",
+            "\1\u00df", "\1\u00e0", "\1\u00e1", "\1\u00e2", "\1\u00e3", "\1\u00e4", "\1\u00e5", "\1\u00e6", "", "\1\u00e7", "", "\1\u00e8", "\1\u00e9", "\1\u00ea", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u00ec",
+            "\1\u00ed", "\1\u00ee", "\1\u00ef", "\1\u00f0", "", "\1\u00f1", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u00f3", "\1\u00f4", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u00f6",
+            "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u00f8", "", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u00fa", "\1\u00fb", "\1\u00fc", "", "", "", "\1\u00fd", "\1\u00fe",
+            "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "", "", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u0102",
+            "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u0104", "\1\u0105", "\1\u0106", "\1\u0107", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u0109", "\1\u010a", "\1\u010b",
+            "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\13\51\1" + "\u010d\16\51", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "", "\1\u0110",
+            "\1\u0111", "\1\u0112", "\1\u0113", "\1\u0114", "\1\u0115", "", "\1\u0116", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\22\51\1" + "\u0117\7\51", "", "\1\u0119", "", "\1\u011a", "", "\1\u011b",
+            "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u011d", "\1\u011e", "\1\u011f", "", "", "", "\1\u0120", "", "\1\u0121", "\1\u0122", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "", "\1\u0125", "\1\u0126", "\1\u0127", "", "\1\u0128", "", "", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u012a",
+            "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u012c", "\1\u012d", "\1\u012e", "\1\u012f", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "", "\1\u0131",
+            "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u0133", "", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u0135", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u0137",
+            "\1\u0138", "\1\u0139", "", "", "\1\u013a", "\1\u013b", "\1\u013c", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "", "\1\u013f",
+            "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u0141", "\1\u0142", "", "\1\u0143", "", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "",
+            "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u0147", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u0149", "\1\u014a",
+            "\1\u014b", "", "", "\1\u014c", "", "\1\u014d", "\1\u014e", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "", "", "", "\1\u0150", "", "\1\u0151", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\1\u0153", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u0156", "", "\1\u0157", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "", "", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", "\1\u015b", "", "", "", "\1\51\13\uffff\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51", ""};
 
     class DFA25 extends DFA {
-        public DFA25(BaseRecognizer recognizer) {
+        public DFA25(final BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 25;
-            this.eot = DFA.unpackEncodedString(DFA25_eotS);
-            this.eof = DFA.unpackEncodedString(DFA25_eofS);
-            this.min = DFA.unpackEncodedStringToUnsignedChars(DFA25_minS);
-            this.max = DFA.unpackEncodedStringToUnsignedChars(DFA25_maxS);
-            this.accept = DFA.unpackEncodedString(DFA25_acceptS);
-            this.special = DFA.unpackEncodedString(DFA25_specialS);
-            int numStates = DFA25_transition.length;
+            this.eot = DFA.unpackEncodedString( DFA25_eotS );
+            this.eof = DFA.unpackEncodedString( DFA25_eofS );
+            this.min = DFA.unpackEncodedStringToUnsignedChars( DFA25_minS );
+            this.max = DFA.unpackEncodedStringToUnsignedChars( DFA25_maxS );
+            this.accept = DFA.unpackEncodedString( DFA25_acceptS );
+            this.special = DFA.unpackEncodedString( DFA25_specialS );
+            final int numStates = DFA25_transition.length;
             this.transition = new short[numStates][];
-            for (int i=0; i<numStates; i++) {
-                transition[i] = DFA.unpackEncodedString(DFA25_transition[i]);
+            for ( int i = 0; i < numStates; i++ ) {
+                this.transition[i] = DFA.unpackEncodedString( DFA25_transition[i] );
             }
         }
+
         public String getDescription() {
             return "1:1: Tokens : ( T68 | T69 | T70 | T71 | T72 | T73 | T74 | T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | T84 | T85 | T86 | T87 | T88 | T89 | T90 | T91 | T92 | T93 | T94 | T95 | T96 | T97 | T98 | T99 | T100 | T101 | T102 | T103 | T104 | T105 | T106 | T107 | T108 | T109 | T110 | T111 | T112 | T113 | T114 | T115 | QUESTION | LPAREN | RPAREN | LBRACK | RBRACK | LCURLY | RCURLY | COLON | COMMA | DOT | ASSIGN | EQUAL | LNOT | BNOT | NOT_EQUAL | DIV | DIV_ASSIGN | PLUS | PLUS_ASSIGN | INC | MINUS | MINUS_ASSIGN | DEC | STAR | STAR_ASSIGN | MOD | MOD_ASSIGN | SR | SR_ASSIGN | BSR | BSR_ASSIGN | GE | GT | SL | SL_ASSIGN | LE | LT | BXOR | BXOR_ASSIGN | BOR | BOR_ASSIGN | LOR | BAND | BAND_ASSIGN | LAND | SEMI | WS | SL_COMMENT | ML_COMMENT | IDENT | NUM_INT | NUM_FLOAT | CHAR_LITERAL | STRING_LITERAL );";
         }
     }
- 
 
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaParserParser.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaParserParser.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/parser/JavaParserParser.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,5197 +1,5189 @@
 // $ANTLR 3.0b5 D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g 2006-11-22 14:58:22
 
-	package org.drools.rule.builder.dialect.java.parser;
-	import java.util.Iterator;
+package org.drools.rule.builder.dialect.java.parser;
 
+import java.util.Iterator;
 
 import org.antlr.runtime.*;
-import java.util.Stack;
 import java.util.List;
 import java.util.ArrayList;
 
 public class JavaParserParser extends Parser {
-    public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "LBRACK", "RBRACK", "IDENT", "DOT", "STAR", "LCURLY", "SEMI", "RCURLY", "COMMA", "LPAREN", "RPAREN", "ASSIGN", "COLON", "PLUS_ASSIGN", "MINUS_ASSIGN", "STAR_ASSIGN", "DIV_ASSIGN", "MOD_ASSIGN", "SR_ASSIGN", "BSR_ASSIGN", "SL_ASSIGN", "BAND_ASSIGN", "BXOR_ASSIGN", "BOR_ASSIGN", "QUESTION", "LOR", "LAND", "BOR", "BXOR", "BAND", "NOT_EQUAL", "EQUAL", "LT", "GT", "LE", "GE", "SL", "SR", "BSR", "PLUS", "MINUS", "DIV", "MOD", "INC", "DEC", "BNOT", "LNOT", "NUM_INT", "CHAR_LITERAL", "STRING_LITERAL", "NUM_FLOAT", "WS", "SL_COMMENT", "ML_COMMENT", "DECIMAL_LITERAL", "HEX_LITERAL", "OCTAL_LITERAL", "DIGITS", "EXPONENT_PART", "FLOAT_TYPE_SUFFIX", "ESCAPE_SEQUENCE", "OCTAL_DIGIT", "UNICODE_CHAR", "HEX_DIGIT", "'void'", "'boolean'", "'byte'", "'char'", "'short'", "'int'", "'float'", "'long'", "'double'", "'private'", "'public'", "'protected'", "'static'", "'transient'", "'final'", "'abstract'", "'native'", "'threadsafe'", "'synchronized'"!
 , "'volatile'", "'strictfp'", "'class'", "'extends'", "'interface'", "'implements'", "'this'", "'super'", "'throws'", "'if'", "'else'", "'for'", "'while'", "'do'", "'break'", "'continue'", "'return'", "'switch'", "'throw'", "'case'", "'default'", "'try'", "'finally'", "'catch'", "'instanceof'", "'true'", "'false'", "'null'", "'new'"
-    };
-    public static final int COMMA=12;
-    public static final int SR_ASSIGN=22;
-    public static final int MINUS=44;
-    public static final int LOR=29;
-    public static final int BNOT=49;
-    public static final int INC=47;
-    public static final int MOD=46;
-    public static final int OCTAL_LITERAL=60;
-    public static final int PLUS_ASSIGN=17;
-    public static final int QUESTION=28;
-    public static final int HEX_LITERAL=59;
-    public static final int BOR=31;
-    public static final int DOT=7;
-    public static final int SR=41;
-    public static final int FLOAT_TYPE_SUFFIX=63;
-    public static final int RCURLY=11;
-    public static final int LCURLY=9;
-    public static final int CHAR_LITERAL=52;
-    public static final int BOR_ASSIGN=27;
-    public static final int STRING_LITERAL=53;
-    public static final int ASSIGN=15;
-    public static final int LE=38;
-    public static final int RPAREN=14;
-    public static final int STAR_ASSIGN=19;
-    public static final int NUM_INT=51;
-    public static final int LPAREN=13;
-    public static final int HEX_DIGIT=67;
-    public static final int ML_COMMENT=57;
-    public static final int PLUS=43;
-    public static final int SL_COMMENT=56;
-    public static final int BAND=33;
-    public static final int MINUS_ASSIGN=18;
-    public static final int NOT_EQUAL=34;
-    public static final int BAND_ASSIGN=25;
-    public static final int DIGITS=61;
-    public static final int DECIMAL_LITERAL=58;
-    public static final int IDENT=6;
-    public static final int MOD_ASSIGN=21;
-    public static final int WS=55;
-    public static final int BXOR_ASSIGN=26;
-    public static final int LT=36;
-    public static final int BSR=42;
-    public static final int GT=37;
-    public static final int BSR_ASSIGN=23;
-    public static final int SL_ASSIGN=24;
-    public static final int LAND=30;
-    public static final int LBRACK=4;
-    public static final int NUM_FLOAT=54;
-    public static final int SEMI=10;
-    public static final int GE=39;
-    public static final int LNOT=50;
-    public static final int DIV_ASSIGN=20;
-    public static final int UNICODE_CHAR=66;
-    public static final int DEC=48;
-    public static final int EQUAL=35;
-    public static final int ESCAPE_SEQUENCE=64;
-    public static final int EOF=-1;
-    public static final int OCTAL_DIGIT=65;
-    public static final int RBRACK=5;
-    public static final int COLON=16;
-    public static final int SL=40;
-    public static final int DIV=45;
-    public static final int STAR=8;
-    public static final int BXOR=32;
-    public static final int EXPONENT_PART=62;
+    public static final String[] tokenNames        = new String[]{"<invalid>", "<EOR>", "<DOWN>", "<UP>", "LBRACK", "RBRACK", "IDENT", "DOT", "STAR", "LCURLY", "SEMI", "RCURLY", "COMMA", "LPAREN", "RPAREN", "ASSIGN", "COLON", "PLUS_ASSIGN",
+            "MINUS_ASSIGN", "STAR_ASSIGN", "DIV_ASSIGN", "MOD_ASSIGN", "SR_ASSIGN", "BSR_ASSIGN", "SL_ASSIGN", "BAND_ASSIGN", "BXOR_ASSIGN", "BOR_ASSIGN", "QUESTION", "LOR", "LAND", "BOR", "BXOR", "BAND", "NOT_EQUAL", "EQUAL", "LT", "GT", "LE",
+            "GE", "SL", "SR", "BSR", "PLUS", "MINUS", "DIV", "MOD", "INC", "DEC", "BNOT", "LNOT", "NUM_INT", "CHAR_LITERAL", "STRING_LITERAL", "NUM_FLOAT", "WS", "SL_COMMENT", "ML_COMMENT", "DECIMAL_LITERAL", "HEX_LITERAL", "OCTAL_LITERAL",
+            "DIGITS", "EXPONENT_PART", "FLOAT_TYPE_SUFFIX", "ESCAPE_SEQUENCE", "OCTAL_DIGIT", "UNICODE_CHAR", "HEX_DIGIT", "'void'", "'boolean'", "'byte'", "'char'", "'short'", "'int'", "'float'", "'long'", "'double'", "'private'", "'public'",
+            "'protected'", "'static'", "'transient'", "'final'", "'abstract'", "'native'", "'threadsafe'", "'synchronized'", "'volatile'", "'strictfp'", "'class'", "'extends'", "'interface'", "'implements'", "'this'", "'super'", "'throws'", "'if'",
+            "'else'", "'for'", "'while'", "'do'", "'break'", "'continue'", "'return'", "'switch'", "'throw'", "'case'", "'default'", "'try'", "'finally'", "'catch'", "'instanceof'", "'true'", "'false'", "'null'", "'new'"};
+    public static final int      COMMA             = 12;
+    public static final int      SR_ASSIGN         = 22;
+    public static final int      MINUS             = 44;
+    public static final int      LOR               = 29;
+    public static final int      BNOT              = 49;
+    public static final int      INC               = 47;
+    public static final int      MOD               = 46;
+    public static final int      OCTAL_LITERAL     = 60;
+    public static final int      PLUS_ASSIGN       = 17;
+    public static final int      QUESTION          = 28;
+    public static final int      HEX_LITERAL       = 59;
+    public static final int      BOR               = 31;
+    public static final int      DOT               = 7;
+    public static final int      SR                = 41;
+    public static final int      FLOAT_TYPE_SUFFIX = 63;
+    public static final int      RCURLY            = 11;
+    public static final int      LCURLY            = 9;
+    public static final int      CHAR_LITERAL      = 52;
+    public static final int      BOR_ASSIGN        = 27;
+    public static final int      STRING_LITERAL    = 53;
+    public static final int      ASSIGN            = 15;
+    public static final int      LE                = 38;
+    public static final int      RPAREN            = 14;
+    public static final int      STAR_ASSIGN       = 19;
+    public static final int      NUM_INT           = 51;
+    public static final int      LPAREN            = 13;
+    public static final int      HEX_DIGIT         = 67;
+    public static final int      ML_COMMENT        = 57;
+    public static final int      PLUS              = 43;
+    public static final int      SL_COMMENT        = 56;
+    public static final int      BAND              = 33;
+    public static final int      MINUS_ASSIGN      = 18;
+    public static final int      NOT_EQUAL         = 34;
+    public static final int      BAND_ASSIGN       = 25;
+    public static final int      DIGITS            = 61;
+    public static final int      DECIMAL_LITERAL   = 58;
+    public static final int      IDENT             = 6;
+    public static final int      MOD_ASSIGN        = 21;
+    public static final int      WS                = 55;
+    public static final int      BXOR_ASSIGN       = 26;
+    public static final int      LT                = 36;
+    public static final int      BSR               = 42;
+    public static final int      GT                = 37;
+    public static final int      BSR_ASSIGN        = 23;
+    public static final int      SL_ASSIGN         = 24;
+    public static final int      LAND              = 30;
+    public static final int      LBRACK            = 4;
+    public static final int      NUM_FLOAT         = 54;
+    public static final int      SEMI              = 10;
+    public static final int      GE                = 39;
+    public static final int      LNOT              = 50;
+    public static final int      DIV_ASSIGN        = 20;
+    public static final int      UNICODE_CHAR      = 66;
+    public static final int      DEC               = 48;
+    public static final int      EQUAL             = 35;
+    public static final int      ESCAPE_SEQUENCE   = 64;
+    public static final int      EOF               = -1;
+    public static final int      OCTAL_DIGIT       = 65;
+    public static final int      RBRACK            = 5;
+    public static final int      COLON             = 16;
+    public static final int      SL                = 40;
+    public static final int      DIV               = 45;
+    public static final int      STAR              = 8;
+    public static final int      BXOR              = 32;
+    public static final int      EXPONENT_PART     = 62;
 
-        public JavaParserParser(TokenStream input) {
-            super(input);
+    public JavaParserParser(final TokenStream input) {
+        super( input );
+    }
+
+    public String[] getTokenNames() {
+        return tokenNames;
+    }
+
+    public String getGrammarFileName() {
+        return "D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g";
+    }
+
+    private final List identifiers = new ArrayList();
+
+    public List getIdentifiers() {
+        return this.identifiers;
+    }
+
+    public static final CommonToken IGNORE_TOKEN = new CommonToken( null,
+                                                                    0,
+                                                                    99,
+                                                                    0,
+                                                                    0 );
+    private final List                    errors       = new ArrayList();
+
+    private String                  source       = "unknown";
+
+    public void setSource(final String source) {
+        this.source = source;
+    }
+
+    public String getSource() {
+        return this.source;
+    }
+
+    public void reportError(final RecognitionException ex) {
+        // if we've already reported an error and have not matched a token
+        // yet successfully, don't report any errors.
+        if ( this.errorRecovery ) {
+            //System.err.print("[SPURIOUS] ");
+            return;
         }
-        
+        this.errorRecovery = true;
 
-    public String[] getTokenNames() { return tokenNames; }
-    public String getGrammarFileName() { return "D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g"; }
+        this.errors.add( ex );
+    }
 
-    
-    	private List identifiers = new ArrayList();
-    	public List getIdentifiers() { return identifiers; }
-    	public static final CommonToken IGNORE_TOKEN = new CommonToken(null,0,99,0,0);
-    	private List errors = new ArrayList();
-    	
-    	private String source = "unknown";
-    	
-    	public void setSource(String source) {
-    		this.source = source;
-    	}
-    	
-    	public String getSource() {
-    		return this.source;
-    	}
-    		
-    	public void reportError(RecognitionException ex) {
-    	        // if we've already reported an error and have not matched a token
-                    // yet successfully, don't report any errors.
-                    if ( errorRecovery ) {
-                            //System.err.print("[SPURIOUS] ");
-                            return;
-                    }
-                    errorRecovery = true;
-    
-    		errors.add( ex ); 
-    	}
-         	
-         	/** return the raw RecognitionException errors */
-         	public List getErrors() {
-         		return errors;
-         	}
-         	
-         	/** Return a list of pretty strings summarising the errors */
-         	public List getErrorMessages() {
-         		List messages = new ArrayList();
-     		for ( Iterator errorIter = errors.iterator() ; errorIter.hasNext() ; ) {
-         	     		messages.add( createErrorMessage( (RecognitionException) errorIter.next() ) );
-         	     	}
-         	     	return messages;
-         	}
-         	
-         	/** return true if any parser errors were accumulated */
-         	public boolean hasErrors() {
-      		return ! errors.isEmpty();
-         	}
-         	
-         	/** This will take a RecognitionException, and create a sensible error message out of it */
-         	public String createErrorMessage(RecognitionException e)
-            {
-    		StringBuffer message = new StringBuffer();		
-                    message.append( source + ":"+e.line+":"+e.charPositionInLine+" ");
-                    if ( e instanceof MismatchedTokenException ) {
-                            MismatchedTokenException mte = (MismatchedTokenException)e;
-                            message.append("mismatched token: "+
-                                                               e.token+
-                                                               "; expecting type "+
-                                                               tokenNames[mte.expecting]);
-                    }
-                    else if ( e instanceof MismatchedTreeNodeException ) {
-                            MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
-                            message.append("mismatched tree node: "+
-                                                               mtne.foundNode+
-                                                               "; expecting type "+
-                                                               tokenNames[mtne.expecting]);
-                    }
-                    else if ( e instanceof NoViableAltException ) {
-                            NoViableAltException nvae = (NoViableAltException)e;
-    			message.append( "Unexpected token '" + e.token.getText() + "'" );
-                            /*
-                            message.append("decision=<<"+nvae.grammarDecisionDescription+">>"+
-                                                               " state "+nvae.stateNumber+
-                                                               " (decision="+nvae.decisionNumber+
-                                                               ") no viable alt; token="+
-                                                               e.token);
-                                                               */
-                    }
-                    else if ( e instanceof EarlyExitException ) {
-                            EarlyExitException eee = (EarlyExitException)e;
-                            message.append("required (...)+ loop (decision="+
-                                                               eee.decisionNumber+
-                                                               ") did not match anything; token="+
-                                                               e.token);
-                    }
-                    else if ( e instanceof MismatchedSetException ) {
-                            MismatchedSetException mse = (MismatchedSetException)e;
-                            message.append("mismatched token '"+
-                                                               e.token+
-                                                               "' expecting set "+mse.expecting);
-                    }
-                    else if ( e instanceof MismatchedNotSetException ) {
-                            MismatchedNotSetException mse = (MismatchedNotSetException)e;
-                            message.append("mismatched token '"+
-                                                               e.token+
-                                                               "' expecting set "+mse.expecting);
-                    }
-                    else if ( e instanceof FailedPredicateException ) {
-                            FailedPredicateException fpe = (FailedPredicateException)e;
-                            message.append("rule "+fpe.ruleName+" failed predicate: {"+
-                                                               fpe.predicateText+"}?");
-    		}
-                   	return message.toString();
-            }   
+    /** return the raw RecognitionException errors */
+    public List getErrors() {
+        return this.errors;
+    }
 
+    /** Return a list of pretty strings summarising the errors */
+    public List getErrorMessages() {
+        final List messages = new ArrayList();
+        for ( final Iterator errorIter = this.errors.iterator(); errorIter.hasNext(); ) {
+            messages.add( createErrorMessage( (RecognitionException) errorIter.next() ) );
+        }
+        return messages;
+    }
 
+    /** return true if any parser errors were accumulated */
+    public boolean hasErrors() {
+        return !this.errors.isEmpty();
+    }
 
+    /** This will take a RecognitionException, and create a sensible error message out of it */
+    public String createErrorMessage(final RecognitionException e) {
+        final StringBuffer message = new StringBuffer();
+        message.append( this.source + ":" + e.line + ":" + e.charPositionInLine + " " );
+        if ( e instanceof MismatchedTokenException ) {
+            final MismatchedTokenException mte = (MismatchedTokenException) e;
+            message.append( "mismatched token: " + e.token + "; expecting type " + tokenNames[mte.expecting] );
+        } else if ( e instanceof MismatchedTreeNodeException ) {
+            final MismatchedTreeNodeException mtne = (MismatchedTreeNodeException) e;
+            message.append( "mismatched tree node: " + mtne.foundNode + "; expecting type " + tokenNames[mtne.expecting] );
+        } else if ( e instanceof NoViableAltException ) {
+            final NoViableAltException nvae = (NoViableAltException) e;
+            message.append( "Unexpected token '" + e.token.getText() + "'" );
+            /*
+             message.append("decision=<<"+nvae.grammarDecisionDescription+">>"+
+             " state "+nvae.stateNumber+
+             " (decision="+nvae.decisionNumber+
+             ") no viable alt; token="+
+             e.token);
+             */
+        } else if ( e instanceof EarlyExitException ) {
+            final EarlyExitException eee = (EarlyExitException) e;
+            message.append( "required (...)+ loop (decision=" + eee.decisionNumber + ") did not match anything; token=" + e.token );
+        } else if ( e instanceof MismatchedSetException ) {
+            final MismatchedSetException mse = (MismatchedSetException) e;
+            message.append( "mismatched token '" + e.token + "' expecting set " + mse.expecting );
+        } else if ( e instanceof MismatchedNotSetException ) {
+            final MismatchedNotSetException mse = (MismatchedNotSetException) e;
+            message.append( "mismatched token '" + e.token + "' expecting set " + mse.expecting );
+        } else if ( e instanceof FailedPredicateException ) {
+            final FailedPredicateException fpe = (FailedPredicateException) e;
+            message.append( "rule " + fpe.ruleName + " failed predicate: {" + fpe.predicateText + "}?" );
+        }
+        return message.toString();
+    }
+
     // $ANTLR start declaration
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:139:1: declaration : modifiers typeSpec variableDefinitions ;
-    public void declaration() throws RecognitionException {   
+    public void declaration() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:143:4: ( modifiers typeSpec variableDefinitions )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:143:4: modifiers typeSpec variableDefinitions
             {
-            pushFollow(FOLLOW_modifiers_in_declaration59);
-            modifiers();
-            _fsp--;
+                pushFollow( FOLLOW_modifiers_in_declaration59 );
+                modifiers();
+                this._fsp--;
 
-            pushFollow(FOLLOW_typeSpec_in_declaration61);
-            typeSpec();
-            _fsp--;
+                pushFollow( FOLLOW_typeSpec_in_declaration61 );
+                typeSpec();
+                this._fsp--;
 
-            pushFollow(FOLLOW_variableDefinitions_in_declaration63);
-            variableDefinitions();
-            _fsp--;
+                pushFollow( FOLLOW_variableDefinitions_in_declaration63 );
+                variableDefinitions();
+                this._fsp--;
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end declaration
 
-
     // $ANTLR start typeSpec
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:149:1: typeSpec : ( classTypeSpec | builtInTypeSpec );
-    public void typeSpec() throws RecognitionException {   
+    public void typeSpec() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:150:4: ( classTypeSpec | builtInTypeSpec )
-            int alt1=2;
-            int LA1_0 = input.LA(1);
-            if ( (LA1_0==IDENT) ) {
-                alt1=1;
-            }
-            else if ( ((LA1_0>=68 && LA1_0<=76)) ) {
-                alt1=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("149:1: typeSpec : ( classTypeSpec | builtInTypeSpec );", 1, 0, input);
+            int alt1 = 2;
+            final int LA1_0 = this.input.LA( 1 );
+            if ( (LA1_0 == IDENT) ) {
+                alt1 = 1;
+            } else if ( ((LA1_0 >= 68 && LA1_0 <= 76)) ) {
+                alt1 = 2;
+            } else {
+                final NoViableAltException nvae = new NoViableAltException( "149:1: typeSpec : ( classTypeSpec | builtInTypeSpec );",
+                                                                      1,
+                                                                      0,
+                                                                      this.input );
 
                 throw nvae;
             }
-            switch (alt1) {
+            switch ( alt1 ) {
                 case 1 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:150:4: classTypeSpec
-                    {
-                    pushFollow(FOLLOW_classTypeSpec_in_typeSpec79);
+                {
+                    pushFollow( FOLLOW_classTypeSpec_in_typeSpec79 );
                     classTypeSpec();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 2 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:151:4: builtInTypeSpec
-                    {
-                    pushFollow(FOLLOW_builtInTypeSpec_in_typeSpec84);
+                {
+                    pushFollow( FOLLOW_builtInTypeSpec_in_typeSpec84 );
                     builtInTypeSpec();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
 
             }
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end typeSpec
 
-
     // $ANTLR start classTypeSpec
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:156:1: classTypeSpec : identifier ( LBRACK RBRACK )* ;
-    public void classTypeSpec() throws RecognitionException {   
+    public void classTypeSpec() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:157:4: ( identifier ( LBRACK RBRACK )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:157:4: identifier ( LBRACK RBRACK )*
             {
-            pushFollow(FOLLOW_identifier_in_classTypeSpec97);
-            identifier();
-            _fsp--;
+                pushFollow( FOLLOW_identifier_in_classTypeSpec97 );
+                identifier();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:157:15: ( LBRACK RBRACK )*
-            loop2:
-            do {
-                int alt2=2;
-                int LA2_0 = input.LA(1);
-                if ( (LA2_0==LBRACK) ) {
-                    alt2=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:157:15: ( LBRACK RBRACK )*
+                loop2 : do {
+                    int alt2 = 2;
+                    final int LA2_0 = this.input.LA( 1 );
+                    if ( (LA2_0 == LBRACK) ) {
+                        alt2 = 1;
+                    }
 
+                    switch ( alt2 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:157:16: LBRACK RBRACK
+                        {
+                            match( this.input,
+                                   LBRACK,
+                                   FOLLOW_LBRACK_in_classTypeSpec100 );
+                            match( this.input,
+                                   RBRACK,
+                                   FOLLOW_RBRACK_in_classTypeSpec103 );
 
-                switch (alt2) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:157:16: LBRACK RBRACK
-            	    {
-            	    match(input,LBRACK,FOLLOW_LBRACK_in_classTypeSpec100); 
-            	    match(input,RBRACK,FOLLOW_RBRACK_in_classTypeSpec103); 
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            break loop2;
+                    }
+                } while ( true );
 
-            	default :
-            	    break loop2;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end classTypeSpec
 
-
     // $ANTLR start builtInTypeSpec
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:162:1: builtInTypeSpec : builtInType ( LBRACK RBRACK )* ;
-    public void builtInTypeSpec() throws RecognitionException {   
+    public void builtInTypeSpec() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:163:4: ( builtInType ( LBRACK RBRACK )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:163:4: builtInType ( LBRACK RBRACK )*
             {
-            pushFollow(FOLLOW_builtInType_in_builtInTypeSpec118);
-            builtInType();
-            _fsp--;
+                pushFollow( FOLLOW_builtInType_in_builtInTypeSpec118 );
+                builtInType();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:163:16: ( LBRACK RBRACK )*
-            loop3:
-            do {
-                int alt3=2;
-                int LA3_0 = input.LA(1);
-                if ( (LA3_0==LBRACK) ) {
-                    alt3=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:163:16: ( LBRACK RBRACK )*
+                loop3 : do {
+                    int alt3 = 2;
+                    final int LA3_0 = this.input.LA( 1 );
+                    if ( (LA3_0 == LBRACK) ) {
+                        alt3 = 1;
+                    }
 
+                    switch ( alt3 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:163:17: LBRACK RBRACK
+                        {
+                            match( this.input,
+                                   LBRACK,
+                                   FOLLOW_LBRACK_in_builtInTypeSpec121 );
+                            match( this.input,
+                                   RBRACK,
+                                   FOLLOW_RBRACK_in_builtInTypeSpec124 );
 
-                switch (alt3) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:163:17: LBRACK RBRACK
-            	    {
-            	    match(input,LBRACK,FOLLOW_LBRACK_in_builtInTypeSpec121); 
-            	    match(input,RBRACK,FOLLOW_RBRACK_in_builtInTypeSpec124); 
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            break loop3;
+                    }
+                } while ( true );
 
-            	default :
-            	    break loop3;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end builtInTypeSpec
 
-
     // $ANTLR start type
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:168:1: type : ( identifier | builtInType );
-    public void type() throws RecognitionException {   
+    public void type() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:169:4: ( identifier | builtInType )
-            int alt4=2;
-            int LA4_0 = input.LA(1);
-            if ( (LA4_0==IDENT) ) {
-                alt4=1;
-            }
-            else if ( ((LA4_0>=68 && LA4_0<=76)) ) {
-                alt4=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("168:1: type : ( identifier | builtInType );", 4, 0, input);
+            int alt4 = 2;
+            final int LA4_0 = this.input.LA( 1 );
+            if ( (LA4_0 == IDENT) ) {
+                alt4 = 1;
+            } else if ( ((LA4_0 >= 68 && LA4_0 <= 76)) ) {
+                alt4 = 2;
+            } else {
+                final NoViableAltException nvae = new NoViableAltException( "168:1: type : ( identifier | builtInType );",
+                                                                      4,
+                                                                      0,
+                                                                      this.input );
 
                 throw nvae;
             }
-            switch (alt4) {
+            switch ( alt4 ) {
                 case 1 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:169:4: identifier
-                    {
-                    pushFollow(FOLLOW_identifier_in_type139);
+                {
+                    pushFollow( FOLLOW_identifier_in_type139 );
                     identifier();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 2 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:170:4: builtInType
-                    {
-                    pushFollow(FOLLOW_builtInType_in_type144);
+                {
+                    pushFollow( FOLLOW_builtInType_in_type144 );
                     builtInType();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
 
             }
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end type
 
-
     // $ANTLR start builtInType
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:174:1: builtInType : ('void'|'boolean'|'byte'|'char'|'short'|'int'|'float'|'long'|'double');
-    public void builtInType() throws RecognitionException {   
+    public void builtInType() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:175:2: ( ('void'|'boolean'|'byte'|'char'|'short'|'int'|'float'|'long'|'double'))
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:175:4: ('void'|'boolean'|'byte'|'char'|'short'|'int'|'float'|'long'|'double')
             {
-            if ( (input.LA(1)>=68 && input.LA(1)<=76) ) {
-                input.consume();
-                errorRecovery=false;
-            }
-            else {
-                MismatchedSetException mse =
-                    new MismatchedSetException(null,input);
-                recoverFromMismatchedSet(input,mse,FOLLOW_set_in_builtInType156);    throw mse;
-            }
+                if ( (this.input.LA( 1 ) >= 68 && this.input.LA( 1 ) <= 76) ) {
+                    this.input.consume();
+                    this.errorRecovery = false;
+                } else {
+                    final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                             this.input );
+                    recoverFromMismatchedSet( this.input,
+                                              mse,
+                                              FOLLOW_set_in_builtInType156 );
+                    throw mse;
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end builtInType
 
-
     // $ANTLR start identifier
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:188:1: identifier : IDENT ( DOT IDENT )* ;
-    public void identifier() throws RecognitionException {   
+    public void identifier() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:189:4: ( IDENT ( DOT IDENT )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:189:4: IDENT ( DOT IDENT )*
             {
-            match(input,IDENT,FOLLOW_IDENT_in_identifier209); 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:189:11: ( DOT IDENT )*
-            loop5:
-            do {
-                int alt5=2;
-                int LA5_0 = input.LA(1);
-                if ( (LA5_0==DOT) ) {
-                    alt5=1;
-                }
+                match( this.input,
+                       IDENT,
+                       FOLLOW_IDENT_in_identifier209 );
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:189:11: ( DOT IDENT )*
+                loop5 : do {
+                    int alt5 = 2;
+                    final int LA5_0 = this.input.LA( 1 );
+                    if ( (LA5_0 == DOT) ) {
+                        alt5 = 1;
+                    }
 
+                    switch ( alt5 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:189:13: DOT IDENT
+                        {
+                            match( this.input,
+                                   DOT,
+                                   FOLLOW_DOT_in_identifier214 );
+                            match( this.input,
+                                   IDENT,
+                                   FOLLOW_IDENT_in_identifier216 );
 
-                switch (alt5) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:189:13: DOT IDENT
-            	    {
-            	    match(input,DOT,FOLLOW_DOT_in_identifier214); 
-            	    match(input,IDENT,FOLLOW_IDENT_in_identifier216); 
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            break loop5;
+                    }
+                } while ( true );
 
-            	default :
-            	    break loop5;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end identifier
 
-
     // $ANTLR start identifierStar
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:192:1: identifierStar : IDENT ( DOT IDENT )* ( DOT STAR )? ;
-    public void identifierStar() throws RecognitionException {   
+    public void identifierStar() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:193:4: ( IDENT ( DOT IDENT )* ( DOT STAR )? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:193:4: IDENT ( DOT IDENT )* ( DOT STAR )?
             {
-            match(input,IDENT,FOLLOW_IDENT_in_identifierStar230); 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:194:3: ( DOT IDENT )*
-            loop6:
-            do {
-                int alt6=2;
-                int LA6_0 = input.LA(1);
-                if ( (LA6_0==DOT) ) {
-                    int LA6_1 = input.LA(2);
-                    if ( (LA6_1==IDENT) ) {
-                        alt6=1;
+                match( this.input,
+                       IDENT,
+                       FOLLOW_IDENT_in_identifierStar230 );
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:194:3: ( DOT IDENT )*
+                loop6 : do {
+                    int alt6 = 2;
+                    final int LA6_0 = this.input.LA( 1 );
+                    if ( (LA6_0 == DOT) ) {
+                        final int LA6_1 = this.input.LA( 2 );
+                        if ( (LA6_1 == IDENT) ) {
+                            alt6 = 1;
+                        }
+
                     }
 
+                    switch ( alt6 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:194:5: DOT IDENT
+                        {
+                            match( this.input,
+                                   DOT,
+                                   FOLLOW_DOT_in_identifierStar236 );
+                            match( this.input,
+                                   IDENT,
+                                   FOLLOW_IDENT_in_identifierStar238 );
 
-                }
+                        }
+                            break;
 
+                        default :
+                            break loop6;
+                    }
+                } while ( true );
 
-                switch (alt6) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:194:5: DOT IDENT
-            	    {
-            	    match(input,DOT,FOLLOW_DOT_in_identifierStar236); 
-            	    match(input,IDENT,FOLLOW_IDENT_in_identifierStar238); 
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop6;
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:195:3: ( DOT STAR )?
+                int alt7 = 2;
+                final int LA7_0 = this.input.LA( 1 );
+                if ( (LA7_0 == DOT) ) {
+                    alt7 = 1;
                 }
-            } while (true);
-
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:195:3: ( DOT STAR )?
-            int alt7=2;
-            int LA7_0 = input.LA(1);
-            if ( (LA7_0==DOT) ) {
-                alt7=1;
-            }
-            switch (alt7) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:195:5: DOT STAR
+                switch ( alt7 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:195:5: DOT STAR
                     {
-                    match(input,DOT,FOLLOW_DOT_in_identifierStar247); 
-                    match(input,STAR,FOLLOW_STAR_in_identifierStar249); 
+                        match( this.input,
+                               DOT,
+                               FOLLOW_DOT_in_identifierStar247 );
+                        match( this.input,
+                               STAR,
+                               FOLLOW_STAR_in_identifierStar249 );
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end identifierStar
 
-
     // $ANTLR start modifiers
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:202:1: modifiers : ( modifier )* ;
-    public void modifiers() throws RecognitionException {   
+    public void modifiers() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:203:4: ( ( modifier )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:203:4: ( modifier )*
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:203:4: ( modifier )*
-            loop8:
-            do {
-                int alt8=2;
-                int LA8_0 = input.LA(1);
-                if ( ((LA8_0>=77 && LA8_0<=88)) ) {
-                    alt8=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:203:4: ( modifier )*
+                loop8 : do {
+                    int alt8 = 2;
+                    final int LA8_0 = this.input.LA( 1 );
+                    if ( ((LA8_0 >= 77 && LA8_0 <= 88)) ) {
+                        alt8 = 1;
+                    }
 
+                    switch ( alt8 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:203:6: modifier
+                        {
+                            pushFollow( FOLLOW_modifier_in_modifiers270 );
+                            modifier();
+                            this._fsp--;
 
-                switch (alt8) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:203:6: modifier
-            	    {
-            	    pushFollow(FOLLOW_modifier_in_modifiers270);
-            	    modifier();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop8;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop8;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end modifiers
 
-
     // $ANTLR start modifier
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:208:1: modifier : ('private'|'public'|'protected'|'static'|'transient'|'final'|'abstract'|'native'|'threadsafe'|'synchronized'|'volatile'|'strictfp');
-    public void modifier() throws RecognitionException {   
+    public void modifier() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:209:2: ( ('private'|'public'|'protected'|'static'|'transient'|'final'|'abstract'|'native'|'threadsafe'|'synchronized'|'volatile'|'strictfp'))
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:209:4: ('private'|'public'|'protected'|'static'|'transient'|'final'|'abstract'|'native'|'threadsafe'|'synchronized'|'volatile'|'strictfp')
             {
-            if ( (input.LA(1)>=77 && input.LA(1)<=88) ) {
-                input.consume();
-                errorRecovery=false;
-            }
-            else {
-                MismatchedSetException mse =
-                    new MismatchedSetException(null,input);
-                recoverFromMismatchedSet(input,mse,FOLLOW_set_in_modifier288);    throw mse;
-            }
+                if ( (this.input.LA( 1 ) >= 77 && this.input.LA( 1 ) <= 88) ) {
+                    this.input.consume();
+                    this.errorRecovery = false;
+                } else {
+                    final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                             this.input );
+                    recoverFromMismatchedSet( this.input,
+                                              mse,
+                                              FOLLOW_set_in_modifier288 );
+                    throw mse;
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end modifier
 
-
     // $ANTLR start classDefinition
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:225:1: classDefinition : 'class' IDENT superClassClause implementsClause classBlock ;
-    public void classDefinition() throws RecognitionException {   
+    public void classDefinition() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:226:4: ( 'class' IDENT superClassClause implementsClause classBlock )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:226:4: 'class' IDENT superClassClause implementsClause classBlock
             {
-            match(input,89,FOLLOW_89_in_classDefinition356); 
-            match(input,IDENT,FOLLOW_IDENT_in_classDefinition358); 
-            pushFollow(FOLLOW_superClassClause_in_classDefinition365);
-            superClassClause();
-            _fsp--;
+                match( this.input,
+                       89,
+                       FOLLOW_89_in_classDefinition356 );
+                match( this.input,
+                       IDENT,
+                       FOLLOW_IDENT_in_classDefinition358 );
+                pushFollow( FOLLOW_superClassClause_in_classDefinition365 );
+                superClassClause();
+                this._fsp--;
 
-            pushFollow(FOLLOW_implementsClause_in_classDefinition372);
-            implementsClause();
-            _fsp--;
+                pushFollow( FOLLOW_implementsClause_in_classDefinition372 );
+                implementsClause();
+                this._fsp--;
 
-            pushFollow(FOLLOW_classBlock_in_classDefinition379);
-            classBlock();
-            _fsp--;
+                pushFollow( FOLLOW_classBlock_in_classDefinition379 );
+                classBlock();
+                this._fsp--;
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end classDefinition
 
-
     // $ANTLR start superClassClause
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:235:1: superClassClause : ( 'extends' identifier )? ;
-    public void superClassClause() throws RecognitionException {   
+    public void superClassClause() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:236:4: ( ( 'extends' identifier )? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:236:4: ( 'extends' identifier )?
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:236:4: ( 'extends' identifier )?
-            int alt9=2;
-            int LA9_0 = input.LA(1);
-            if ( (LA9_0==90) ) {
-                alt9=1;
-            }
-            switch (alt9) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:236:6: 'extends' identifier
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:236:4: ( 'extends' identifier )?
+                int alt9 = 2;
+                final int LA9_0 = this.input.LA( 1 );
+                if ( (LA9_0 == 90) ) {
+                    alt9 = 1;
+                }
+                switch ( alt9 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:236:6: 'extends' identifier
                     {
-                    match(input,90,FOLLOW_90_in_superClassClause392); 
-                    pushFollow(FOLLOW_identifier_in_superClassClause394);
-                    identifier();
-                    _fsp--;
+                        match( this.input,
+                               90,
+                               FOLLOW_90_in_superClassClause392 );
+                        pushFollow( FOLLOW_identifier_in_superClassClause394 );
+                        identifier();
+                        this._fsp--;
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end superClassClause
 
-
     // $ANTLR start interfaceDefinition
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:241:1: interfaceDefinition : 'interface' IDENT interfaceExtends classBlock ;
-    public void interfaceDefinition() throws RecognitionException {   
+    public void interfaceDefinition() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:242:4: ( 'interface' IDENT interfaceExtends classBlock )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:242:4: 'interface' IDENT interfaceExtends classBlock
             {
-            match(input,91,FOLLOW_91_in_interfaceDefinition412); 
-            match(input,IDENT,FOLLOW_IDENT_in_interfaceDefinition414); 
-            pushFollow(FOLLOW_interfaceExtends_in_interfaceDefinition421);
-            interfaceExtends();
-            _fsp--;
+                match( this.input,
+                       91,
+                       FOLLOW_91_in_interfaceDefinition412 );
+                match( this.input,
+                       IDENT,
+                       FOLLOW_IDENT_in_interfaceDefinition414 );
+                pushFollow( FOLLOW_interfaceExtends_in_interfaceDefinition421 );
+                interfaceExtends();
+                this._fsp--;
 
-            pushFollow(FOLLOW_classBlock_in_interfaceDefinition428);
-            classBlock();
-            _fsp--;
+                pushFollow( FOLLOW_classBlock_in_interfaceDefinition428 );
+                classBlock();
+                this._fsp--;
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end interfaceDefinition
 
-
     // $ANTLR start classBlock
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:252:1: classBlock : LCURLY ( field | SEMI )* RCURLY ;
-    public void classBlock() throws RecognitionException {   
+    public void classBlock() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:253:4: ( LCURLY ( field | SEMI )* RCURLY )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:253:4: LCURLY ( field | SEMI )* RCURLY
             {
-            match(input,LCURLY,FOLLOW_LCURLY_in_classBlock442); 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:254:4: ( field | SEMI )*
-            loop10:
-            do {
-                int alt10=3;
-                int LA10_0 = input.LA(1);
-                if ( (LA10_0==IDENT||LA10_0==LCURLY||(LA10_0>=68 && LA10_0<=89)||LA10_0==91) ) {
-                    alt10=1;
-                }
-                else if ( (LA10_0==SEMI) ) {
-                    alt10=2;
-                }
+                match( this.input,
+                       LCURLY,
+                       FOLLOW_LCURLY_in_classBlock442 );
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:254:4: ( field | SEMI )*
+                loop10 : do {
+                    int alt10 = 3;
+                    final int LA10_0 = this.input.LA( 1 );
+                    if ( (LA10_0 == IDENT || LA10_0 == LCURLY || (LA10_0 >= 68 && LA10_0 <= 89) || LA10_0 == 91) ) {
+                        alt10 = 1;
+                    } else if ( (LA10_0 == SEMI) ) {
+                        alt10 = 2;
+                    }
 
+                    switch ( alt10 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:254:6: field
+                        {
+                            pushFollow( FOLLOW_field_in_classBlock449 );
+                            field();
+                            this._fsp--;
 
-                switch (alt10) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:254:6: field
-            	    {
-            	    pushFollow(FOLLOW_field_in_classBlock449);
-            	    field();
-            	    _fsp--;
+                        }
+                            break;
+                        case 2 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:254:14: SEMI
+                        {
+                            match( this.input,
+                                   SEMI,
+                                   FOLLOW_SEMI_in_classBlock453 );
 
+                        }
+                            break;
 
-            	    }
-            	    break;
-            	case 2 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:254:14: SEMI
-            	    {
-            	    match(input,SEMI,FOLLOW_SEMI_in_classBlock453); 
+                        default :
+                            break loop10;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
+                match( this.input,
+                       RCURLY,
+                       FOLLOW_RCURLY_in_classBlock460 );
 
-            	default :
-            	    break loop10;
-                }
-            } while (true);
-
-            match(input,RCURLY,FOLLOW_RCURLY_in_classBlock460); 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end classBlock
 
-
     // $ANTLR start interfaceExtends
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:260:1: interfaceExtends : ( 'extends' identifier ( COMMA identifier )* )? ;
-    public void interfaceExtends() throws RecognitionException {   
+    public void interfaceExtends() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:261:4: ( ( 'extends' identifier ( COMMA identifier )* )? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:261:4: ( 'extends' identifier ( COMMA identifier )* )?
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:261:4: ( 'extends' identifier ( COMMA identifier )* )?
-            int alt12=2;
-            int LA12_0 = input.LA(1);
-            if ( (LA12_0==90) ) {
-                alt12=1;
-            }
-            switch (alt12) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:262:3: 'extends' identifier ( COMMA identifier )*
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:261:4: ( 'extends' identifier ( COMMA identifier )* )?
+                int alt12 = 2;
+                final int LA12_0 = this.input.LA( 1 );
+                if ( (LA12_0 == 90) ) {
+                    alt12 = 1;
+                }
+                switch ( alt12 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:262:3: 'extends' identifier ( COMMA identifier )*
                     {
-                    match(input,90,FOLLOW_90_in_interfaceExtends479); 
-                    pushFollow(FOLLOW_identifier_in_interfaceExtends483);
-                    identifier();
-                    _fsp--;
+                        match( this.input,
+                               90,
+                               FOLLOW_90_in_interfaceExtends479 );
+                        pushFollow( FOLLOW_identifier_in_interfaceExtends483 );
+                        identifier();
+                        this._fsp--;
 
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:263:14: ( COMMA identifier )*
-                    loop11:
-                    do {
-                        int alt11=2;
-                        int LA11_0 = input.LA(1);
-                        if ( (LA11_0==COMMA) ) {
-                            alt11=1;
-                        }
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:263:14: ( COMMA identifier )*
+                        loop11 : do {
+                            int alt11 = 2;
+                            final int LA11_0 = this.input.LA( 1 );
+                            if ( (LA11_0 == COMMA) ) {
+                                alt11 = 1;
+                            }
 
+                            switch ( alt11 ) {
+                                case 1 :
+                                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:263:16: COMMA identifier
+                                {
+                                    match( this.input,
+                                           COMMA,
+                                           FOLLOW_COMMA_in_interfaceExtends487 );
+                                    pushFollow( FOLLOW_identifier_in_interfaceExtends489 );
+                                    identifier();
+                                    this._fsp--;
 
-                        switch (alt11) {
-                    	case 1 :
-                    	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:263:16: COMMA identifier
-                    	    {
-                    	    match(input,COMMA,FOLLOW_COMMA_in_interfaceExtends487); 
-                    	    pushFollow(FOLLOW_identifier_in_interfaceExtends489);
-                    	    identifier();
-                    	    _fsp--;
+                                }
+                                    break;
 
+                                default :
+                                    break loop11;
+                            }
+                        } while ( true );
 
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop11;
-                        }
-                    } while (true);
-
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end interfaceExtends
 
-
     // $ANTLR start implementsClause
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:268:1: implementsClause : ( 'implements' identifier ( COMMA identifier )* )? ;
-    public void implementsClause() throws RecognitionException {   
+    public void implementsClause() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:269:4: ( ( 'implements' identifier ( COMMA identifier )* )? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:269:4: ( 'implements' identifier ( COMMA identifier )* )?
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:269:4: ( 'implements' identifier ( COMMA identifier )* )?
-            int alt14=2;
-            int LA14_0 = input.LA(1);
-            if ( (LA14_0==92) ) {
-                alt14=1;
-            }
-            switch (alt14) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:270:4: 'implements' identifier ( COMMA identifier )*
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:269:4: ( 'implements' identifier ( COMMA identifier )* )?
+                int alt14 = 2;
+                final int LA14_0 = this.input.LA( 1 );
+                if ( (LA14_0 == 92) ) {
+                    alt14 = 1;
+                }
+                switch ( alt14 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:270:4: 'implements' identifier ( COMMA identifier )*
                     {
-                    match(input,92,FOLLOW_92_in_implementsClause514); 
-                    pushFollow(FOLLOW_identifier_in_implementsClause516);
-                    identifier();
-                    _fsp--;
+                        match( this.input,
+                               92,
+                               FOLLOW_92_in_implementsClause514 );
+                        pushFollow( FOLLOW_identifier_in_implementsClause516 );
+                        identifier();
+                        this._fsp--;
 
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:270:28: ( COMMA identifier )*
-                    loop13:
-                    do {
-                        int alt13=2;
-                        int LA13_0 = input.LA(1);
-                        if ( (LA13_0==COMMA) ) {
-                            alt13=1;
-                        }
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:270:28: ( COMMA identifier )*
+                        loop13 : do {
+                            int alt13 = 2;
+                            final int LA13_0 = this.input.LA( 1 );
+                            if ( (LA13_0 == COMMA) ) {
+                                alt13 = 1;
+                            }
 
+                            switch ( alt13 ) {
+                                case 1 :
+                                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:270:30: COMMA identifier
+                                {
+                                    match( this.input,
+                                           COMMA,
+                                           FOLLOW_COMMA_in_implementsClause520 );
+                                    pushFollow( FOLLOW_identifier_in_implementsClause522 );
+                                    identifier();
+                                    this._fsp--;
 
-                        switch (alt13) {
-                    	case 1 :
-                    	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:270:30: COMMA identifier
-                    	    {
-                    	    match(input,COMMA,FOLLOW_COMMA_in_implementsClause520); 
-                    	    pushFollow(FOLLOW_identifier_in_implementsClause522);
-                    	    identifier();
-                    	    _fsp--;
+                                }
+                                    break;
 
+                                default :
+                                    break loop13;
+                            }
+                        } while ( true );
 
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop13;
-                        }
-                    } while (true);
-
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end implementsClause
 
-
     // $ANTLR start field
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:278:1: field : ( modifiers ( ctorHead constructorBody | classDefinition | interfaceDefinition | typeSpec ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI ) ) | 'static' compoundStatement | compoundStatement );
-    public void field() throws RecognitionException {   
+    public void field() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:280:3: ( modifiers ( ctorHead constructorBody | classDefinition | interfaceDefinition | typeSpec ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI ) ) | 'static' compoundStatement | compoundStatement )
-            int alt19=3;
-            switch ( input.LA(1) ) {
-            case 80:
-                int LA19_1 = input.LA(2);
-                if ( (LA19_1==LCURLY) ) {
-                    alt19=2;
-                }
-                else if ( (LA19_1==IDENT||(LA19_1>=68 && LA19_1<=89)||LA19_1==91) ) {
-                    alt19=1;
-                }
-                else {
-                    NoViableAltException nvae =
-                        new NoViableAltException("278:1: field : ( modifiers ( ctorHead constructorBody | classDefinition | interfaceDefinition | typeSpec ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI ) ) | 'static' compoundStatement | compoundStatement );", 19, 1, input);
+            int alt19 = 3;
+            switch ( this.input.LA( 1 ) ) {
+                case 80 :
+                    final int LA19_1 = this.input.LA( 2 );
+                    if ( (LA19_1 == LCURLY) ) {
+                        alt19 = 2;
+                    } else if ( (LA19_1 == IDENT || (LA19_1 >= 68 && LA19_1 <= 89) || LA19_1 == 91) ) {
+                        alt19 = 1;
+                    } else {
+                        final NoViableAltException nvae = new NoViableAltException( "278:1: field : ( modifiers ( ctorHead constructorBody | classDefinition | interfaceDefinition | typeSpec ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI ) ) | 'static' compoundStatement | compoundStatement );",
+                                                                              19,
+                                                                              1,
+                                                                              this.input );
 
-                    throw nvae;
-                }
-                break;
-            case IDENT:
-            case 68:
-            case 69:
-            case 70:
-            case 71:
-            case 72:
-            case 73:
-            case 74:
-            case 75:
-            case 76:
-            case 77:
-            case 78:
-            case 79:
-            case 81:
-            case 82:
-            case 83:
-            case 84:
-            case 85:
-            case 86:
-            case 87:
-            case 88:
-            case 89:
-            case 91:
-                alt19=1;
-                break;
-            case LCURLY:
-                alt19=3;
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("278:1: field : ( modifiers ( ctorHead constructorBody | classDefinition | interfaceDefinition | typeSpec ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI ) ) | 'static' compoundStatement | compoundStatement );", 19, 0, input);
+                        throw nvae;
+                    }
+                    break;
+                case IDENT :
+                case 68 :
+                case 69 :
+                case 70 :
+                case 71 :
+                case 72 :
+                case 73 :
+                case 74 :
+                case 75 :
+                case 76 :
+                case 77 :
+                case 78 :
+                case 79 :
+                case 81 :
+                case 82 :
+                case 83 :
+                case 84 :
+                case 85 :
+                case 86 :
+                case 87 :
+                case 88 :
+                case 89 :
+                case 91 :
+                    alt19 = 1;
+                    break;
+                case LCURLY :
+                    alt19 = 3;
+                    break;
+                default :
+                    final NoViableAltException nvae = new NoViableAltException( "278:1: field : ( modifiers ( ctorHead constructorBody | classDefinition | interfaceDefinition | typeSpec ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI ) ) | 'static' compoundStatement | compoundStatement );",
+                                                                          19,
+                                                                          0,
+                                                                          this.input );
 
-                throw nvae;
+                    throw nvae;
             }
 
-            switch (alt19) {
+            switch ( alt19 ) {
                 case 1 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:280:3: modifiers ( ctorHead constructorBody | classDefinition | interfaceDefinition | typeSpec ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI ) )
-                    {
-                    pushFollow(FOLLOW_modifiers_in_field548);
+                {
+                    pushFollow( FOLLOW_modifiers_in_field548 );
                     modifiers();
-                    _fsp--;
+                    this._fsp--;
 
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:281:3: ( ctorHead constructorBody | classDefinition | interfaceDefinition | typeSpec ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI ) )
-                    int alt18=4;
-                    switch ( input.LA(1) ) {
-                    case IDENT:
-                        int LA18_1 = input.LA(2);
-                        if ( (LA18_1==LPAREN) ) {
-                            alt18=1;
-                        }
-                        else if ( (LA18_1==LBRACK||(LA18_1>=IDENT && LA18_1<=DOT)) ) {
-                            alt18=4;
-                        }
-                        else {
-                            NoViableAltException nvae =
-                                new NoViableAltException("281:3: ( ctorHead constructorBody | classDefinition | interfaceDefinition | typeSpec ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI ) )", 18, 1, input);
+                    int alt18 = 4;
+                    switch ( this.input.LA( 1 ) ) {
+                        case IDENT :
+                            final int LA18_1 = this.input.LA( 2 );
+                            if ( (LA18_1 == LPAREN) ) {
+                                alt18 = 1;
+                            } else if ( (LA18_1 == LBRACK || (LA18_1 >= IDENT && LA18_1 <= DOT)) ) {
+                                alt18 = 4;
+                            } else {
+                                final NoViableAltException nvae = new NoViableAltException( "281:3: ( ctorHead constructorBody | classDefinition | interfaceDefinition | typeSpec ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI ) )",
+                                                                                      18,
+                                                                                      1,
+                                                                                      this.input );
 
-                            throw nvae;
-                        }
-                        break;
-                    case 89:
-                        alt18=2;
-                        break;
-                    case 91:
-                        alt18=3;
-                        break;
-                    case 68:
-                    case 69:
-                    case 70:
-                    case 71:
-                    case 72:
-                    case 73:
-                    case 74:
-                    case 75:
-                    case 76:
-                        alt18=4;
-                        break;
-                    default:
-                        NoViableAltException nvae =
-                            new NoViableAltException("281:3: ( ctorHead constructorBody | classDefinition | interfaceDefinition | typeSpec ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI ) )", 18, 0, input);
+                                throw nvae;
+                            }
+                            break;
+                        case 89 :
+                            alt18 = 2;
+                            break;
+                        case 91 :
+                            alt18 = 3;
+                            break;
+                        case 68 :
+                        case 69 :
+                        case 70 :
+                        case 71 :
+                        case 72 :
+                        case 73 :
+                        case 74 :
+                        case 75 :
+                        case 76 :
+                            alt18 = 4;
+                            break;
+                        default :
+                            final NoViableAltException nvae = new NoViableAltException( "281:3: ( ctorHead constructorBody | classDefinition | interfaceDefinition | typeSpec ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI ) )",
+                                                                                  18,
+                                                                                  0,
+                                                                                  this.input );
 
-                        throw nvae;
+                            throw nvae;
                     }
 
-                    switch (alt18) {
+                    switch ( alt18 ) {
                         case 1 :
                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:281:5: ctorHead constructorBody
-                            {
-                            pushFollow(FOLLOW_ctorHead_in_field554);
+                        {
+                            pushFollow( FOLLOW_ctorHead_in_field554 );
                             ctorHead();
-                            _fsp--;
+                            this._fsp--;
 
-                            pushFollow(FOLLOW_constructorBody_in_field556);
+                            pushFollow( FOLLOW_constructorBody_in_field556 );
                             constructorBody();
-                            _fsp--;
+                            this._fsp--;
 
-
-                            }
+                        }
                             break;
                         case 2 :
                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:284:5: classDefinition
-                            {
-                            pushFollow(FOLLOW_classDefinition_in_field568);
+                        {
+                            pushFollow( FOLLOW_classDefinition_in_field568 );
                             classDefinition();
-                            _fsp--;
+                            this._fsp--;
 
-
-                            }
+                        }
                             break;
                         case 3 :
                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:287:5: interfaceDefinition
-                            {
-                            pushFollow(FOLLOW_interfaceDefinition_in_field586);
+                        {
+                            pushFollow( FOLLOW_interfaceDefinition_in_field586 );
                             interfaceDefinition();
-                            _fsp--;
+                            this._fsp--;
 
-
-                            }
+                        }
                             break;
                         case 4 :
                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:290:5: typeSpec ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI )
-                            {
-                            pushFollow(FOLLOW_typeSpec_in_field600);
+                        {
+                            pushFollow( FOLLOW_typeSpec_in_field600 );
                             typeSpec();
-                            _fsp--;
+                            this._fsp--;
 
                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:291:4: ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI )
-                            int alt17=2;
-                            int LA17_0 = input.LA(1);
-                            if ( (LA17_0==IDENT) ) {
-                                int LA17_1 = input.LA(2);
-                                if ( (LA17_1==LPAREN) ) {
-                                    alt17=1;
-                                }
-                                else if ( (LA17_1==LBRACK||LA17_1==SEMI||LA17_1==COMMA||LA17_1==ASSIGN) ) {
-                                    alt17=2;
-                                }
-                                else {
-                                    NoViableAltException nvae =
-                                        new NoViableAltException("291:4: ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI )", 17, 1, input);
+                            int alt17 = 2;
+                            final int LA17_0 = this.input.LA( 1 );
+                            if ( (LA17_0 == IDENT) ) {
+                                final int LA17_1 = this.input.LA( 2 );
+                                if ( (LA17_1 == LPAREN) ) {
+                                    alt17 = 1;
+                                } else if ( (LA17_1 == LBRACK || LA17_1 == SEMI || LA17_1 == COMMA || LA17_1 == ASSIGN) ) {
+                                    alt17 = 2;
+                                } else {
+                                    final NoViableAltException nvae = new NoViableAltException( "291:4: ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI )",
+                                                                                          17,
+                                                                                          1,
+                                                                                          this.input );
 
                                     throw nvae;
                                 }
-                            }
-                            else {
-                                NoViableAltException nvae =
-                                    new NoViableAltException("291:4: ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI )", 17, 0, input);
+                            } else {
+                                final NoViableAltException nvae = new NoViableAltException( "291:4: ( IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI ) | variableDefinitions SEMI )",
+                                                                                      17,
+                                                                                      0,
+                                                                                      this.input );
 
                                 throw nvae;
                             }
-                            switch (alt17) {
+                            switch ( alt17 ) {
                                 case 1 :
                                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:291:6: IDENT LPAREN parameterDeclarationList RPAREN declaratorBrackets ( throwsClause )? ( compoundStatement | SEMI )
-                                    {
-                                    match(input,IDENT,FOLLOW_IDENT_in_field609); 
-                                    match(input,LPAREN,FOLLOW_LPAREN_in_field623); 
-                                    pushFollow(FOLLOW_parameterDeclarationList_in_field625);
+                                {
+                                    match( this.input,
+                                           IDENT,
+                                           FOLLOW_IDENT_in_field609 );
+                                    match( this.input,
+                                           LPAREN,
+                                           FOLLOW_LPAREN_in_field623 );
+                                    pushFollow( FOLLOW_parameterDeclarationList_in_field625 );
                                     parameterDeclarationList();
-                                    _fsp--;
+                                    this._fsp--;
 
-                                    match(input,RPAREN,FOLLOW_RPAREN_in_field627); 
-                                    pushFollow(FOLLOW_declaratorBrackets_in_field634);
+                                    match( this.input,
+                                           RPAREN,
+                                           FOLLOW_RPAREN_in_field627 );
+                                    pushFollow( FOLLOW_declaratorBrackets_in_field634 );
                                     declaratorBrackets();
-                                    _fsp--;
+                                    this._fsp--;
 
                                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:300:5: ( throwsClause )?
-                                    int alt15=2;
-                                    int LA15_0 = input.LA(1);
-                                    if ( (LA15_0==95) ) {
-                                        alt15=1;
+                                    int alt15 = 2;
+                                    final int LA15_0 = this.input.LA( 1 );
+                                    if ( (LA15_0 == 95) ) {
+                                        alt15 = 1;
                                     }
-                                    switch (alt15) {
+                                    switch ( alt15 ) {
                                         case 1 :
                                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:300:6: throwsClause
-                                            {
-                                            pushFollow(FOLLOW_throwsClause_in_field652);
+                                        {
+                                            pushFollow( FOLLOW_throwsClause_in_field652 );
                                             throwsClause();
-                                            _fsp--;
+                                            this._fsp--;
 
-
-                                            }
+                                        }
                                             break;
 
                                     }
 
                                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:302:5: ( compoundStatement | SEMI )
-                                    int alt16=2;
-                                    int LA16_0 = input.LA(1);
-                                    if ( (LA16_0==LCURLY) ) {
-                                        alt16=1;
-                                    }
-                                    else if ( (LA16_0==SEMI) ) {
-                                        alt16=2;
-                                    }
-                                    else {
-                                        NoViableAltException nvae =
-                                            new NoViableAltException("302:5: ( compoundStatement | SEMI )", 16, 0, input);
+                                    int alt16 = 2;
+                                    final int LA16_0 = this.input.LA( 1 );
+                                    if ( (LA16_0 == LCURLY) ) {
+                                        alt16 = 1;
+                                    } else if ( (LA16_0 == SEMI) ) {
+                                        alt16 = 2;
+                                    } else {
+                                        final NoViableAltException nvae = new NoViableAltException( "302:5: ( compoundStatement | SEMI )",
+                                                                                              16,
+                                                                                              0,
+                                                                                              this.input );
 
                                         throw nvae;
                                     }
-                                    switch (alt16) {
+                                    switch ( alt16 ) {
                                         case 1 :
                                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:302:7: compoundStatement
-                                            {
-                                            pushFollow(FOLLOW_compoundStatement_in_field663);
+                                        {
+                                            pushFollow( FOLLOW_compoundStatement_in_field663 );
                                             compoundStatement();
-                                            _fsp--;
+                                            this._fsp--;
 
-
-                                            }
+                                        }
                                             break;
                                         case 2 :
                                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:302:27: SEMI
-                                            {
-                                            match(input,SEMI,FOLLOW_SEMI_in_field667); 
+                                        {
+                                            match( this.input,
+                                                   SEMI,
+                                                   FOLLOW_SEMI_in_field667 );
 
-                                            }
+                                        }
                                             break;
 
                                     }
 
-
-                                    }
+                                }
                                     break;
                                 case 2 :
                                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:303:6: variableDefinitions SEMI
-                                    {
-                                    pushFollow(FOLLOW_variableDefinitions_in_field676);
+                                {
+                                    pushFollow( FOLLOW_variableDefinitions_in_field676 );
                                     variableDefinitions();
-                                    _fsp--;
+                                    this._fsp--;
 
-                                    match(input,SEMI,FOLLOW_SEMI_in_field678); 
+                                    match( this.input,
+                                           SEMI,
+                                           FOLLOW_SEMI_in_field678 );
 
-                                    }
+                                }
                                     break;
 
                             }
 
-
-                            }
+                        }
                             break;
 
                     }
 
-
-                    }
+                }
                     break;
                 case 2 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:310:4: 'static' compoundStatement
-                    {
-                    match(input,80,FOLLOW_80_in_field704); 
-                    pushFollow(FOLLOW_compoundStatement_in_field706);
+                {
+                    match( this.input,
+                           80,
+                           FOLLOW_80_in_field704 );
+                    pushFollow( FOLLOW_compoundStatement_in_field706 );
                     compoundStatement();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 3 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:314:4: compoundStatement
-                    {
-                    pushFollow(FOLLOW_compoundStatement_in_field720);
+                {
+                    pushFollow( FOLLOW_compoundStatement_in_field720 );
                     compoundStatement();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
 
             }
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end field
 
-
     // $ANTLR start constructorBody
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:318:1: constructorBody : LCURLY ( options {greedy=true; } : explicitConstructorInvocation )? ( statement )* RCURLY ;
-    public void constructorBody() throws RecognitionException {   
+    public void constructorBody() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:319:9: ( LCURLY ( options {greedy=true; } : explicitConstructorInvocation )? ( statement )* RCURLY )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:319:9: LCURLY ( options {greedy=true; } : explicitConstructorInvocation )? ( statement )* RCURLY
             {
-            match(input,LCURLY,FOLLOW_LCURLY_in_constructorBody739); 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:320:13: ( options {greedy=true; } : explicitConstructorInvocation )?
-            int alt20=2;
-            int LA20_0 = input.LA(1);
-            if ( (LA20_0==93) ) {
-                int LA20_1 = input.LA(2);
-                if ( (LA20_1==LPAREN) ) {
-                    alt20=1;
+                match( this.input,
+                       LCURLY,
+                       FOLLOW_LCURLY_in_constructorBody739 );
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:320:13: ( options {greedy=true; } : explicitConstructorInvocation )?
+                int alt20 = 2;
+                final int LA20_0 = this.input.LA( 1 );
+                if ( (LA20_0 == 93) ) {
+                    final int LA20_1 = this.input.LA( 2 );
+                    if ( (LA20_1 == LPAREN) ) {
+                        alt20 = 1;
+                    }
+                } else if ( (LA20_0 == 94) ) {
+                    final int LA20_2 = this.input.LA( 2 );
+                    if ( (LA20_2 == LPAREN) ) {
+                        alt20 = 1;
+                    }
                 }
-            }
-            else if ( (LA20_0==94) ) {
-                int LA20_2 = input.LA(2);
-                if ( (LA20_2==LPAREN) ) {
-                    alt20=1;
-                }
-            }
-            switch (alt20) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:320:40: explicitConstructorInvocation
+                switch ( alt20 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:320:40: explicitConstructorInvocation
                     {
-                    pushFollow(FOLLOW_explicitConstructorInvocation_in_constructorBody765);
-                    explicitConstructorInvocation();
-                    _fsp--;
+                        pushFollow( FOLLOW_explicitConstructorInvocation_in_constructorBody765 );
+                        explicitConstructorInvocation();
+                        this._fsp--;
 
-
                     }
-                    break;
+                        break;
 
-            }
-
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:321:13: ( statement )*
-            loop21:
-            do {
-                int alt21=2;
-                int LA21_0 = input.LA(1);
-                if ( (LA21_0==IDENT||(LA21_0>=LCURLY && LA21_0<=SEMI)||LA21_0==LPAREN||(LA21_0>=PLUS && LA21_0<=MINUS)||(LA21_0>=INC && LA21_0<=NUM_FLOAT)||(LA21_0>=68 && LA21_0<=89)||(LA21_0>=93 && LA21_0<=94)||LA21_0==96||(LA21_0>=98 && LA21_0<=105)||LA21_0==108||(LA21_0>=112 && LA21_0<=115)) ) {
-                    alt21=1;
                 }
 
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:321:13: ( statement )*
+                loop21 : do {
+                    int alt21 = 2;
+                    final int LA21_0 = this.input.LA( 1 );
+                    if ( (LA21_0 == IDENT || (LA21_0 >= LCURLY && LA21_0 <= SEMI) || LA21_0 == LPAREN || (LA21_0 >= PLUS && LA21_0 <= MINUS) || (LA21_0 >= INC && LA21_0 <= NUM_FLOAT) || (LA21_0 >= 68 && LA21_0 <= 89)
+                          || (LA21_0 >= 93 && LA21_0 <= 94) || LA21_0 == 96 || (LA21_0 >= 98 && LA21_0 <= 105) || LA21_0 == 108 || (LA21_0 >= 112 && LA21_0 <= 115)) ) {
+                        alt21 = 1;
+                    }
 
-                switch (alt21) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:321:14: statement
-            	    {
-            	    pushFollow(FOLLOW_statement_in_constructorBody782);
-            	    statement();
-            	    _fsp--;
+                    switch ( alt21 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:321:14: statement
+                        {
+                            pushFollow( FOLLOW_statement_in_constructorBody782 );
+                            statement();
+                            this._fsp--;
 
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            break loop21;
+                    }
+                } while ( true );
 
-            	default :
-            	    break loop21;
-                }
-            } while (true);
+                match( this.input,
+                       RCURLY,
+                       FOLLOW_RCURLY_in_constructorBody794 );
 
-            match(input,RCURLY,FOLLOW_RCURLY_in_constructorBody794); 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end constructorBody
 
-
     // $ANTLR start explicitConstructorInvocation
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:325:1: explicitConstructorInvocation : ( 'this' LPAREN argList RPAREN SEMI | 'super' LPAREN argList RPAREN SEMI );
-    public void explicitConstructorInvocation() throws RecognitionException {   
+    public void explicitConstructorInvocation() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:327:9: ( 'this' LPAREN argList RPAREN SEMI | 'super' LPAREN argList RPAREN SEMI )
-            int alt22=2;
-            int LA22_0 = input.LA(1);
-            if ( (LA22_0==93) ) {
-                alt22=1;
-            }
-            else if ( (LA22_0==94) ) {
-                alt22=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("325:1: explicitConstructorInvocation : ( 'this' LPAREN argList RPAREN SEMI | 'super' LPAREN argList RPAREN SEMI );", 22, 0, input);
+            int alt22 = 2;
+            final int LA22_0 = this.input.LA( 1 );
+            if ( (LA22_0 == 93) ) {
+                alt22 = 1;
+            } else if ( (LA22_0 == 94) ) {
+                alt22 = 2;
+            } else {
+                final NoViableAltException nvae = new NoViableAltException( "325:1: explicitConstructorInvocation : ( 'this' LPAREN argList RPAREN SEMI | 'super' LPAREN argList RPAREN SEMI );",
+                                                                      22,
+                                                                      0,
+                                                                      this.input );
 
                 throw nvae;
             }
-            switch (alt22) {
+            switch ( alt22 ) {
                 case 1 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:327:9: 'this' LPAREN argList RPAREN SEMI
-                    {
-                    match(input,93,FOLLOW_93_in_explicitConstructorInvocation815); 
-                    match(input,LPAREN,FOLLOW_LPAREN_in_explicitConstructorInvocation817); 
-                    pushFollow(FOLLOW_argList_in_explicitConstructorInvocation819);
+                {
+                    match( this.input,
+                           93,
+                           FOLLOW_93_in_explicitConstructorInvocation815 );
+                    match( this.input,
+                           LPAREN,
+                           FOLLOW_LPAREN_in_explicitConstructorInvocation817 );
+                    pushFollow( FOLLOW_argList_in_explicitConstructorInvocation819 );
                     argList();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,RPAREN,FOLLOW_RPAREN_in_explicitConstructorInvocation821); 
-                    match(input,SEMI,FOLLOW_SEMI_in_explicitConstructorInvocation823); 
+                    match( this.input,
+                           RPAREN,
+                           FOLLOW_RPAREN_in_explicitConstructorInvocation821 );
+                    match( this.input,
+                           SEMI,
+                           FOLLOW_SEMI_in_explicitConstructorInvocation823 );
 
-                    }
+                }
                     break;
                 case 2 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:329:9: 'super' LPAREN argList RPAREN SEMI
-                    {
-                    match(input,94,FOLLOW_94_in_explicitConstructorInvocation836); 
-                    match(input,LPAREN,FOLLOW_LPAREN_in_explicitConstructorInvocation838); 
-                    pushFollow(FOLLOW_argList_in_explicitConstructorInvocation840);
+                {
+                    match( this.input,
+                           94,
+                           FOLLOW_94_in_explicitConstructorInvocation836 );
+                    match( this.input,
+                           LPAREN,
+                           FOLLOW_LPAREN_in_explicitConstructorInvocation838 );
+                    pushFollow( FOLLOW_argList_in_explicitConstructorInvocation840 );
                     argList();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,RPAREN,FOLLOW_RPAREN_in_explicitConstructorInvocation842); 
-                    match(input,SEMI,FOLLOW_SEMI_in_explicitConstructorInvocation844); 
+                    match( this.input,
+                           RPAREN,
+                           FOLLOW_RPAREN_in_explicitConstructorInvocation842 );
+                    match( this.input,
+                           SEMI,
+                           FOLLOW_SEMI_in_explicitConstructorInvocation844 );
 
-                    }
+                }
                     break;
 
             }
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end explicitConstructorInvocation
 
-
     // $ANTLR start variableDefinitions
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:333:1: variableDefinitions : variableDeclarator ( COMMA variableDeclarator )* ;
-    public void variableDefinitions() throws RecognitionException {   
+    public void variableDefinitions() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:334:4: ( variableDeclarator ( COMMA variableDeclarator )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:334:4: variableDeclarator ( COMMA variableDeclarator )*
             {
-            pushFollow(FOLLOW_variableDeclarator_in_variableDefinitions861);
-            variableDeclarator();
-            _fsp--;
+                pushFollow( FOLLOW_variableDeclarator_in_variableDefinitions861 );
+                variableDeclarator();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:335:3: ( COMMA variableDeclarator )*
-            loop23:
-            do {
-                int alt23=2;
-                int LA23_0 = input.LA(1);
-                if ( (LA23_0==COMMA) ) {
-                    alt23=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:335:3: ( COMMA variableDeclarator )*
+                loop23 : do {
+                    int alt23 = 2;
+                    final int LA23_0 = this.input.LA( 1 );
+                    if ( (LA23_0 == COMMA) ) {
+                        alt23 = 1;
+                    }
 
+                    switch ( alt23 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:335:5: COMMA variableDeclarator
+                        {
+                            match( this.input,
+                                   COMMA,
+                                   FOLLOW_COMMA_in_variableDefinitions867 );
+                            pushFollow( FOLLOW_variableDeclarator_in_variableDefinitions872 );
+                            variableDeclarator();
+                            this._fsp--;
 
-                switch (alt23) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:335:5: COMMA variableDeclarator
-            	    {
-            	    match(input,COMMA,FOLLOW_COMMA_in_variableDefinitions867); 
-            	    pushFollow(FOLLOW_variableDeclarator_in_variableDefinitions872);
-            	    variableDeclarator();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop23;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop23;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end variableDefinitions
 
-
     // $ANTLR start variableDeclarator
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:340:1: variableDeclarator : IDENT declaratorBrackets varInitializer ;
-    public void variableDeclarator() throws RecognitionException {   
+    public void variableDeclarator() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:345:4: ( IDENT declaratorBrackets varInitializer )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:345:4: IDENT declaratorBrackets varInitializer
             {
-            match(input,IDENT,FOLLOW_IDENT_in_variableDeclarator890); 
-            pushFollow(FOLLOW_declaratorBrackets_in_variableDeclarator892);
-            declaratorBrackets();
-            _fsp--;
+                match( this.input,
+                       IDENT,
+                       FOLLOW_IDENT_in_variableDeclarator890 );
+                pushFollow( FOLLOW_declaratorBrackets_in_variableDeclarator892 );
+                declaratorBrackets();
+                this._fsp--;
 
-            pushFollow(FOLLOW_varInitializer_in_variableDeclarator894);
-            varInitializer();
-            _fsp--;
+                pushFollow( FOLLOW_varInitializer_in_variableDeclarator894 );
+                varInitializer();
+                this._fsp--;
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end variableDeclarator
 
-
     // $ANTLR start declaratorBrackets
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:349:1: declaratorBrackets : ( LBRACK RBRACK )* ;
-    public void declaratorBrackets() throws RecognitionException {   
+    public void declaratorBrackets() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:351:3: ( ( LBRACK RBRACK )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:351:3: ( LBRACK RBRACK )*
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:351:3: ( LBRACK RBRACK )*
-            loop24:
-            do {
-                int alt24=2;
-                int LA24_0 = input.LA(1);
-                if ( (LA24_0==LBRACK) ) {
-                    alt24=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:351:3: ( LBRACK RBRACK )*
+                loop24 : do {
+                    int alt24 = 2;
+                    final int LA24_0 = this.input.LA( 1 );
+                    if ( (LA24_0 == LBRACK) ) {
+                        alt24 = 1;
+                    }
 
+                    switch ( alt24 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:351:4: LBRACK RBRACK
+                        {
+                            match( this.input,
+                                   LBRACK,
+                                   FOLLOW_LBRACK_in_declaratorBrackets912 );
+                            match( this.input,
+                                   RBRACK,
+                                   FOLLOW_RBRACK_in_declaratorBrackets915 );
 
-                switch (alt24) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:351:4: LBRACK RBRACK
-            	    {
-            	    match(input,LBRACK,FOLLOW_LBRACK_in_declaratorBrackets912); 
-            	    match(input,RBRACK,FOLLOW_RBRACK_in_declaratorBrackets915); 
+                        }
+                            break;
 
-            	    }
-            	    break;
+                        default :
+                            break loop24;
+                    }
+                } while ( true );
 
-            	default :
-            	    break loop24;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end declaratorBrackets
 
-
     // $ANTLR start varInitializer
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:354:1: varInitializer : ( ASSIGN initializer )? ;
-    public void varInitializer() throws RecognitionException {   
+    public void varInitializer() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:355:4: ( ( ASSIGN initializer )? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:355:4: ( ASSIGN initializer )?
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:355:4: ( ASSIGN initializer )?
-            int alt25=2;
-            int LA25_0 = input.LA(1);
-            if ( (LA25_0==ASSIGN) ) {
-                alt25=1;
-            }
-            switch (alt25) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:355:6: ASSIGN initializer
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:355:4: ( ASSIGN initializer )?
+                int alt25 = 2;
+                final int LA25_0 = this.input.LA( 1 );
+                if ( (LA25_0 == ASSIGN) ) {
+                    alt25 = 1;
+                }
+                switch ( alt25 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:355:6: ASSIGN initializer
                     {
-                    match(input,ASSIGN,FOLLOW_ASSIGN_in_varInitializer930); 
-                    pushFollow(FOLLOW_initializer_in_varInitializer932);
-                    initializer();
-                    _fsp--;
+                        match( this.input,
+                               ASSIGN,
+                               FOLLOW_ASSIGN_in_varInitializer930 );
+                        pushFollow( FOLLOW_initializer_in_varInitializer932 );
+                        initializer();
+                        this._fsp--;
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end varInitializer
 
-
     // $ANTLR start arrayInitializer
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:359:1: arrayInitializer : LCURLY ( initializer ( COMMA initializer )* ( COMMA )? )? RCURLY ;
-    public void arrayInitializer() throws RecognitionException {   
+    public void arrayInitializer() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:360:4: ( LCURLY ( initializer ( COMMA initializer )* ( COMMA )? )? RCURLY )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:360:4: LCURLY ( initializer ( COMMA initializer )* ( COMMA )? )? RCURLY
             {
-            match(input,LCURLY,FOLLOW_LCURLY_in_arrayInitializer947); 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:361:4: ( initializer ( COMMA initializer )* ( COMMA )? )?
-            int alt28=2;
-            int LA28_0 = input.LA(1);
-            if ( (LA28_0==IDENT||LA28_0==LCURLY||LA28_0==LPAREN||(LA28_0>=PLUS && LA28_0<=MINUS)||(LA28_0>=INC && LA28_0<=NUM_FLOAT)||(LA28_0>=68 && LA28_0<=76)||(LA28_0>=93 && LA28_0<=94)||(LA28_0>=112 && LA28_0<=115)) ) {
-                alt28=1;
-            }
-            switch (alt28) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:361:6: initializer ( COMMA initializer )* ( COMMA )?
+                match( this.input,
+                       LCURLY,
+                       FOLLOW_LCURLY_in_arrayInitializer947 );
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:361:4: ( initializer ( COMMA initializer )* ( COMMA )? )?
+                int alt28 = 2;
+                final int LA28_0 = this.input.LA( 1 );
+                if ( (LA28_0 == IDENT || LA28_0 == LCURLY || LA28_0 == LPAREN || (LA28_0 >= PLUS && LA28_0 <= MINUS) || (LA28_0 >= INC && LA28_0 <= NUM_FLOAT) || (LA28_0 >= 68 && LA28_0 <= 76) || (LA28_0 >= 93 && LA28_0 <= 94) || (LA28_0 >= 112 && LA28_0 <= 115)) ) {
+                    alt28 = 1;
+                }
+                switch ( alt28 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:361:6: initializer ( COMMA initializer )* ( COMMA )?
                     {
-                    pushFollow(FOLLOW_initializer_in_arrayInitializer955);
-                    initializer();
-                    _fsp--;
+                        pushFollow( FOLLOW_initializer_in_arrayInitializer955 );
+                        initializer();
+                        this._fsp--;
 
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:362:5: ( COMMA initializer )*
-                    loop26:
-                    do {
-                        int alt26=2;
-                        int LA26_0 = input.LA(1);
-                        if ( (LA26_0==COMMA) ) {
-                            int LA26_1 = input.LA(2);
-                            if ( (LA26_1==IDENT||LA26_1==LCURLY||LA26_1==LPAREN||(LA26_1>=PLUS && LA26_1<=MINUS)||(LA26_1>=INC && LA26_1<=NUM_FLOAT)||(LA26_1>=68 && LA26_1<=76)||(LA26_1>=93 && LA26_1<=94)||(LA26_1>=112 && LA26_1<=115)) ) {
-                                alt26=1;
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:362:5: ( COMMA initializer )*
+                        loop26 : do {
+                            int alt26 = 2;
+                            final int LA26_0 = this.input.LA( 1 );
+                            if ( (LA26_0 == COMMA) ) {
+                                final int LA26_1 = this.input.LA( 2 );
+                                if ( (LA26_1 == IDENT || LA26_1 == LCURLY || LA26_1 == LPAREN || (LA26_1 >= PLUS && LA26_1 <= MINUS) || (LA26_1 >= INC && LA26_1 <= NUM_FLOAT) || (LA26_1 >= 68 && LA26_1 <= 76) || (LA26_1 >= 93 && LA26_1 <= 94) || (LA26_1 >= 112 && LA26_1 <= 115)) ) {
+                                    alt26 = 1;
+                                }
+
                             }
 
+                            switch ( alt26 ) {
+                                case 1 :
+                                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:367:6: COMMA initializer
+                                {
+                                    match( this.input,
+                                           COMMA,
+                                           FOLLOW_COMMA_in_arrayInitializer992 );
+                                    pushFollow( FOLLOW_initializer_in_arrayInitializer994 );
+                                    initializer();
+                                    this._fsp--;
 
-                        }
+                                }
+                                    break;
 
+                                default :
+                                    break loop26;
+                            }
+                        } while ( true );
 
-                        switch (alt26) {
-                    	case 1 :
-                    	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:367:6: COMMA initializer
-                    	    {
-                    	    match(input,COMMA,FOLLOW_COMMA_in_arrayInitializer992); 
-                    	    pushFollow(FOLLOW_initializer_in_arrayInitializer994);
-                    	    initializer();
-                    	    _fsp--;
-
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop26;
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:369:5: ( COMMA )?
+                        int alt27 = 2;
+                        final int LA27_0 = this.input.LA( 1 );
+                        if ( (LA27_0 == COMMA) ) {
+                            alt27 = 1;
                         }
-                    } while (true);
-
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:369:5: ( COMMA )?
-                    int alt27=2;
-                    int LA27_0 = input.LA(1);
-                    if ( (LA27_0==COMMA) ) {
-                        alt27=1;
-                    }
-                    switch (alt27) {
-                        case 1 :
-                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:369:6: COMMA
+                        switch ( alt27 ) {
+                            case 1 :
+                                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:369:6: COMMA
                             {
-                            match(input,COMMA,FOLLOW_COMMA_in_arrayInitializer1008); 
+                                match( this.input,
+                                       COMMA,
+                                       FOLLOW_COMMA_in_arrayInitializer1008 );
 
                             }
-                            break;
+                                break;
 
-                    }
+                        }
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-            match(input,RCURLY,FOLLOW_RCURLY_in_arrayInitializer1020); 
+                match( this.input,
+                       RCURLY,
+                       FOLLOW_RCURLY_in_arrayInitializer1020 );
 
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end arrayInitializer
 
-
     // $ANTLR start initializer
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:377:1: initializer : ( expression | arrayInitializer );
-    public void initializer() throws RecognitionException {   
+    public void initializer() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:378:4: ( expression | arrayInitializer )
-            int alt29=2;
-            int LA29_0 = input.LA(1);
-            if ( (LA29_0==IDENT||LA29_0==LPAREN||(LA29_0>=PLUS && LA29_0<=MINUS)||(LA29_0>=INC && LA29_0<=NUM_FLOAT)||(LA29_0>=68 && LA29_0<=76)||(LA29_0>=93 && LA29_0<=94)||(LA29_0>=112 && LA29_0<=115)) ) {
-                alt29=1;
-            }
-            else if ( (LA29_0==LCURLY) ) {
-                alt29=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("377:1: initializer : ( expression | arrayInitializer );", 29, 0, input);
+            int alt29 = 2;
+            final int LA29_0 = this.input.LA( 1 );
+            if ( (LA29_0 == IDENT || LA29_0 == LPAREN || (LA29_0 >= PLUS && LA29_0 <= MINUS) || (LA29_0 >= INC && LA29_0 <= NUM_FLOAT) || (LA29_0 >= 68 && LA29_0 <= 76) || (LA29_0 >= 93 && LA29_0 <= 94) || (LA29_0 >= 112 && LA29_0 <= 115)) ) {
+                alt29 = 1;
+            } else if ( (LA29_0 == LCURLY) ) {
+                alt29 = 2;
+            } else {
+                final NoViableAltException nvae = new NoViableAltException( "377:1: initializer : ( expression | arrayInitializer );",
+                                                                      29,
+                                                                      0,
+                                                                      this.input );
 
                 throw nvae;
             }
-            switch (alt29) {
+            switch ( alt29 ) {
                 case 1 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:378:4: expression
-                    {
-                    pushFollow(FOLLOW_expression_in_initializer1034);
+                {
+                    pushFollow( FOLLOW_expression_in_initializer1034 );
                     expression();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 2 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:379:4: arrayInitializer
-                    {
-                    pushFollow(FOLLOW_arrayInitializer_in_initializer1039);
+                {
+                    pushFollow( FOLLOW_arrayInitializer_in_initializer1039 );
                     arrayInitializer();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
 
             }
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end initializer
 
-
     // $ANTLR start ctorHead
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:385:1: ctorHead : IDENT LPAREN parameterDeclarationList RPAREN ( throwsClause )? ;
-    public void ctorHead() throws RecognitionException {   
+    public void ctorHead() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:386:4: ( IDENT LPAREN parameterDeclarationList RPAREN ( throwsClause )? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:386:4: IDENT LPAREN parameterDeclarationList RPAREN ( throwsClause )?
             {
-            match(input,IDENT,FOLLOW_IDENT_in_ctorHead1053); 
-            match(input,LPAREN,FOLLOW_LPAREN_in_ctorHead1063); 
-            pushFollow(FOLLOW_parameterDeclarationList_in_ctorHead1065);
-            parameterDeclarationList();
-            _fsp--;
+                match( this.input,
+                       IDENT,
+                       FOLLOW_IDENT_in_ctorHead1053 );
+                match( this.input,
+                       LPAREN,
+                       FOLLOW_LPAREN_in_ctorHead1063 );
+                pushFollow( FOLLOW_parameterDeclarationList_in_ctorHead1065 );
+                parameterDeclarationList();
+                this._fsp--;
 
-            match(input,RPAREN,FOLLOW_RPAREN_in_ctorHead1067); 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:392:3: ( throwsClause )?
-            int alt30=2;
-            int LA30_0 = input.LA(1);
-            if ( (LA30_0==95) ) {
-                alt30=1;
-            }
-            switch (alt30) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:392:4: throwsClause
+                match( this.input,
+                       RPAREN,
+                       FOLLOW_RPAREN_in_ctorHead1067 );
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:392:3: ( throwsClause )?
+                int alt30 = 2;
+                final int LA30_0 = this.input.LA( 1 );
+                if ( (LA30_0 == 95) ) {
+                    alt30 = 1;
+                }
+                switch ( alt30 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:392:4: throwsClause
                     {
-                    pushFollow(FOLLOW_throwsClause_in_ctorHead1076);
-                    throwsClause();
-                    _fsp--;
+                        pushFollow( FOLLOW_throwsClause_in_ctorHead1076 );
+                        throwsClause();
+                        this._fsp--;
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end ctorHead
 
-
     // $ANTLR start throwsClause
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:396:1: throwsClause : 'throws' identifier ( COMMA identifier )* ;
-    public void throwsClause() throws RecognitionException {   
+    public void throwsClause() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:397:4: ( 'throws' identifier ( COMMA identifier )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:397:4: 'throws' identifier ( COMMA identifier )*
             {
-            match(input,95,FOLLOW_95_in_throwsClause1090); 
-            pushFollow(FOLLOW_identifier_in_throwsClause1092);
-            identifier();
-            _fsp--;
+                match( this.input,
+                       95,
+                       FOLLOW_95_in_throwsClause1090 );
+                pushFollow( FOLLOW_identifier_in_throwsClause1092 );
+                identifier();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:397:24: ( COMMA identifier )*
-            loop31:
-            do {
-                int alt31=2;
-                int LA31_0 = input.LA(1);
-                if ( (LA31_0==COMMA) ) {
-                    alt31=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:397:24: ( COMMA identifier )*
+                loop31 : do {
+                    int alt31 = 2;
+                    final int LA31_0 = this.input.LA( 1 );
+                    if ( (LA31_0 == COMMA) ) {
+                        alt31 = 1;
+                    }
 
+                    switch ( alt31 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:397:26: COMMA identifier
+                        {
+                            match( this.input,
+                                   COMMA,
+                                   FOLLOW_COMMA_in_throwsClause1096 );
+                            pushFollow( FOLLOW_identifier_in_throwsClause1098 );
+                            identifier();
+                            this._fsp--;
 
-                switch (alt31) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:397:26: COMMA identifier
-            	    {
-            	    match(input,COMMA,FOLLOW_COMMA_in_throwsClause1096); 
-            	    pushFollow(FOLLOW_identifier_in_throwsClause1098);
-            	    identifier();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop31;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop31;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end throwsClause
 
-
     // $ANTLR start parameterDeclarationList
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:402:1: parameterDeclarationList : ( parameterDeclaration ( COMMA parameterDeclaration )* )? ;
-    public void parameterDeclarationList() throws RecognitionException {   
+    public void parameterDeclarationList() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:403:4: ( ( parameterDeclaration ( COMMA parameterDeclaration )* )? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:403:4: ( parameterDeclaration ( COMMA parameterDeclaration )* )?
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:403:4: ( parameterDeclaration ( COMMA parameterDeclaration )* )?
-            int alt33=2;
-            int LA33_0 = input.LA(1);
-            if ( (LA33_0==IDENT||(LA33_0>=68 && LA33_0<=76)||LA33_0==82) ) {
-                alt33=1;
-            }
-            switch (alt33) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:403:6: parameterDeclaration ( COMMA parameterDeclaration )*
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:403:4: ( parameterDeclaration ( COMMA parameterDeclaration )* )?
+                int alt33 = 2;
+                final int LA33_0 = this.input.LA( 1 );
+                if ( (LA33_0 == IDENT || (LA33_0 >= 68 && LA33_0 <= 76) || LA33_0 == 82) ) {
+                    alt33 = 1;
+                }
+                switch ( alt33 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:403:6: parameterDeclaration ( COMMA parameterDeclaration )*
                     {
-                    pushFollow(FOLLOW_parameterDeclaration_in_parameterDeclarationList1116);
-                    parameterDeclaration();
-                    _fsp--;
+                        pushFollow( FOLLOW_parameterDeclaration_in_parameterDeclarationList1116 );
+                        parameterDeclaration();
+                        this._fsp--;
 
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:403:27: ( COMMA parameterDeclaration )*
-                    loop32:
-                    do {
-                        int alt32=2;
-                        int LA32_0 = input.LA(1);
-                        if ( (LA32_0==COMMA) ) {
-                            alt32=1;
-                        }
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:403:27: ( COMMA parameterDeclaration )*
+                        loop32 : do {
+                            int alt32 = 2;
+                            final int LA32_0 = this.input.LA( 1 );
+                            if ( (LA32_0 == COMMA) ) {
+                                alt32 = 1;
+                            }
 
+                            switch ( alt32 ) {
+                                case 1 :
+                                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:403:29: COMMA parameterDeclaration
+                                {
+                                    match( this.input,
+                                           COMMA,
+                                           FOLLOW_COMMA_in_parameterDeclarationList1120 );
+                                    pushFollow( FOLLOW_parameterDeclaration_in_parameterDeclarationList1122 );
+                                    parameterDeclaration();
+                                    this._fsp--;
 
-                        switch (alt32) {
-                    	case 1 :
-                    	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:403:29: COMMA parameterDeclaration
-                    	    {
-                    	    match(input,COMMA,FOLLOW_COMMA_in_parameterDeclarationList1120); 
-                    	    pushFollow(FOLLOW_parameterDeclaration_in_parameterDeclarationList1122);
-                    	    parameterDeclaration();
-                    	    _fsp--;
+                                }
+                                    break;
 
+                                default :
+                                    break loop32;
+                            }
+                        } while ( true );
 
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop32;
-                        }
-                    } while (true);
-
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end parameterDeclarationList
 
-
     // $ANTLR start parameterDeclaration
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:407:1: parameterDeclaration : parameterModifier typeSpec IDENT declaratorBrackets ;
-    public void parameterDeclaration() throws RecognitionException {   
+    public void parameterDeclaration() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:408:4: ( parameterModifier typeSpec IDENT declaratorBrackets )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:408:4: parameterModifier typeSpec IDENT declaratorBrackets
             {
-            pushFollow(FOLLOW_parameterModifier_in_parameterDeclaration1140);
-            parameterModifier();
-            _fsp--;
+                pushFollow( FOLLOW_parameterModifier_in_parameterDeclaration1140 );
+                parameterModifier();
+                this._fsp--;
 
-            pushFollow(FOLLOW_typeSpec_in_parameterDeclaration1142);
-            typeSpec();
-            _fsp--;
+                pushFollow( FOLLOW_typeSpec_in_parameterDeclaration1142 );
+                typeSpec();
+                this._fsp--;
 
-            match(input,IDENT,FOLLOW_IDENT_in_parameterDeclaration1144); 
-            pushFollow(FOLLOW_declaratorBrackets_in_parameterDeclaration1148);
-            declaratorBrackets();
-            _fsp--;
+                match( this.input,
+                       IDENT,
+                       FOLLOW_IDENT_in_parameterDeclaration1144 );
+                pushFollow( FOLLOW_declaratorBrackets_in_parameterDeclaration1148 );
+                declaratorBrackets();
+                this._fsp--;
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end parameterDeclaration
 
-
     // $ANTLR start parameterModifier
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:412:1: parameterModifier : ( 'final' )? ;
-    public void parameterModifier() throws RecognitionException {   
+    public void parameterModifier() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:413:4: ( ( 'final' )? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:413:4: ( 'final' )?
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:413:4: ( 'final' )?
-            int alt34=2;
-            int LA34_0 = input.LA(1);
-            if ( (LA34_0==82) ) {
-                alt34=1;
-            }
-            switch (alt34) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:413:5: 'final'
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:413:4: ( 'final' )?
+                int alt34 = 2;
+                final int LA34_0 = this.input.LA( 1 );
+                if ( (LA34_0 == 82) ) {
+                    alt34 = 1;
+                }
+                switch ( alt34 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:413:5: 'final'
                     {
-                    match(input,82,FOLLOW_82_in_parameterModifier1160); 
+                        match( this.input,
+                               82,
+                               FOLLOW_82_in_parameterModifier1160 );
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end parameterModifier
 
-
     // $ANTLR start compoundStatement
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:426:1: compoundStatement : LCURLY ( statement )* RCURLY ;
-    public void compoundStatement() throws RecognitionException {   
+    public void compoundStatement() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:427:4: ( LCURLY ( statement )* RCURLY )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:427:4: LCURLY ( statement )* RCURLY
             {
-            match(input,LCURLY,FOLLOW_LCURLY_in_compoundStatement1185); 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:429:4: ( statement )*
-            loop35:
-            do {
-                int alt35=2;
-                int LA35_0 = input.LA(1);
-                if ( (LA35_0==IDENT||(LA35_0>=LCURLY && LA35_0<=SEMI)||LA35_0==LPAREN||(LA35_0>=PLUS && LA35_0<=MINUS)||(LA35_0>=INC && LA35_0<=NUM_FLOAT)||(LA35_0>=68 && LA35_0<=89)||(LA35_0>=93 && LA35_0<=94)||LA35_0==96||(LA35_0>=98 && LA35_0<=105)||LA35_0==108||(LA35_0>=112 && LA35_0<=115)) ) {
-                    alt35=1;
-                }
+                match( this.input,
+                       LCURLY,
+                       FOLLOW_LCURLY_in_compoundStatement1185 );
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:429:4: ( statement )*
+                loop35 : do {
+                    int alt35 = 2;
+                    final int LA35_0 = this.input.LA( 1 );
+                    if ( (LA35_0 == IDENT || (LA35_0 >= LCURLY && LA35_0 <= SEMI) || LA35_0 == LPAREN || (LA35_0 >= PLUS && LA35_0 <= MINUS) || (LA35_0 >= INC && LA35_0 <= NUM_FLOAT) || (LA35_0 >= 68 && LA35_0 <= 89)
+                          || (LA35_0 >= 93 && LA35_0 <= 94) || LA35_0 == 96 || (LA35_0 >= 98 && LA35_0 <= 105) || LA35_0 == 108 || (LA35_0 >= 112 && LA35_0 <= 115)) ) {
+                        alt35 = 1;
+                    }
 
+                    switch ( alt35 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:429:5: statement
+                        {
+                            pushFollow( FOLLOW_statement_in_compoundStatement1196 );
+                            statement();
+                            this._fsp--;
 
-                switch (alt35) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:429:5: statement
-            	    {
-            	    pushFollow(FOLLOW_statement_in_compoundStatement1196);
-            	    statement();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop35;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
+                match( this.input,
+                       RCURLY,
+                       FOLLOW_RCURLY_in_compoundStatement1202 );
 
-            	default :
-            	    break loop35;
-                }
-            } while (true);
-
-            match(input,RCURLY,FOLLOW_RCURLY_in_compoundStatement1202); 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end compoundStatement
 
-
     // $ANTLR start statement
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:434:1: statement : ( compoundStatement | declaration SEMI | expression SEMI | modifiers classDefinition | IDENT COLON statement | 'if' LPAREN expression RPAREN statement ( 'else' statement )? | 'for' LPAREN forInit SEMI forCond SEMI forIter RPAREN statement | 'while' LPAREN expression RPAREN statement | 'do' statement 'while' LPAREN expression RPAREN SEMI | 'break' ( IDENT )? SEMI | 'continue' ( IDENT )? SEMI | 'return' ( expression )? SEMI | 'switch' LPAREN expression RPAREN LCURLY ( casesGroup )* RCURLY | tryBlock | 'throw' expression SEMI | 'synchronized' LPAREN expression RPAREN compoundStatement | SEMI );
-    public void statement() throws RecognitionException {   
+    public void statement() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:436:4: ( compoundStatement | declaration SEMI | expression SEMI | modifiers classDefinition | IDENT COLON statement | 'if' LPAREN expression RPAREN statement ( 'else' statement )? | 'for' LPAREN forInit SEMI forCond SEMI forIter RPAREN statement | 'while' LPAREN expression RPAREN statement | 'do' statement 'while' LPAREN expression RPAREN SEMI | 'break' ( IDENT )? SEMI | 'continue' ( IDENT )? SEMI | 'return' ( expression )? SEMI | 'switch' LPAREN expression RPAREN LCURLY ( casesGroup )* RCURLY | tryBlock | 'throw' expression SEMI | 'synchronized' LPAREN expression RPAREN compoundStatement | SEMI )
-            int alt41=17;
-            alt41 = dfa41.predict(input);
-            switch (alt41) {
+            int alt41 = 17;
+            alt41 = this.dfa41.predict( this.input );
+            switch ( alt41 ) {
                 case 1 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:436:4: compoundStatement
-                    {
-                    pushFollow(FOLLOW_compoundStatement_in_statement1216);
+                {
+                    pushFollow( FOLLOW_compoundStatement_in_statement1216 );
                     compoundStatement();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 2 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:443:4: declaration SEMI
-                    {
-                    pushFollow(FOLLOW_declaration_in_statement1232);
+                {
+                    pushFollow( FOLLOW_declaration_in_statement1232 );
                     declaration();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,SEMI,FOLLOW_SEMI_in_statement1234); 
+                    match( this.input,
+                           SEMI,
+                           FOLLOW_SEMI_in_statement1234 );
 
-                    }
+                }
                     break;
                 case 3 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:448:4: expression SEMI
-                    {
-                    pushFollow(FOLLOW_expression_in_statement1246);
+                {
+                    pushFollow( FOLLOW_expression_in_statement1246 );
                     expression();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,SEMI,FOLLOW_SEMI_in_statement1248); 
+                    match( this.input,
+                           SEMI,
+                           FOLLOW_SEMI_in_statement1248 );
 
-                    }
+                }
                     break;
                 case 4 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:451:4: modifiers classDefinition
-                    {
-                    pushFollow(FOLLOW_modifiers_in_statement1256);
+                {
+                    pushFollow( FOLLOW_modifiers_in_statement1256 );
                     modifiers();
-                    _fsp--;
+                    this._fsp--;
 
-                    pushFollow(FOLLOW_classDefinition_in_statement1258);
+                    pushFollow( FOLLOW_classDefinition_in_statement1258 );
                     classDefinition();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 5 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:454:4: IDENT COLON statement
-                    {
-                    match(input,IDENT,FOLLOW_IDENT_in_statement1266); 
-                    match(input,COLON,FOLLOW_COLON_in_statement1268); 
-                    pushFollow(FOLLOW_statement_in_statement1271);
+                {
+                    match( this.input,
+                           IDENT,
+                           FOLLOW_IDENT_in_statement1266 );
+                    match( this.input,
+                           COLON,
+                           FOLLOW_COLON_in_statement1268 );
+                    pushFollow( FOLLOW_statement_in_statement1271 );
                     statement();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 6 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:457:4: 'if' LPAREN expression RPAREN statement ( 'else' statement )?
-                    {
-                    match(input,96,FOLLOW_96_in_statement1279); 
-                    match(input,LPAREN,FOLLOW_LPAREN_in_statement1281); 
-                    pushFollow(FOLLOW_expression_in_statement1283);
+                {
+                    match( this.input,
+                           96,
+                           FOLLOW_96_in_statement1279 );
+                    match( this.input,
+                           LPAREN,
+                           FOLLOW_LPAREN_in_statement1281 );
+                    pushFollow( FOLLOW_expression_in_statement1283 );
                     expression();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,RPAREN,FOLLOW_RPAREN_in_statement1285); 
-                    pushFollow(FOLLOW_statement_in_statement1287);
+                    match( this.input,
+                           RPAREN,
+                           FOLLOW_RPAREN_in_statement1285 );
+                    pushFollow( FOLLOW_statement_in_statement1287 );
                     statement();
-                    _fsp--;
+                    this._fsp--;
 
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:458:3: ( 'else' statement )?
-                    int alt36=2;
-                    int LA36_0 = input.LA(1);
-                    if ( (LA36_0==97) ) {
-                        alt36=1;
+                    int alt36 = 2;
+                    final int LA36_0 = this.input.LA( 1 );
+                    if ( (LA36_0 == 97) ) {
+                        alt36 = 1;
                     }
-                    switch (alt36) {
+                    switch ( alt36 ) {
                         case 1 :
                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:462:4: 'else' statement
-                            {
-                            match(input,97,FOLLOW_97_in_statement1308); 
-                            pushFollow(FOLLOW_statement_in_statement1310);
+                        {
+                            match( this.input,
+                                   97,
+                                   FOLLOW_97_in_statement1308 );
+                            pushFollow( FOLLOW_statement_in_statement1310 );
                             statement();
-                            _fsp--;
+                            this._fsp--;
 
-
-                            }
+                        }
                             break;
 
                     }
 
-
-                    }
+                }
                     break;
                 case 7 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:466:4: 'for' LPAREN forInit SEMI forCond SEMI forIter RPAREN statement
-                    {
-                    match(input,98,FOLLOW_98_in_statement1323); 
-                    match(input,LPAREN,FOLLOW_LPAREN_in_statement1328); 
-                    pushFollow(FOLLOW_forInit_in_statement1334);
+                {
+                    match( this.input,
+                           98,
+                           FOLLOW_98_in_statement1323 );
+                    match( this.input,
+                           LPAREN,
+                           FOLLOW_LPAREN_in_statement1328 );
+                    pushFollow( FOLLOW_forInit_in_statement1334 );
                     forInit();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,SEMI,FOLLOW_SEMI_in_statement1336); 
-                    pushFollow(FOLLOW_forCond_in_statement1345);
+                    match( this.input,
+                           SEMI,
+                           FOLLOW_SEMI_in_statement1336 );
+                    pushFollow( FOLLOW_forCond_in_statement1345 );
                     forCond();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,SEMI,FOLLOW_SEMI_in_statement1347); 
-                    pushFollow(FOLLOW_forIter_in_statement1356);
+                    match( this.input,
+                           SEMI,
+                           FOLLOW_SEMI_in_statement1347 );
+                    pushFollow( FOLLOW_forIter_in_statement1356 );
                     forIter();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,RPAREN,FOLLOW_RPAREN_in_statement1370); 
-                    pushFollow(FOLLOW_statement_in_statement1375);
+                    match( this.input,
+                           RPAREN,
+                           FOLLOW_RPAREN_in_statement1370 );
+                    pushFollow( FOLLOW_statement_in_statement1375 );
                     statement();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 8 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:475:4: 'while' LPAREN expression RPAREN statement
-                    {
-                    match(input,99,FOLLOW_99_in_statement1404); 
-                    match(input,LPAREN,FOLLOW_LPAREN_in_statement1406); 
-                    pushFollow(FOLLOW_expression_in_statement1408);
+                {
+                    match( this.input,
+                           99,
+                           FOLLOW_99_in_statement1404 );
+                    match( this.input,
+                           LPAREN,
+                           FOLLOW_LPAREN_in_statement1406 );
+                    pushFollow( FOLLOW_expression_in_statement1408 );
                     expression();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,RPAREN,FOLLOW_RPAREN_in_statement1410); 
-                    pushFollow(FOLLOW_statement_in_statement1412);
+                    match( this.input,
+                           RPAREN,
+                           FOLLOW_RPAREN_in_statement1410 );
+                    pushFollow( FOLLOW_statement_in_statement1412 );
                     statement();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 9 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:478:4: 'do' statement 'while' LPAREN expression RPAREN SEMI
-                    {
-                    match(input,100,FOLLOW_100_in_statement1420); 
-                    pushFollow(FOLLOW_statement_in_statement1422);
+                {
+                    match( this.input,
+                           100,
+                           FOLLOW_100_in_statement1420 );
+                    pushFollow( FOLLOW_statement_in_statement1422 );
                     statement();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,99,FOLLOW_99_in_statement1424); 
-                    match(input,LPAREN,FOLLOW_LPAREN_in_statement1426); 
-                    pushFollow(FOLLOW_expression_in_statement1428);
+                    match( this.input,
+                           99,
+                           FOLLOW_99_in_statement1424 );
+                    match( this.input,
+                           LPAREN,
+                           FOLLOW_LPAREN_in_statement1426 );
+                    pushFollow( FOLLOW_expression_in_statement1428 );
                     expression();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,RPAREN,FOLLOW_RPAREN_in_statement1430); 
-                    match(input,SEMI,FOLLOW_SEMI_in_statement1432); 
+                    match( this.input,
+                           RPAREN,
+                           FOLLOW_RPAREN_in_statement1430 );
+                    match( this.input,
+                           SEMI,
+                           FOLLOW_SEMI_in_statement1432 );
 
-                    }
+                }
                     break;
                 case 10 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:481:4: 'break' ( IDENT )? SEMI
-                    {
-                    match(input,101,FOLLOW_101_in_statement1440); 
+                {
+                    match( this.input,
+                           101,
+                           FOLLOW_101_in_statement1440 );
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:481:12: ( IDENT )?
-                    int alt37=2;
-                    int LA37_0 = input.LA(1);
-                    if ( (LA37_0==IDENT) ) {
-                        alt37=1;
+                    int alt37 = 2;
+                    final int LA37_0 = this.input.LA( 1 );
+                    if ( (LA37_0 == IDENT) ) {
+                        alt37 = 1;
                     }
-                    switch (alt37) {
+                    switch ( alt37 ) {
                         case 1 :
                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:481:13: IDENT
-                            {
-                            match(input,IDENT,FOLLOW_IDENT_in_statement1443); 
+                        {
+                            match( this.input,
+                                   IDENT,
+                                   FOLLOW_IDENT_in_statement1443 );
 
-                            }
+                        }
                             break;
 
                     }
 
-                    match(input,SEMI,FOLLOW_SEMI_in_statement1447); 
+                    match( this.input,
+                           SEMI,
+                           FOLLOW_SEMI_in_statement1447 );
 
-                    }
+                }
                     break;
                 case 11 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:484:4: 'continue' ( IDENT )? SEMI
-                    {
-                    match(input,102,FOLLOW_102_in_statement1455); 
+                {
+                    match( this.input,
+                           102,
+                           FOLLOW_102_in_statement1455 );
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:484:15: ( IDENT )?
-                    int alt38=2;
-                    int LA38_0 = input.LA(1);
-                    if ( (LA38_0==IDENT) ) {
-                        alt38=1;
+                    int alt38 = 2;
+                    final int LA38_0 = this.input.LA( 1 );
+                    if ( (LA38_0 == IDENT) ) {
+                        alt38 = 1;
                     }
-                    switch (alt38) {
+                    switch ( alt38 ) {
                         case 1 :
                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:484:16: IDENT
-                            {
-                            match(input,IDENT,FOLLOW_IDENT_in_statement1458); 
+                        {
+                            match( this.input,
+                                   IDENT,
+                                   FOLLOW_IDENT_in_statement1458 );
 
-                            }
+                        }
                             break;
 
                     }
 
-                    match(input,SEMI,FOLLOW_SEMI_in_statement1462); 
+                    match( this.input,
+                           SEMI,
+                           FOLLOW_SEMI_in_statement1462 );
 
-                    }
+                }
                     break;
                 case 12 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:487:4: 'return' ( expression )? SEMI
-                    {
-                    match(input,103,FOLLOW_103_in_statement1470); 
+                {
+                    match( this.input,
+                           103,
+                           FOLLOW_103_in_statement1470 );
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:487:13: ( expression )?
-                    int alt39=2;
-                    int LA39_0 = input.LA(1);
-                    if ( (LA39_0==IDENT||LA39_0==LPAREN||(LA39_0>=PLUS && LA39_0<=MINUS)||(LA39_0>=INC && LA39_0<=NUM_FLOAT)||(LA39_0>=68 && LA39_0<=76)||(LA39_0>=93 && LA39_0<=94)||(LA39_0>=112 && LA39_0<=115)) ) {
-                        alt39=1;
+                    int alt39 = 2;
+                    final int LA39_0 = this.input.LA( 1 );
+                    if ( (LA39_0 == IDENT || LA39_0 == LPAREN || (LA39_0 >= PLUS && LA39_0 <= MINUS) || (LA39_0 >= INC && LA39_0 <= NUM_FLOAT) || (LA39_0 >= 68 && LA39_0 <= 76) || (LA39_0 >= 93 && LA39_0 <= 94) || (LA39_0 >= 112 && LA39_0 <= 115)) ) {
+                        alt39 = 1;
                     }
-                    switch (alt39) {
+                    switch ( alt39 ) {
                         case 1 :
                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:487:14: expression
-                            {
-                            pushFollow(FOLLOW_expression_in_statement1473);
+                        {
+                            pushFollow( FOLLOW_expression_in_statement1473 );
                             expression();
-                            _fsp--;
+                            this._fsp--;
 
-
-                            }
+                        }
                             break;
 
                     }
 
-                    match(input,SEMI,FOLLOW_SEMI_in_statement1477); 
+                    match( this.input,
+                           SEMI,
+                           FOLLOW_SEMI_in_statement1477 );
 
-                    }
+                }
                     break;
                 case 13 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:490:4: 'switch' LPAREN expression RPAREN LCURLY ( casesGroup )* RCURLY
-                    {
-                    match(input,104,FOLLOW_104_in_statement1485); 
-                    match(input,LPAREN,FOLLOW_LPAREN_in_statement1487); 
-                    pushFollow(FOLLOW_expression_in_statement1489);
+                {
+                    match( this.input,
+                           104,
+                           FOLLOW_104_in_statement1485 );
+                    match( this.input,
+                           LPAREN,
+                           FOLLOW_LPAREN_in_statement1487 );
+                    pushFollow( FOLLOW_expression_in_statement1489 );
                     expression();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,RPAREN,FOLLOW_RPAREN_in_statement1491); 
-                    match(input,LCURLY,FOLLOW_LCURLY_in_statement1493); 
+                    match( this.input,
+                           RPAREN,
+                           FOLLOW_RPAREN_in_statement1491 );
+                    match( this.input,
+                           LCURLY,
+                           FOLLOW_LCURLY_in_statement1493 );
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:491:4: ( casesGroup )*
-                    loop40:
-                    do {
-                        int alt40=2;
-                        int LA40_0 = input.LA(1);
-                        if ( ((LA40_0>=106 && LA40_0<=107)) ) {
-                            alt40=1;
+                    loop40 : do {
+                        int alt40 = 2;
+                        final int LA40_0 = this.input.LA( 1 );
+                        if ( ((LA40_0 >= 106 && LA40_0 <= 107)) ) {
+                            alt40 = 1;
                         }
 
+                        switch ( alt40 ) {
+                            case 1 :
+                                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:491:6: casesGroup
+                            {
+                                pushFollow( FOLLOW_casesGroup_in_statement1500 );
+                                casesGroup();
+                                this._fsp--;
 
-                        switch (alt40) {
-                    	case 1 :
-                    	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:491:6: casesGroup
-                    	    {
-                    	    pushFollow(FOLLOW_casesGroup_in_statement1500);
-                    	    casesGroup();
-                    	    _fsp--;
+                            }
+                                break;
 
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop40;
+                            default :
+                                break loop40;
                         }
-                    } while (true);
+                    } while ( true );
 
-                    match(input,RCURLY,FOLLOW_RCURLY_in_statement1507); 
+                    match( this.input,
+                           RCURLY,
+                           FOLLOW_RCURLY_in_statement1507 );
 
-                    }
+                }
                     break;
                 case 14 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:495:4: tryBlock
-                    {
-                    pushFollow(FOLLOW_tryBlock_in_statement1515);
+                {
+                    pushFollow( FOLLOW_tryBlock_in_statement1515 );
                     tryBlock();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 15 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:498:4: 'throw' expression SEMI
-                    {
-                    match(input,105,FOLLOW_105_in_statement1523); 
-                    pushFollow(FOLLOW_expression_in_statement1525);
+                {
+                    match( this.input,
+                           105,
+                           FOLLOW_105_in_statement1523 );
+                    pushFollow( FOLLOW_expression_in_statement1525 );
                     expression();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,SEMI,FOLLOW_SEMI_in_statement1527); 
+                    match( this.input,
+                           SEMI,
+                           FOLLOW_SEMI_in_statement1527 );
 
-                    }
+                }
                     break;
                 case 16 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:501:4: 'synchronized' LPAREN expression RPAREN compoundStatement
-                    {
-                    match(input,86,FOLLOW_86_in_statement1535); 
-                    match(input,LPAREN,FOLLOW_LPAREN_in_statement1537); 
-                    pushFollow(FOLLOW_expression_in_statement1539);
+                {
+                    match( this.input,
+                           86,
+                           FOLLOW_86_in_statement1535 );
+                    match( this.input,
+                           LPAREN,
+                           FOLLOW_LPAREN_in_statement1537 );
+                    pushFollow( FOLLOW_expression_in_statement1539 );
                     expression();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,RPAREN,FOLLOW_RPAREN_in_statement1541); 
-                    pushFollow(FOLLOW_compoundStatement_in_statement1543);
+                    match( this.input,
+                           RPAREN,
+                           FOLLOW_RPAREN_in_statement1541 );
+                    pushFollow( FOLLOW_compoundStatement_in_statement1543 );
                     compoundStatement();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 17 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:507:4: SEMI
-                    {
-                    match(input,SEMI,FOLLOW_SEMI_in_statement1556); 
+                {
+                    match( this.input,
+                           SEMI,
+                           FOLLOW_SEMI_in_statement1556 );
 
-                    }
+                }
                     break;
 
             }
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end statement
 
-
     // $ANTLR start casesGroup
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:510:1: casesGroup : ( options {greedy=true; } : aCase )+ caseSList ;
-    public void casesGroup() throws RecognitionException {   
+    public void casesGroup() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:511:4: ( ( options {greedy=true; } : aCase )+ caseSList )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:511:4: ( options {greedy=true; } : aCase )+ caseSList
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:511:4: ( options {greedy=true; } : aCase )+
-            int cnt42=0;
-            loop42:
-            do {
-                int alt42=2;
-                int LA42_0 = input.LA(1);
-                if ( (LA42_0==106) ) {
-                    alt42=1;
-                }
-                else if ( (LA42_0==107) ) {
-                    alt42=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:511:4: ( options {greedy=true; } : aCase )+
+                int cnt42 = 0;
+                loop42 : do {
+                    int alt42 = 2;
+                    final int LA42_0 = this.input.LA( 1 );
+                    if ( (LA42_0 == 106) ) {
+                        alt42 = 1;
+                    } else if ( (LA42_0 == 107) ) {
+                        alt42 = 1;
+                    }
 
+                    switch ( alt42 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:517:4: aCase
+                        {
+                            pushFollow( FOLLOW_aCase_in_casesGroup1602 );
+                            aCase();
+                            this._fsp--;
 
-                switch (alt42) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:517:4: aCase
-            	    {
-            	    pushFollow(FOLLOW_aCase_in_casesGroup1602);
-            	    aCase();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            if ( cnt42 >= 1 ) {
+                                break loop42;
+                            }
+                            final EarlyExitException eee = new EarlyExitException( 42,
+                                                                             this.input );
+                            throw eee;
+                    }
+                    cnt42++;
+                } while ( true );
 
-            	    }
-            	    break;
+                pushFollow( FOLLOW_caseSList_in_casesGroup1611 );
+                caseSList();
+                this._fsp--;
 
-            	default :
-            	    if ( cnt42 >= 1 ) break loop42;
-                        EarlyExitException eee =
-                            new EarlyExitException(42, input);
-                        throw eee;
-                }
-                cnt42++;
-            } while (true);
-
-            pushFollow(FOLLOW_caseSList_in_casesGroup1611);
-            caseSList();
-            _fsp--;
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end casesGroup
 
-
     // $ANTLR start aCase
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:523:1: aCase : ( 'case' expression | 'default' ) COLON ;
-    public void aCase() throws RecognitionException {   
+    public void aCase() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:524:4: ( ( 'case' expression | 'default' ) COLON )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:524:4: ( 'case' expression | 'default' ) COLON
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:524:4: ( 'case' expression | 'default' )
-            int alt43=2;
-            int LA43_0 = input.LA(1);
-            if ( (LA43_0==106) ) {
-                alt43=1;
-            }
-            else if ( (LA43_0==107) ) {
-                alt43=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("524:4: ( 'case' expression | 'default' )", 43, 0, input);
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:524:4: ( 'case' expression | 'default' )
+                int alt43 = 2;
+                final int LA43_0 = this.input.LA( 1 );
+                if ( (LA43_0 == 106) ) {
+                    alt43 = 1;
+                } else if ( (LA43_0 == 107) ) {
+                    alt43 = 2;
+                } else {
+                    final NoViableAltException nvae = new NoViableAltException( "524:4: ( 'case' expression | 'default' )",
+                                                                          43,
+                                                                          0,
+                                                                          this.input );
 
-                throw nvae;
-            }
-            switch (alt43) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:524:5: 'case' expression
+                    throw nvae;
+                }
+                switch ( alt43 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:524:5: 'case' expression
                     {
-                    match(input,106,FOLLOW_106_in_aCase1626); 
-                    pushFollow(FOLLOW_expression_in_aCase1628);
-                    expression();
-                    _fsp--;
+                        match( this.input,
+                               106,
+                               FOLLOW_106_in_aCase1626 );
+                        pushFollow( FOLLOW_expression_in_aCase1628 );
+                        expression();
+                        this._fsp--;
 
-
                     }
-                    break;
-                case 2 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:524:25: 'default'
+                        break;
+                    case 2 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:524:25: 'default'
                     {
-                    match(input,107,FOLLOW_107_in_aCase1632); 
+                        match( this.input,
+                               107,
+                               FOLLOW_107_in_aCase1632 );
 
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-            match(input,COLON,FOLLOW_COLON_in_aCase1635); 
+                match( this.input,
+                       COLON,
+                       FOLLOW_COLON_in_aCase1635 );
 
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end aCase
 
-
     // $ANTLR start caseSList
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:527:1: caseSList : ( statement )* ;
-    public void caseSList() throws RecognitionException {   
+    public void caseSList() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:528:4: ( ( statement )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:528:4: ( statement )*
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:528:4: ( statement )*
-            loop44:
-            do {
-                int alt44=2;
-                int LA44_0 = input.LA(1);
-                if ( (LA44_0==IDENT||(LA44_0>=LCURLY && LA44_0<=SEMI)||LA44_0==LPAREN||(LA44_0>=PLUS && LA44_0<=MINUS)||(LA44_0>=INC && LA44_0<=NUM_FLOAT)||(LA44_0>=68 && LA44_0<=89)||(LA44_0>=93 && LA44_0<=94)||LA44_0==96||(LA44_0>=98 && LA44_0<=105)||LA44_0==108||(LA44_0>=112 && LA44_0<=115)) ) {
-                    alt44=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:528:4: ( statement )*
+                loop44 : do {
+                    int alt44 = 2;
+                    final int LA44_0 = this.input.LA( 1 );
+                    if ( (LA44_0 == IDENT || (LA44_0 >= LCURLY && LA44_0 <= SEMI) || LA44_0 == LPAREN || (LA44_0 >= PLUS && LA44_0 <= MINUS) || (LA44_0 >= INC && LA44_0 <= NUM_FLOAT) || (LA44_0 >= 68 && LA44_0 <= 89)
+                          || (LA44_0 >= 93 && LA44_0 <= 94) || LA44_0 == 96 || (LA44_0 >= 98 && LA44_0 <= 105) || LA44_0 == 108 || (LA44_0 >= 112 && LA44_0 <= 115)) ) {
+                        alt44 = 1;
+                    }
 
+                    switch ( alt44 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:528:5: statement
+                        {
+                            pushFollow( FOLLOW_statement_in_caseSList1647 );
+                            statement();
+                            this._fsp--;
 
-                switch (alt44) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:528:5: statement
-            	    {
-            	    pushFollow(FOLLOW_statement_in_caseSList1647);
-            	    statement();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop44;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop44;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end caseSList
 
-
     // $ANTLR start forInit
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:533:1: forInit : ( declaration | expressionList )? ;
-    public void forInit() throws RecognitionException {   
+    public void forInit() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:536:4: ( ( declaration | expressionList )? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:536:4: ( declaration | expressionList )?
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:536:4: ( declaration | expressionList )?
-            int alt45=3;
-            alt45 = dfa45.predict(input);
-            switch (alt45) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:536:6: declaration
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:536:4: ( declaration | expressionList )?
+                int alt45 = 3;
+                alt45 = this.dfa45.predict( this.input );
+                switch ( alt45 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:536:6: declaration
                     {
-                    pushFollow(FOLLOW_declaration_in_forInit1678);
-                    declaration();
-                    _fsp--;
+                        pushFollow( FOLLOW_declaration_in_forInit1678 );
+                        declaration();
+                        this._fsp--;
 
-
                     }
-                    break;
-                case 2 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:538:5: expressionList
+                        break;
+                    case 2 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:538:5: expressionList
                     {
-                    pushFollow(FOLLOW_expressionList_in_forInit1687);
-                    expressionList();
-                    _fsp--;
+                        pushFollow( FOLLOW_expressionList_in_forInit1687 );
+                        expressionList();
+                        this._fsp--;
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end forInit
 
-
     // $ANTLR start forCond
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:543:1: forCond : ( expression )? ;
-    public void forCond() throws RecognitionException {   
+    public void forCond() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:544:4: ( ( expression )? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:544:4: ( expression )?
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:544:4: ( expression )?
-            int alt46=2;
-            int LA46_0 = input.LA(1);
-            if ( (LA46_0==IDENT||LA46_0==LPAREN||(LA46_0>=PLUS && LA46_0<=MINUS)||(LA46_0>=INC && LA46_0<=NUM_FLOAT)||(LA46_0>=68 && LA46_0<=76)||(LA46_0>=93 && LA46_0<=94)||(LA46_0>=112 && LA46_0<=115)) ) {
-                alt46=1;
-            }
-            switch (alt46) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:544:5: expression
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:544:4: ( expression )?
+                int alt46 = 2;
+                final int LA46_0 = this.input.LA( 1 );
+                if ( (LA46_0 == IDENT || LA46_0 == LPAREN || (LA46_0 >= PLUS && LA46_0 <= MINUS) || (LA46_0 >= INC && LA46_0 <= NUM_FLOAT) || (LA46_0 >= 68 && LA46_0 <= 76) || (LA46_0 >= 93 && LA46_0 <= 94) || (LA46_0 >= 112 && LA46_0 <= 115)) ) {
+                    alt46 = 1;
+                }
+                switch ( alt46 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:544:5: expression
                     {
-                    pushFollow(FOLLOW_expression_in_forCond1707);
-                    expression();
-                    _fsp--;
+                        pushFollow( FOLLOW_expression_in_forCond1707 );
+                        expression();
+                        this._fsp--;
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end forCond
 
-
     // $ANTLR start forIter
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:548:1: forIter : ( expressionList )? ;
-    public void forIter() throws RecognitionException {   
+    public void forIter() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:549:4: ( ( expressionList )? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:549:4: ( expressionList )?
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:549:4: ( expressionList )?
-            int alt47=2;
-            int LA47_0 = input.LA(1);
-            if ( (LA47_0==IDENT||LA47_0==LPAREN||(LA47_0>=PLUS && LA47_0<=MINUS)||(LA47_0>=INC && LA47_0<=NUM_FLOAT)||(LA47_0>=68 && LA47_0<=76)||(LA47_0>=93 && LA47_0<=94)||(LA47_0>=112 && LA47_0<=115)) ) {
-                alt47=1;
-            }
-            switch (alt47) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:549:5: expressionList
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:549:4: ( expressionList )?
+                int alt47 = 2;
+                final int LA47_0 = this.input.LA( 1 );
+                if ( (LA47_0 == IDENT || LA47_0 == LPAREN || (LA47_0 >= PLUS && LA47_0 <= MINUS) || (LA47_0 >= INC && LA47_0 <= NUM_FLOAT) || (LA47_0 >= 68 && LA47_0 <= 76) || (LA47_0 >= 93 && LA47_0 <= 94) || (LA47_0 >= 112 && LA47_0 <= 115)) ) {
+                    alt47 = 1;
+                }
+                switch ( alt47 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:549:5: expressionList
                     {
-                    pushFollow(FOLLOW_expressionList_in_forIter1724);
-                    expressionList();
-                    _fsp--;
+                        pushFollow( FOLLOW_expressionList_in_forIter1724 );
+                        expressionList();
+                        this._fsp--;
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end forIter
 
-
     // $ANTLR start tryBlock
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:554:1: tryBlock : 'try' compoundStatement ( handler )* ( finallyClause )? ;
-    public void tryBlock() throws RecognitionException {   
+    public void tryBlock() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:555:4: ( 'try' compoundStatement ( handler )* ( finallyClause )? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:555:4: 'try' compoundStatement ( handler )* ( finallyClause )?
             {
-            match(input,108,FOLLOW_108_in_tryBlock1741); 
-            pushFollow(FOLLOW_compoundStatement_in_tryBlock1743);
-            compoundStatement();
-            _fsp--;
+                match( this.input,
+                       108,
+                       FOLLOW_108_in_tryBlock1741 );
+                pushFollow( FOLLOW_compoundStatement_in_tryBlock1743 );
+                compoundStatement();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:556:3: ( handler )*
-            loop48:
-            do {
-                int alt48=2;
-                int LA48_0 = input.LA(1);
-                if ( (LA48_0==110) ) {
-                    alt48=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:556:3: ( handler )*
+                loop48 : do {
+                    int alt48 = 2;
+                    final int LA48_0 = this.input.LA( 1 );
+                    if ( (LA48_0 == 110) ) {
+                        alt48 = 1;
+                    }
 
+                    switch ( alt48 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:556:4: handler
+                        {
+                            pushFollow( FOLLOW_handler_in_tryBlock1748 );
+                            handler();
+                            this._fsp--;
 
-                switch (alt48) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:556:4: handler
-            	    {
-            	    pushFollow(FOLLOW_handler_in_tryBlock1748);
-            	    handler();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop48;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop48;
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:557:3: ( finallyClause )?
+                int alt49 = 2;
+                final int LA49_0 = this.input.LA( 1 );
+                if ( (LA49_0 == 109) ) {
+                    alt49 = 1;
                 }
-            } while (true);
-
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:557:3: ( finallyClause )?
-            int alt49=2;
-            int LA49_0 = input.LA(1);
-            if ( (LA49_0==109) ) {
-                alt49=1;
-            }
-            switch (alt49) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:557:5: finallyClause
+                switch ( alt49 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:557:5: finallyClause
                     {
-                    pushFollow(FOLLOW_finallyClause_in_tryBlock1756);
-                    finallyClause();
-                    _fsp--;
+                        pushFollow( FOLLOW_finallyClause_in_tryBlock1756 );
+                        finallyClause();
+                        this._fsp--;
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end tryBlock
 
-
     // $ANTLR start finallyClause
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:560:1: finallyClause : 'finally' compoundStatement ;
-    public void finallyClause() throws RecognitionException {   
+    public void finallyClause() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:561:4: ( 'finally' compoundStatement )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:561:4: 'finally' compoundStatement
             {
-            match(input,109,FOLLOW_109_in_finallyClause1770); 
-            pushFollow(FOLLOW_compoundStatement_in_finallyClause1772);
-            compoundStatement();
-            _fsp--;
+                match( this.input,
+                       109,
+                       FOLLOW_109_in_finallyClause1770 );
+                pushFollow( FOLLOW_compoundStatement_in_finallyClause1772 );
+                compoundStatement();
+                this._fsp--;
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end finallyClause
 
-
     // $ANTLR start handler
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:565:1: handler : 'catch' LPAREN parameterDeclaration RPAREN compoundStatement ;
-    public void handler() throws RecognitionException {   
+    public void handler() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:566:4: ( 'catch' LPAREN parameterDeclaration RPAREN compoundStatement )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:566:4: 'catch' LPAREN parameterDeclaration RPAREN compoundStatement
             {
-            match(input,110,FOLLOW_110_in_handler1784); 
-            match(input,LPAREN,FOLLOW_LPAREN_in_handler1786); 
-            pushFollow(FOLLOW_parameterDeclaration_in_handler1788);
-            parameterDeclaration();
-            _fsp--;
+                match( this.input,
+                       110,
+                       FOLLOW_110_in_handler1784 );
+                match( this.input,
+                       LPAREN,
+                       FOLLOW_LPAREN_in_handler1786 );
+                pushFollow( FOLLOW_parameterDeclaration_in_handler1788 );
+                parameterDeclaration();
+                this._fsp--;
 
-            match(input,RPAREN,FOLLOW_RPAREN_in_handler1790); 
-            pushFollow(FOLLOW_compoundStatement_in_handler1792);
-            compoundStatement();
-            _fsp--;
+                match( this.input,
+                       RPAREN,
+                       FOLLOW_RPAREN_in_handler1790 );
+                pushFollow( FOLLOW_compoundStatement_in_handler1792 );
+                compoundStatement();
+                this._fsp--;
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end handler
 
-
     // $ANTLR start expression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:605:1: expression : assignmentExpression ;
-    public void expression() throws RecognitionException {   
+    public void expression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:606:4: ( assignmentExpression )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:606:4: assignmentExpression
             {
-            pushFollow(FOLLOW_assignmentExpression_in_expression1839);
-            assignmentExpression();
-            _fsp--;
+                pushFollow( FOLLOW_assignmentExpression_in_expression1839 );
+                assignmentExpression();
+                this._fsp--;
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end expression
 
-
     // $ANTLR start expressionList
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:612:1: expressionList : expression ( COMMA expression )* ;
-    public void expressionList() throws RecognitionException {   
+    public void expressionList() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:613:4: ( expression ( COMMA expression )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:613:4: expression ( COMMA expression )*
             {
-            pushFollow(FOLLOW_expression_in_expressionList1855);
-            expression();
-            _fsp--;
+                pushFollow( FOLLOW_expression_in_expressionList1855 );
+                expression();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:613:15: ( COMMA expression )*
-            loop50:
-            do {
-                int alt50=2;
-                int LA50_0 = input.LA(1);
-                if ( (LA50_0==COMMA) ) {
-                    alt50=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:613:15: ( COMMA expression )*
+                loop50 : do {
+                    int alt50 = 2;
+                    final int LA50_0 = this.input.LA( 1 );
+                    if ( (LA50_0 == COMMA) ) {
+                        alt50 = 1;
+                    }
 
+                    switch ( alt50 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:613:16: COMMA expression
+                        {
+                            match( this.input,
+                                   COMMA,
+                                   FOLLOW_COMMA_in_expressionList1858 );
+                            pushFollow( FOLLOW_expression_in_expressionList1860 );
+                            expression();
+                            this._fsp--;
 
-                switch (alt50) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:613:16: COMMA expression
-            	    {
-            	    match(input,COMMA,FOLLOW_COMMA_in_expressionList1858); 
-            	    pushFollow(FOLLOW_expression_in_expressionList1860);
-            	    expression();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop50;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop50;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end expressionList
 
-
     // $ANTLR start assignmentExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:619:1: assignmentExpression : conditionalExpression ( (ASSIGN|PLUS_ASSIGN|MINUS_ASSIGN|STAR_ASSIGN|DIV_ASSIGN|MOD_ASSIGN|SR_ASSIGN|BSR_ASSIGN|SL_ASSIGN|BAND_ASSIGN|BXOR_ASSIGN|BOR_ASSIGN) assignmentExpression )? ;
-    public void assignmentExpression() throws RecognitionException {   
+    public void assignmentExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:620:4: ( conditionalExpression ( (ASSIGN|PLUS_ASSIGN|MINUS_ASSIGN|STAR_ASSIGN|DIV_ASSIGN|MOD_ASSIGN|SR_ASSIGN|BSR_ASSIGN|SL_ASSIGN|BAND_ASSIGN|BXOR_ASSIGN|BOR_ASSIGN) assignmentExpression )? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:620:4: conditionalExpression ( (ASSIGN|PLUS_ASSIGN|MINUS_ASSIGN|STAR_ASSIGN|DIV_ASSIGN|MOD_ASSIGN|SR_ASSIGN|BSR_ASSIGN|SL_ASSIGN|BAND_ASSIGN|BXOR_ASSIGN|BOR_ASSIGN) assignmentExpression )?
             {
-            pushFollow(FOLLOW_conditionalExpression_in_assignmentExpression1878);
-            conditionalExpression();
-            _fsp--;
+                pushFollow( FOLLOW_conditionalExpression_in_assignmentExpression1878 );
+                conditionalExpression();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:621:3: ( (ASSIGN|PLUS_ASSIGN|MINUS_ASSIGN|STAR_ASSIGN|DIV_ASSIGN|MOD_ASSIGN|SR_ASSIGN|BSR_ASSIGN|SL_ASSIGN|BAND_ASSIGN|BXOR_ASSIGN|BOR_ASSIGN) assignmentExpression )?
-            int alt51=2;
-            int LA51_0 = input.LA(1);
-            if ( (LA51_0==ASSIGN||(LA51_0>=PLUS_ASSIGN && LA51_0<=BOR_ASSIGN)) ) {
-                alt51=1;
-            }
-            switch (alt51) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:621:5: (ASSIGN|PLUS_ASSIGN|MINUS_ASSIGN|STAR_ASSIGN|DIV_ASSIGN|MOD_ASSIGN|SR_ASSIGN|BSR_ASSIGN|SL_ASSIGN|BAND_ASSIGN|BXOR_ASSIGN|BOR_ASSIGN) assignmentExpression
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:621:3: ( (ASSIGN|PLUS_ASSIGN|MINUS_ASSIGN|STAR_ASSIGN|DIV_ASSIGN|MOD_ASSIGN|SR_ASSIGN|BSR_ASSIGN|SL_ASSIGN|BAND_ASSIGN|BXOR_ASSIGN|BOR_ASSIGN) assignmentExpression )?
+                int alt51 = 2;
+                final int LA51_0 = this.input.LA( 1 );
+                if ( (LA51_0 == ASSIGN || (LA51_0 >= PLUS_ASSIGN && LA51_0 <= BOR_ASSIGN)) ) {
+                    alt51 = 1;
+                }
+                switch ( alt51 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:621:5: (ASSIGN|PLUS_ASSIGN|MINUS_ASSIGN|STAR_ASSIGN|DIV_ASSIGN|MOD_ASSIGN|SR_ASSIGN|BSR_ASSIGN|SL_ASSIGN|BAND_ASSIGN|BXOR_ASSIGN|BOR_ASSIGN) assignmentExpression
                     {
-                    if ( input.LA(1)==ASSIGN||(input.LA(1)>=PLUS_ASSIGN && input.LA(1)<=BOR_ASSIGN) ) {
-                        input.consume();
-                        errorRecovery=false;
-                    }
-                    else {
-                        MismatchedSetException mse =
-                            new MismatchedSetException(null,input);
-                        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_assignmentExpression1886);    throw mse;
-                    }
+                        if ( this.input.LA( 1 ) == ASSIGN || (this.input.LA( 1 ) >= PLUS_ASSIGN && this.input.LA( 1 ) <= BOR_ASSIGN) ) {
+                            this.input.consume();
+                            this.errorRecovery = false;
+                        } else {
+                            final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                     this.input );
+                            recoverFromMismatchedSet( this.input,
+                                                      mse,
+                                                      FOLLOW_set_in_assignmentExpression1886 );
+                            throw mse;
+                        }
 
-                    pushFollow(FOLLOW_assignmentExpression_in_assignmentExpression2103);
-                    assignmentExpression();
-                    _fsp--;
+                        pushFollow( FOLLOW_assignmentExpression_in_assignmentExpression2103 );
+                        assignmentExpression();
+                        this._fsp--;
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end assignmentExpression
 
-
     // $ANTLR start conditionalExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:640:1: conditionalExpression : logicalOrExpression ( QUESTION assignmentExpression COLON conditionalExpression )? ;
-    public void conditionalExpression() throws RecognitionException {   
+    public void conditionalExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:641:4: ( logicalOrExpression ( QUESTION assignmentExpression COLON conditionalExpression )? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:641:4: logicalOrExpression ( QUESTION assignmentExpression COLON conditionalExpression )?
             {
-            pushFollow(FOLLOW_logicalOrExpression_in_conditionalExpression2121);
-            logicalOrExpression();
-            _fsp--;
+                pushFollow( FOLLOW_logicalOrExpression_in_conditionalExpression2121 );
+                logicalOrExpression();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:642:3: ( QUESTION assignmentExpression COLON conditionalExpression )?
-            int alt52=2;
-            int LA52_0 = input.LA(1);
-            if ( (LA52_0==QUESTION) ) {
-                alt52=1;
-            }
-            switch (alt52) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:642:5: QUESTION assignmentExpression COLON conditionalExpression
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:642:3: ( QUESTION assignmentExpression COLON conditionalExpression )?
+                int alt52 = 2;
+                final int LA52_0 = this.input.LA( 1 );
+                if ( (LA52_0 == QUESTION) ) {
+                    alt52 = 1;
+                }
+                switch ( alt52 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:642:5: QUESTION assignmentExpression COLON conditionalExpression
                     {
-                    match(input,QUESTION,FOLLOW_QUESTION_in_conditionalExpression2127); 
-                    pushFollow(FOLLOW_assignmentExpression_in_conditionalExpression2129);
-                    assignmentExpression();
-                    _fsp--;
+                        match( this.input,
+                               QUESTION,
+                               FOLLOW_QUESTION_in_conditionalExpression2127 );
+                        pushFollow( FOLLOW_assignmentExpression_in_conditionalExpression2129 );
+                        assignmentExpression();
+                        this._fsp--;
 
-                    match(input,COLON,FOLLOW_COLON_in_conditionalExpression2131); 
-                    pushFollow(FOLLOW_conditionalExpression_in_conditionalExpression2133);
-                    conditionalExpression();
-                    _fsp--;
+                        match( this.input,
+                               COLON,
+                               FOLLOW_COLON_in_conditionalExpression2131 );
+                        pushFollow( FOLLOW_conditionalExpression_in_conditionalExpression2133 );
+                        conditionalExpression();
+                        this._fsp--;
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end conditionalExpression
 
-
     // $ANTLR start logicalOrExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:647:1: logicalOrExpression : logicalAndExpression ( LOR logicalAndExpression )* ;
-    public void logicalOrExpression() throws RecognitionException {   
+    public void logicalOrExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:648:4: ( logicalAndExpression ( LOR logicalAndExpression )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:648:4: logicalAndExpression ( LOR logicalAndExpression )*
             {
-            pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression2149);
-            logicalAndExpression();
-            _fsp--;
+                pushFollow( FOLLOW_logicalAndExpression_in_logicalOrExpression2149 );
+                logicalAndExpression();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:648:25: ( LOR logicalAndExpression )*
-            loop53:
-            do {
-                int alt53=2;
-                int LA53_0 = input.LA(1);
-                if ( (LA53_0==LOR) ) {
-                    alt53=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:648:25: ( LOR logicalAndExpression )*
+                loop53 : do {
+                    int alt53 = 2;
+                    final int LA53_0 = this.input.LA( 1 );
+                    if ( (LA53_0 == LOR) ) {
+                        alt53 = 1;
+                    }
 
+                    switch ( alt53 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:648:26: LOR logicalAndExpression
+                        {
+                            match( this.input,
+                                   LOR,
+                                   FOLLOW_LOR_in_logicalOrExpression2152 );
+                            pushFollow( FOLLOW_logicalAndExpression_in_logicalOrExpression2154 );
+                            logicalAndExpression();
+                            this._fsp--;
 
-                switch (alt53) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:648:26: LOR logicalAndExpression
-            	    {
-            	    match(input,LOR,FOLLOW_LOR_in_logicalOrExpression2152); 
-            	    pushFollow(FOLLOW_logicalAndExpression_in_logicalOrExpression2154);
-            	    logicalAndExpression();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop53;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop53;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end logicalOrExpression
 
-
     // $ANTLR start logicalAndExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:653:1: logicalAndExpression : inclusiveOrExpression ( LAND inclusiveOrExpression )* ;
-    public void logicalAndExpression() throws RecognitionException {   
+    public void logicalAndExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:654:4: ( inclusiveOrExpression ( LAND inclusiveOrExpression )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:654:4: inclusiveOrExpression ( LAND inclusiveOrExpression )*
             {
-            pushFollow(FOLLOW_inclusiveOrExpression_in_logicalAndExpression2169);
-            inclusiveOrExpression();
-            _fsp--;
+                pushFollow( FOLLOW_inclusiveOrExpression_in_logicalAndExpression2169 );
+                inclusiveOrExpression();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:654:26: ( LAND inclusiveOrExpression )*
-            loop54:
-            do {
-                int alt54=2;
-                int LA54_0 = input.LA(1);
-                if ( (LA54_0==LAND) ) {
-                    alt54=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:654:26: ( LAND inclusiveOrExpression )*
+                loop54 : do {
+                    int alt54 = 2;
+                    final int LA54_0 = this.input.LA( 1 );
+                    if ( (LA54_0 == LAND) ) {
+                        alt54 = 1;
+                    }
 
+                    switch ( alt54 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:654:27: LAND inclusiveOrExpression
+                        {
+                            match( this.input,
+                                   LAND,
+                                   FOLLOW_LAND_in_logicalAndExpression2172 );
+                            pushFollow( FOLLOW_inclusiveOrExpression_in_logicalAndExpression2174 );
+                            inclusiveOrExpression();
+                            this._fsp--;
 
-                switch (alt54) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:654:27: LAND inclusiveOrExpression
-            	    {
-            	    match(input,LAND,FOLLOW_LAND_in_logicalAndExpression2172); 
-            	    pushFollow(FOLLOW_inclusiveOrExpression_in_logicalAndExpression2174);
-            	    inclusiveOrExpression();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop54;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop54;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end logicalAndExpression
 
-
     // $ANTLR start inclusiveOrExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:659:1: inclusiveOrExpression : exclusiveOrExpression ( BOR exclusiveOrExpression )* ;
-    public void inclusiveOrExpression() throws RecognitionException {   
+    public void inclusiveOrExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:660:4: ( exclusiveOrExpression ( BOR exclusiveOrExpression )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:660:4: exclusiveOrExpression ( BOR exclusiveOrExpression )*
             {
-            pushFollow(FOLLOW_exclusiveOrExpression_in_inclusiveOrExpression2189);
-            exclusiveOrExpression();
-            _fsp--;
+                pushFollow( FOLLOW_exclusiveOrExpression_in_inclusiveOrExpression2189 );
+                exclusiveOrExpression();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:660:26: ( BOR exclusiveOrExpression )*
-            loop55:
-            do {
-                int alt55=2;
-                int LA55_0 = input.LA(1);
-                if ( (LA55_0==BOR) ) {
-                    alt55=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:660:26: ( BOR exclusiveOrExpression )*
+                loop55 : do {
+                    int alt55 = 2;
+                    final int LA55_0 = this.input.LA( 1 );
+                    if ( (LA55_0 == BOR) ) {
+                        alt55 = 1;
+                    }
 
+                    switch ( alt55 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:660:27: BOR exclusiveOrExpression
+                        {
+                            match( this.input,
+                                   BOR,
+                                   FOLLOW_BOR_in_inclusiveOrExpression2192 );
+                            pushFollow( FOLLOW_exclusiveOrExpression_in_inclusiveOrExpression2194 );
+                            exclusiveOrExpression();
+                            this._fsp--;
 
-                switch (alt55) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:660:27: BOR exclusiveOrExpression
-            	    {
-            	    match(input,BOR,FOLLOW_BOR_in_inclusiveOrExpression2192); 
-            	    pushFollow(FOLLOW_exclusiveOrExpression_in_inclusiveOrExpression2194);
-            	    exclusiveOrExpression();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop55;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop55;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end inclusiveOrExpression
 
-
     // $ANTLR start exclusiveOrExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:665:1: exclusiveOrExpression : andExpression ( BXOR andExpression )* ;
-    public void exclusiveOrExpression() throws RecognitionException {   
+    public void exclusiveOrExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:666:4: ( andExpression ( BXOR andExpression )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:666:4: andExpression ( BXOR andExpression )*
             {
-            pushFollow(FOLLOW_andExpression_in_exclusiveOrExpression2209);
-            andExpression();
-            _fsp--;
+                pushFollow( FOLLOW_andExpression_in_exclusiveOrExpression2209 );
+                andExpression();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:666:18: ( BXOR andExpression )*
-            loop56:
-            do {
-                int alt56=2;
-                int LA56_0 = input.LA(1);
-                if ( (LA56_0==BXOR) ) {
-                    alt56=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:666:18: ( BXOR andExpression )*
+                loop56 : do {
+                    int alt56 = 2;
+                    final int LA56_0 = this.input.LA( 1 );
+                    if ( (LA56_0 == BXOR) ) {
+                        alt56 = 1;
+                    }
 
+                    switch ( alt56 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:666:19: BXOR andExpression
+                        {
+                            match( this.input,
+                                   BXOR,
+                                   FOLLOW_BXOR_in_exclusiveOrExpression2212 );
+                            pushFollow( FOLLOW_andExpression_in_exclusiveOrExpression2214 );
+                            andExpression();
+                            this._fsp--;
 
-                switch (alt56) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:666:19: BXOR andExpression
-            	    {
-            	    match(input,BXOR,FOLLOW_BXOR_in_exclusiveOrExpression2212); 
-            	    pushFollow(FOLLOW_andExpression_in_exclusiveOrExpression2214);
-            	    andExpression();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop56;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop56;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end exclusiveOrExpression
 
-
     // $ANTLR start andExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:671:1: andExpression : equalityExpression ( BAND equalityExpression )* ;
-    public void andExpression() throws RecognitionException {   
+    public void andExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:672:4: ( equalityExpression ( BAND equalityExpression )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:672:4: equalityExpression ( BAND equalityExpression )*
             {
-            pushFollow(FOLLOW_equalityExpression_in_andExpression2229);
-            equalityExpression();
-            _fsp--;
+                pushFollow( FOLLOW_equalityExpression_in_andExpression2229 );
+                equalityExpression();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:672:23: ( BAND equalityExpression )*
-            loop57:
-            do {
-                int alt57=2;
-                int LA57_0 = input.LA(1);
-                if ( (LA57_0==BAND) ) {
-                    alt57=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:672:23: ( BAND equalityExpression )*
+                loop57 : do {
+                    int alt57 = 2;
+                    final int LA57_0 = this.input.LA( 1 );
+                    if ( (LA57_0 == BAND) ) {
+                        alt57 = 1;
+                    }
 
+                    switch ( alt57 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:672:24: BAND equalityExpression
+                        {
+                            match( this.input,
+                                   BAND,
+                                   FOLLOW_BAND_in_andExpression2232 );
+                            pushFollow( FOLLOW_equalityExpression_in_andExpression2234 );
+                            equalityExpression();
+                            this._fsp--;
 
-                switch (alt57) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:672:24: BAND equalityExpression
-            	    {
-            	    match(input,BAND,FOLLOW_BAND_in_andExpression2232); 
-            	    pushFollow(FOLLOW_equalityExpression_in_andExpression2234);
-            	    equalityExpression();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop57;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop57;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end andExpression
 
-
     // $ANTLR start equalityExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:677:1: equalityExpression : relationalExpression ( (NOT_EQUAL|EQUAL) relationalExpression )* ;
-    public void equalityExpression() throws RecognitionException {   
+    public void equalityExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:678:4: ( relationalExpression ( (NOT_EQUAL|EQUAL) relationalExpression )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:678:4: relationalExpression ( (NOT_EQUAL|EQUAL) relationalExpression )*
             {
-            pushFollow(FOLLOW_relationalExpression_in_equalityExpression2249);
-            relationalExpression();
-            _fsp--;
+                pushFollow( FOLLOW_relationalExpression_in_equalityExpression2249 );
+                relationalExpression();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:678:25: ( (NOT_EQUAL|EQUAL) relationalExpression )*
-            loop58:
-            do {
-                int alt58=2;
-                int LA58_0 = input.LA(1);
-                if ( ((LA58_0>=NOT_EQUAL && LA58_0<=EQUAL)) ) {
-                    alt58=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:678:25: ( (NOT_EQUAL|EQUAL) relationalExpression )*
+                loop58 : do {
+                    int alt58 = 2;
+                    final int LA58_0 = this.input.LA( 1 );
+                    if ( ((LA58_0 >= NOT_EQUAL && LA58_0 <= EQUAL)) ) {
+                        alt58 = 1;
+                    }
 
+                    switch ( alt58 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:678:26: (NOT_EQUAL|EQUAL) relationalExpression
+                        {
+                            if ( (this.input.LA( 1 ) >= NOT_EQUAL && this.input.LA( 1 ) <= EQUAL) ) {
+                                this.input.consume();
+                                this.errorRecovery = false;
+                            } else {
+                                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                         this.input );
+                                recoverFromMismatchedSet( this.input,
+                                                          mse,
+                                                          FOLLOW_set_in_equalityExpression2253 );
+                                throw mse;
+                            }
 
-                switch (alt58) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:678:26: (NOT_EQUAL|EQUAL) relationalExpression
-            	    {
-            	    if ( (input.LA(1)>=NOT_EQUAL && input.LA(1)<=EQUAL) ) {
-            	        input.consume();
-            	        errorRecovery=false;
-            	    }
-            	    else {
-            	        MismatchedSetException mse =
-            	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_equalityExpression2253);    throw mse;
-            	    }
+                            pushFollow( FOLLOW_relationalExpression_in_equalityExpression2260 );
+                            relationalExpression();
+                            this._fsp--;
 
-            	    pushFollow(FOLLOW_relationalExpression_in_equalityExpression2260);
-            	    relationalExpression();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop58;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop58;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end equalityExpression
 
-
     // $ANTLR start relationalExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:683:1: relationalExpression : shiftExpression ( ( (LT|GT|LE|GE) shiftExpression )* | 'instanceof' typeSpec ) ;
-    public void relationalExpression() throws RecognitionException {   
+    public void relationalExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:684:4: ( shiftExpression ( ( (LT|GT|LE|GE) shiftExpression )* | 'instanceof' typeSpec ) )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:684:4: shiftExpression ( ( (LT|GT|LE|GE) shiftExpression )* | 'instanceof' typeSpec )
             {
-            pushFollow(FOLLOW_shiftExpression_in_relationalExpression2275);
-            shiftExpression();
-            _fsp--;
+                pushFollow( FOLLOW_shiftExpression_in_relationalExpression2275 );
+                shiftExpression();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:685:3: ( ( (LT|GT|LE|GE) shiftExpression )* | 'instanceof' typeSpec )
-            int alt60=2;
-            int LA60_0 = input.LA(1);
-            if ( (LA60_0==RBRACK||(LA60_0>=SEMI && LA60_0<=COMMA)||(LA60_0>=RPAREN && LA60_0<=GE)) ) {
-                alt60=1;
-            }
-            else if ( (LA60_0==111) ) {
-                alt60=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("685:3: ( ( (LT|GT|LE|GE) shiftExpression )* | 'instanceof' typeSpec )", 60, 0, input);
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:685:3: ( ( (LT|GT|LE|GE) shiftExpression )* | 'instanceof' typeSpec )
+                int alt60 = 2;
+                final int LA60_0 = this.input.LA( 1 );
+                if ( (LA60_0 == RBRACK || (LA60_0 >= SEMI && LA60_0 <= COMMA) || (LA60_0 >= RPAREN && LA60_0 <= GE)) ) {
+                    alt60 = 1;
+                } else if ( (LA60_0 == 111) ) {
+                    alt60 = 2;
+                } else {
+                    final NoViableAltException nvae = new NoViableAltException( "685:3: ( ( (LT|GT|LE|GE) shiftExpression )* | 'instanceof' typeSpec )",
+                                                                          60,
+                                                                          0,
+                                                                          this.input );
 
-                throw nvae;
-            }
-            switch (alt60) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:685:5: ( (LT|GT|LE|GE) shiftExpression )*
+                    throw nvae;
+                }
+                switch ( alt60 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:685:5: ( (LT|GT|LE|GE) shiftExpression )*
                     {
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:685:5: ( (LT|GT|LE|GE) shiftExpression )*
-                    loop59:
-                    do {
-                        int alt59=2;
-                        int LA59_0 = input.LA(1);
-                        if ( ((LA59_0>=LT && LA59_0<=GE)) ) {
-                            alt59=1;
-                        }
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:685:5: ( (LT|GT|LE|GE) shiftExpression )*
+                        loop59 : do {
+                            int alt59 = 2;
+                            final int LA59_0 = this.input.LA( 1 );
+                            if ( ((LA59_0 >= LT && LA59_0 <= GE)) ) {
+                                alt59 = 1;
+                            }
 
+                            switch ( alt59 ) {
+                                case 1 :
+                                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:685:7: (LT|GT|LE|GE) shiftExpression
+                                {
+                                    if ( (this.input.LA( 1 ) >= LT && this.input.LA( 1 ) <= GE) ) {
+                                        this.input.consume();
+                                        this.errorRecovery = false;
+                                    } else {
+                                        final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                                 this.input );
+                                        recoverFromMismatchedSet( this.input,
+                                                                  mse,
+                                                                  FOLLOW_set_in_relationalExpression2285 );
+                                        throw mse;
+                                    }
 
-                        switch (alt59) {
-                    	case 1 :
-                    	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:685:7: (LT|GT|LE|GE) shiftExpression
-                    	    {
-                    	    if ( (input.LA(1)>=LT && input.LA(1)<=GE) ) {
-                    	        input.consume();
-                    	        errorRecovery=false;
-                    	    }
-                    	    else {
-                    	        MismatchedSetException mse =
-                    	            new MismatchedSetException(null,input);
-                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_relationalExpression2285);    throw mse;
-                    	    }
+                                    pushFollow( FOLLOW_shiftExpression_in_relationalExpression2321 );
+                                    shiftExpression();
+                                    this._fsp--;
 
-                    	    pushFollow(FOLLOW_shiftExpression_in_relationalExpression2321);
-                    	    shiftExpression();
-                    	    _fsp--;
+                                }
+                                    break;
 
+                                default :
+                                    break loop59;
+                            }
+                        } while ( true );
 
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop59;
-                        }
-                    } while (true);
-
-
                     }
-                    break;
-                case 2 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:692:5: 'instanceof' typeSpec
+                        break;
+                    case 2 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:692:5: 'instanceof' typeSpec
                     {
-                    match(input,111,FOLLOW_111_in_relationalExpression2333); 
-                    pushFollow(FOLLOW_typeSpec_in_relationalExpression2335);
-                    typeSpec();
-                    _fsp--;
+                        match( this.input,
+                               111,
+                               FOLLOW_111_in_relationalExpression2333 );
+                        pushFollow( FOLLOW_typeSpec_in_relationalExpression2335 );
+                        typeSpec();
+                        this._fsp--;
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end relationalExpression
 
-
     // $ANTLR start shiftExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:698:1: shiftExpression : additiveExpression ( (SL|SR|BSR) additiveExpression )* ;
-    public void shiftExpression() throws RecognitionException {   
+    public void shiftExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:699:4: ( additiveExpression ( (SL|SR|BSR) additiveExpression )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:699:4: additiveExpression ( (SL|SR|BSR) additiveExpression )*
             {
-            pushFollow(FOLLOW_additiveExpression_in_shiftExpression2352);
-            additiveExpression();
-            _fsp--;
+                pushFollow( FOLLOW_additiveExpression_in_shiftExpression2352 );
+                additiveExpression();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:699:23: ( (SL|SR|BSR) additiveExpression )*
-            loop61:
-            do {
-                int alt61=2;
-                int LA61_0 = input.LA(1);
-                if ( ((LA61_0>=SL && LA61_0<=BSR)) ) {
-                    alt61=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:699:23: ( (SL|SR|BSR) additiveExpression )*
+                loop61 : do {
+                    int alt61 = 2;
+                    final int LA61_0 = this.input.LA( 1 );
+                    if ( ((LA61_0 >= SL && LA61_0 <= BSR)) ) {
+                        alt61 = 1;
+                    }
 
+                    switch ( alt61 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:699:24: (SL|SR|BSR) additiveExpression
+                        {
+                            if ( (this.input.LA( 1 ) >= SL && this.input.LA( 1 ) <= BSR) ) {
+                                this.input.consume();
+                                this.errorRecovery = false;
+                            } else {
+                                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                         this.input );
+                                recoverFromMismatchedSet( this.input,
+                                                          mse,
+                                                          FOLLOW_set_in_shiftExpression2356 );
+                                throw mse;
+                            }
 
-                switch (alt61) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:699:24: (SL|SR|BSR) additiveExpression
-            	    {
-            	    if ( (input.LA(1)>=SL && input.LA(1)<=BSR) ) {
-            	        input.consume();
-            	        errorRecovery=false;
-            	    }
-            	    else {
-            	        MismatchedSetException mse =
-            	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_shiftExpression2356);    throw mse;
-            	    }
+                            pushFollow( FOLLOW_additiveExpression_in_shiftExpression2367 );
+                            additiveExpression();
+                            this._fsp--;
 
-            	    pushFollow(FOLLOW_additiveExpression_in_shiftExpression2367);
-            	    additiveExpression();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop61;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop61;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end shiftExpression
 
-
     // $ANTLR start additiveExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:704:1: additiveExpression : multiplicativeExpression ( (PLUS|MINUS) multiplicativeExpression )* ;
-    public void additiveExpression() throws RecognitionException {   
+    public void additiveExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:705:4: ( multiplicativeExpression ( (PLUS|MINUS) multiplicativeExpression )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:705:4: multiplicativeExpression ( (PLUS|MINUS) multiplicativeExpression )*
             {
-            pushFollow(FOLLOW_multiplicativeExpression_in_additiveExpression2382);
-            multiplicativeExpression();
-            _fsp--;
+                pushFollow( FOLLOW_multiplicativeExpression_in_additiveExpression2382 );
+                multiplicativeExpression();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:705:29: ( (PLUS|MINUS) multiplicativeExpression )*
-            loop62:
-            do {
-                int alt62=2;
-                int LA62_0 = input.LA(1);
-                if ( ((LA62_0>=PLUS && LA62_0<=MINUS)) ) {
-                    alt62=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:705:29: ( (PLUS|MINUS) multiplicativeExpression )*
+                loop62 : do {
+                    int alt62 = 2;
+                    final int LA62_0 = this.input.LA( 1 );
+                    if ( ((LA62_0 >= PLUS && LA62_0 <= MINUS)) ) {
+                        alt62 = 1;
+                    }
 
+                    switch ( alt62 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:705:30: (PLUS|MINUS) multiplicativeExpression
+                        {
+                            if ( (this.input.LA( 1 ) >= PLUS && this.input.LA( 1 ) <= MINUS) ) {
+                                this.input.consume();
+                                this.errorRecovery = false;
+                            } else {
+                                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                         this.input );
+                                recoverFromMismatchedSet( this.input,
+                                                          mse,
+                                                          FOLLOW_set_in_additiveExpression2386 );
+                                throw mse;
+                            }
 
-                switch (alt62) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:705:30: (PLUS|MINUS) multiplicativeExpression
-            	    {
-            	    if ( (input.LA(1)>=PLUS && input.LA(1)<=MINUS) ) {
-            	        input.consume();
-            	        errorRecovery=false;
-            	    }
-            	    else {
-            	        MismatchedSetException mse =
-            	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_additiveExpression2386);    throw mse;
-            	    }
+                            pushFollow( FOLLOW_multiplicativeExpression_in_additiveExpression2393 );
+                            multiplicativeExpression();
+                            this._fsp--;
 
-            	    pushFollow(FOLLOW_multiplicativeExpression_in_additiveExpression2393);
-            	    multiplicativeExpression();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop62;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop62;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end additiveExpression
 
-
     // $ANTLR start multiplicativeExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:710:1: multiplicativeExpression : unaryExpression ( (STAR|DIV|MOD) unaryExpression )* ;
-    public void multiplicativeExpression() throws RecognitionException {   
+    public void multiplicativeExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:711:4: ( unaryExpression ( (STAR|DIV|MOD) unaryExpression )* )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:711:4: unaryExpression ( (STAR|DIV|MOD) unaryExpression )*
             {
-            pushFollow(FOLLOW_unaryExpression_in_multiplicativeExpression2408);
-            unaryExpression();
-            _fsp--;
+                pushFollow( FOLLOW_unaryExpression_in_multiplicativeExpression2408 );
+                unaryExpression();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:711:20: ( (STAR|DIV|MOD) unaryExpression )*
-            loop63:
-            do {
-                int alt63=2;
-                int LA63_0 = input.LA(1);
-                if ( (LA63_0==STAR||(LA63_0>=DIV && LA63_0<=MOD)) ) {
-                    alt63=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:711:20: ( (STAR|DIV|MOD) unaryExpression )*
+                loop63 : do {
+                    int alt63 = 2;
+                    final int LA63_0 = this.input.LA( 1 );
+                    if ( (LA63_0 == STAR || (LA63_0 >= DIV && LA63_0 <= MOD)) ) {
+                        alt63 = 1;
+                    }
 
+                    switch ( alt63 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:711:21: (STAR|DIV|MOD) unaryExpression
+                        {
+                            if ( this.input.LA( 1 ) == STAR || (this.input.LA( 1 ) >= DIV && this.input.LA( 1 ) <= MOD) ) {
+                                this.input.consume();
+                                this.errorRecovery = false;
+                            } else {
+                                final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                         this.input );
+                                recoverFromMismatchedSet( this.input,
+                                                          mse,
+                                                          FOLLOW_set_in_multiplicativeExpression2412 );
+                                throw mse;
+                            }
 
-                switch (alt63) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:711:21: (STAR|DIV|MOD) unaryExpression
-            	    {
-            	    if ( input.LA(1)==STAR||(input.LA(1)>=DIV && input.LA(1)<=MOD) ) {
-            	        input.consume();
-            	        errorRecovery=false;
-            	    }
-            	    else {
-            	        MismatchedSetException mse =
-            	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_multiplicativeExpression2412);    throw mse;
-            	    }
+                            pushFollow( FOLLOW_unaryExpression_in_multiplicativeExpression2424 );
+                            unaryExpression();
+                            this._fsp--;
 
-            	    pushFollow(FOLLOW_unaryExpression_in_multiplicativeExpression2424);
-            	    unaryExpression();
-            	    _fsp--;
+                        }
+                            break;
 
+                        default :
+                            break loop63;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    break loop63;
-                }
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end multiplicativeExpression
 
-
     // $ANTLR start unaryExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:714:1: unaryExpression : ( INC unaryExpression | DEC unaryExpression | MINUS unaryExpression | PLUS unaryExpression | unaryExpressionNotPlusMinus );
-    public void unaryExpression() throws RecognitionException {   
+    public void unaryExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:715:4: ( INC unaryExpression | DEC unaryExpression | MINUS unaryExpression | PLUS unaryExpression | unaryExpressionNotPlusMinus )
-            int alt64=5;
-            switch ( input.LA(1) ) {
-            case INC:
-                alt64=1;
-                break;
-            case DEC:
-                alt64=2;
-                break;
-            case MINUS:
-                alt64=3;
-                break;
-            case PLUS:
-                alt64=4;
-                break;
-            case IDENT:
-            case LPAREN:
-            case BNOT:
-            case LNOT:
-            case NUM_INT:
-            case CHAR_LITERAL:
-            case STRING_LITERAL:
-            case NUM_FLOAT:
-            case 68:
-            case 69:
-            case 70:
-            case 71:
-            case 72:
-            case 73:
-            case 74:
-            case 75:
-            case 76:
-            case 93:
-            case 94:
-            case 112:
-            case 113:
-            case 114:
-            case 115:
-                alt64=5;
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("714:1: unaryExpression : ( INC unaryExpression | DEC unaryExpression | MINUS unaryExpression | PLUS unaryExpression | unaryExpressionNotPlusMinus );", 64, 0, input);
+            int alt64 = 5;
+            switch ( this.input.LA( 1 ) ) {
+                case INC :
+                    alt64 = 1;
+                    break;
+                case DEC :
+                    alt64 = 2;
+                    break;
+                case MINUS :
+                    alt64 = 3;
+                    break;
+                case PLUS :
+                    alt64 = 4;
+                    break;
+                case IDENT :
+                case LPAREN :
+                case BNOT :
+                case LNOT :
+                case NUM_INT :
+                case CHAR_LITERAL :
+                case STRING_LITERAL :
+                case NUM_FLOAT :
+                case 68 :
+                case 69 :
+                case 70 :
+                case 71 :
+                case 72 :
+                case 73 :
+                case 74 :
+                case 75 :
+                case 76 :
+                case 93 :
+                case 94 :
+                case 112 :
+                case 113 :
+                case 114 :
+                case 115 :
+                    alt64 = 5;
+                    break;
+                default :
+                    final NoViableAltException nvae = new NoViableAltException( "714:1: unaryExpression : ( INC unaryExpression | DEC unaryExpression | MINUS unaryExpression | PLUS unaryExpression | unaryExpressionNotPlusMinus );",
+                                                                          64,
+                                                                          0,
+                                                                          this.input );
 
-                throw nvae;
+                    throw nvae;
             }
 
-            switch (alt64) {
+            switch ( alt64 ) {
                 case 1 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:715:4: INC unaryExpression
-                    {
-                    match(input,INC,FOLLOW_INC_in_unaryExpression2437); 
-                    pushFollow(FOLLOW_unaryExpression_in_unaryExpression2439);
+                {
+                    match( this.input,
+                           INC,
+                           FOLLOW_INC_in_unaryExpression2437 );
+                    pushFollow( FOLLOW_unaryExpression_in_unaryExpression2439 );
                     unaryExpression();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 2 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:716:4: DEC unaryExpression
-                    {
-                    match(input,DEC,FOLLOW_DEC_in_unaryExpression2444); 
-                    pushFollow(FOLLOW_unaryExpression_in_unaryExpression2446);
+                {
+                    match( this.input,
+                           DEC,
+                           FOLLOW_DEC_in_unaryExpression2444 );
+                    pushFollow( FOLLOW_unaryExpression_in_unaryExpression2446 );
                     unaryExpression();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 3 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:717:4: MINUS unaryExpression
-                    {
-                    match(input,MINUS,FOLLOW_MINUS_in_unaryExpression2451); 
-                    pushFollow(FOLLOW_unaryExpression_in_unaryExpression2454);
+                {
+                    match( this.input,
+                           MINUS,
+                           FOLLOW_MINUS_in_unaryExpression2451 );
+                    pushFollow( FOLLOW_unaryExpression_in_unaryExpression2454 );
                     unaryExpression();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 4 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:718:4: PLUS unaryExpression
-                    {
-                    match(input,PLUS,FOLLOW_PLUS_in_unaryExpression2459); 
-                    pushFollow(FOLLOW_unaryExpression_in_unaryExpression2463);
+                {
+                    match( this.input,
+                           PLUS,
+                           FOLLOW_PLUS_in_unaryExpression2459 );
+                    pushFollow( FOLLOW_unaryExpression_in_unaryExpression2463 );
                     unaryExpression();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 5 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:719:4: unaryExpressionNotPlusMinus
-                    {
-                    pushFollow(FOLLOW_unaryExpressionNotPlusMinus_in_unaryExpression2468);
+                {
+                    pushFollow( FOLLOW_unaryExpressionNotPlusMinus_in_unaryExpression2468 );
                     unaryExpressionNotPlusMinus();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
 
             }
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end unaryExpression
 
-
     // $ANTLR start unaryExpressionNotPlusMinus
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:722:1: unaryExpressionNotPlusMinus : ( BNOT unaryExpression | LNOT unaryExpression | LPAREN builtInTypeSpec RPAREN unaryExpression | LPAREN classTypeSpec RPAREN unaryExpressionNotPlusMinus | postfixExpression );
-    public void unaryExpressionNotPlusMinus() throws RecognitionException {   
+    public void unaryExpressionNotPlusMinus() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:723:4: ( BNOT unaryExpression | LNOT unaryExpression | LPAREN builtInTypeSpec RPAREN unaryExpression | LPAREN classTypeSpec RPAREN unaryExpressionNotPlusMinus | postfixExpression )
-            int alt65=5;
-            alt65 = dfa65.predict(input);
-            switch (alt65) {
+            int alt65 = 5;
+            alt65 = this.dfa65.predict( this.input );
+            switch ( alt65 ) {
                 case 1 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:723:4: BNOT unaryExpression
-                    {
-                    match(input,BNOT,FOLLOW_BNOT_in_unaryExpressionNotPlusMinus2479); 
-                    pushFollow(FOLLOW_unaryExpression_in_unaryExpressionNotPlusMinus2481);
+                {
+                    match( this.input,
+                           BNOT,
+                           FOLLOW_BNOT_in_unaryExpressionNotPlusMinus2479 );
+                    pushFollow( FOLLOW_unaryExpression_in_unaryExpressionNotPlusMinus2481 );
                     unaryExpression();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 2 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:724:4: LNOT unaryExpression
-                    {
-                    match(input,LNOT,FOLLOW_LNOT_in_unaryExpressionNotPlusMinus2486); 
-                    pushFollow(FOLLOW_unaryExpression_in_unaryExpressionNotPlusMinus2488);
+                {
+                    match( this.input,
+                           LNOT,
+                           FOLLOW_LNOT_in_unaryExpressionNotPlusMinus2486 );
+                    pushFollow( FOLLOW_unaryExpression_in_unaryExpressionNotPlusMinus2488 );
                     unaryExpression();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 3 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:726:9: LPAREN builtInTypeSpec RPAREN unaryExpression
-                    {
-                    match(input,LPAREN,FOLLOW_LPAREN_in_unaryExpressionNotPlusMinus2499); 
-                    pushFollow(FOLLOW_builtInTypeSpec_in_unaryExpressionNotPlusMinus2501);
+                {
+                    match( this.input,
+                           LPAREN,
+                           FOLLOW_LPAREN_in_unaryExpressionNotPlusMinus2499 );
+                    pushFollow( FOLLOW_builtInTypeSpec_in_unaryExpressionNotPlusMinus2501 );
                     builtInTypeSpec();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,RPAREN,FOLLOW_RPAREN_in_unaryExpressionNotPlusMinus2503); 
-                    pushFollow(FOLLOW_unaryExpression_in_unaryExpressionNotPlusMinus2513);
+                    match( this.input,
+                           RPAREN,
+                           FOLLOW_RPAREN_in_unaryExpressionNotPlusMinus2503 );
+                    pushFollow( FOLLOW_unaryExpression_in_unaryExpressionNotPlusMinus2513 );
                     unaryExpression();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 4 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:732:7: LPAREN classTypeSpec RPAREN unaryExpressionNotPlusMinus
-                    {
-                    match(input,LPAREN,FOLLOW_LPAREN_in_unaryExpressionNotPlusMinus2549); 
-                    pushFollow(FOLLOW_classTypeSpec_in_unaryExpressionNotPlusMinus2551);
+                {
+                    match( this.input,
+                           LPAREN,
+                           FOLLOW_LPAREN_in_unaryExpressionNotPlusMinus2549 );
+                    pushFollow( FOLLOW_classTypeSpec_in_unaryExpressionNotPlusMinus2551 );
                     classTypeSpec();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,RPAREN,FOLLOW_RPAREN_in_unaryExpressionNotPlusMinus2553); 
-                    pushFollow(FOLLOW_unaryExpressionNotPlusMinus_in_unaryExpressionNotPlusMinus2563);
+                    match( this.input,
+                           RPAREN,
+                           FOLLOW_RPAREN_in_unaryExpressionNotPlusMinus2553 );
+                    pushFollow( FOLLOW_unaryExpressionNotPlusMinus_in_unaryExpressionNotPlusMinus2563 );
                     unaryExpressionNotPlusMinus();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 5 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:735:7: postfixExpression
-                    {
-                    pushFollow(FOLLOW_postfixExpression_in_unaryExpressionNotPlusMinus2572);
+                {
+                    pushFollow( FOLLOW_postfixExpression_in_unaryExpressionNotPlusMinus2572 );
                     postfixExpression();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
 
             }
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end unaryExpressionNotPlusMinus
 
-
     // $ANTLR start postfixExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:739:1: postfixExpression : primaryExpression ( DOT IDENT ( LPAREN argList RPAREN )? | DOT 'this' | DOT 'super' ( LPAREN argList RPAREN | DOT IDENT ( LPAREN argList RPAREN )? ) | DOT newExpression | LBRACK expression RBRACK )* ( (INC|DEC))? ;
-    public void postfixExpression() throws RecognitionException {   
+    public void postfixExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:740:6: ( primaryExpression ( DOT IDENT ( LPAREN argList RPAREN )? | DOT 'this' | DOT 'super' ( LPAREN argList RPAREN | DOT IDENT ( LPAREN argList RPAREN )? ) | DOT newExpression | LBRACK expression RBRACK )* ( (INC|DEC))? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:740:6: primaryExpression ( DOT IDENT ( LPAREN argList RPAREN )? | DOT 'this' | DOT 'super' ( LPAREN argList RPAREN | DOT IDENT ( LPAREN argList RPAREN )? ) | DOT newExpression | LBRACK expression RBRACK )* ( (INC|DEC))?
             {
-            pushFollow(FOLLOW_primaryExpression_in_postfixExpression2586);
-            primaryExpression();
-            _fsp--;
+                pushFollow( FOLLOW_primaryExpression_in_postfixExpression2586 );
+                primaryExpression();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:741:3: ( DOT IDENT ( LPAREN argList RPAREN )? | DOT 'this' | DOT 'super' ( LPAREN argList RPAREN | DOT IDENT ( LPAREN argList RPAREN )? ) | DOT newExpression | LBRACK expression RBRACK )*
-            loop69:
-            do {
-                int alt69=6;
-                int LA69_0 = input.LA(1);
-                if ( (LA69_0==DOT) ) {
-                    switch ( input.LA(2) ) {
-                    case IDENT:
-                        alt69=1;
-                        break;
-                    case 94:
-                        alt69=3;
-                        break;
-                    case 93:
-                        alt69=2;
-                        break;
-                    case 115:
-                        alt69=4;
-                        break;
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:741:3: ( DOT IDENT ( LPAREN argList RPAREN )? | DOT 'this' | DOT 'super' ( LPAREN argList RPAREN | DOT IDENT ( LPAREN argList RPAREN )? ) | DOT newExpression | LBRACK expression RBRACK )*
+                loop69 : do {
+                    int alt69 = 6;
+                    final int LA69_0 = this.input.LA( 1 );
+                    if ( (LA69_0 == DOT) ) {
+                        switch ( this.input.LA( 2 ) ) {
+                            case IDENT :
+                                alt69 = 1;
+                                break;
+                            case 94 :
+                                alt69 = 3;
+                                break;
+                            case 93 :
+                                alt69 = 2;
+                                break;
+                            case 115 :
+                                alt69 = 4;
+                                break;
 
+                        }
+
+                    } else if ( (LA69_0 == LBRACK) ) {
+                        alt69 = 5;
                     }
 
-                }
-                else if ( (LA69_0==LBRACK) ) {
-                    alt69=5;
-                }
+                    switch ( alt69 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:741:7: DOT IDENT ( LPAREN argList RPAREN )?
+                        {
+                            match( this.input,
+                                   DOT,
+                                   FOLLOW_DOT_in_postfixExpression2594 );
+                            match( this.input,
+                                   IDENT,
+                                   FOLLOW_IDENT_in_postfixExpression2596 );
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:742:4: ( LPAREN argList RPAREN )?
+                            int alt66 = 2;
+                            final int LA66_0 = this.input.LA( 1 );
+                            if ( (LA66_0 == LPAREN) ) {
+                                alt66 = 1;
+                            }
+                            switch ( alt66 ) {
+                                case 1 :
+                                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:742:6: LPAREN argList RPAREN
+                                {
+                                    match( this.input,
+                                           LPAREN,
+                                           FOLLOW_LPAREN_in_postfixExpression2603 );
+                                    pushFollow( FOLLOW_argList_in_postfixExpression2610 );
+                                    argList();
+                                    this._fsp--;
 
+                                    match( this.input,
+                                           RPAREN,
+                                           FOLLOW_RPAREN_in_postfixExpression2616 );
 
-                switch (alt69) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:741:7: DOT IDENT ( LPAREN argList RPAREN )?
-            	    {
-            	    match(input,DOT,FOLLOW_DOT_in_postfixExpression2594); 
-            	    match(input,IDENT,FOLLOW_IDENT_in_postfixExpression2596); 
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:742:4: ( LPAREN argList RPAREN )?
-            	    int alt66=2;
-            	    int LA66_0 = input.LA(1);
-            	    if ( (LA66_0==LPAREN) ) {
-            	        alt66=1;
-            	    }
-            	    switch (alt66) {
-            	        case 1 :
-            	            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:742:6: LPAREN argList RPAREN
-            	            {
-            	            match(input,LPAREN,FOLLOW_LPAREN_in_postfixExpression2603); 
-            	            pushFollow(FOLLOW_argList_in_postfixExpression2610);
-            	            argList();
-            	            _fsp--;
+                                }
+                                    break;
 
-            	            match(input,RPAREN,FOLLOW_RPAREN_in_postfixExpression2616); 
+                            }
 
-            	            }
-            	            break;
+                        }
+                            break;
+                        case 2 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:746:5: DOT 'this'
+                        {
+                            match( this.input,
+                                   DOT,
+                                   FOLLOW_DOT_in_postfixExpression2628 );
+                            match( this.input,
+                                   93,
+                                   FOLLOW_93_in_postfixExpression2630 );
 
-            	    }
+                        }
+                            break;
+                        case 3 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:748:5: DOT 'super' ( LPAREN argList RPAREN | DOT IDENT ( LPAREN argList RPAREN )? )
+                        {
+                            match( this.input,
+                                   DOT,
+                                   FOLLOW_DOT_in_postfixExpression2637 );
+                            match( this.input,
+                                   94,
+                                   FOLLOW_94_in_postfixExpression2639 );
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:749:13: ( LPAREN argList RPAREN | DOT IDENT ( LPAREN argList RPAREN )? )
+                            int alt68 = 2;
+                            final int LA68_0 = this.input.LA( 1 );
+                            if ( (LA68_0 == LPAREN) ) {
+                                alt68 = 1;
+                            } else if ( (LA68_0 == DOT) ) {
+                                alt68 = 2;
+                            } else {
+                                final NoViableAltException nvae = new NoViableAltException( "749:13: ( LPAREN argList RPAREN | DOT IDENT ( LPAREN argList RPAREN )? )",
+                                                                                      68,
+                                                                                      0,
+                                                                                      this.input );
 
+                                throw nvae;
+                            }
+                            switch ( alt68 ) {
+                                case 1 :
+                                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:750:17: LPAREN argList RPAREN
+                                {
+                                    match( this.input,
+                                           LPAREN,
+                                           FOLLOW_LPAREN_in_postfixExpression2674 );
+                                    pushFollow( FOLLOW_argList_in_postfixExpression2676 );
+                                    argList();
+                                    this._fsp--;
 
-            	    }
-            	    break;
-            	case 2 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:746:5: DOT 'this'
-            	    {
-            	    match(input,DOT,FOLLOW_DOT_in_postfixExpression2628); 
-            	    match(input,93,FOLLOW_93_in_postfixExpression2630); 
+                                    match( this.input,
+                                           RPAREN,
+                                           FOLLOW_RPAREN_in_postfixExpression2678 );
 
-            	    }
-            	    break;
-            	case 3 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:748:5: DOT 'super' ( LPAREN argList RPAREN | DOT IDENT ( LPAREN argList RPAREN )? )
-            	    {
-            	    match(input,DOT,FOLLOW_DOT_in_postfixExpression2637); 
-            	    match(input,94,FOLLOW_94_in_postfixExpression2639); 
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:749:13: ( LPAREN argList RPAREN | DOT IDENT ( LPAREN argList RPAREN )? )
-            	    int alt68=2;
-            	    int LA68_0 = input.LA(1);
-            	    if ( (LA68_0==LPAREN) ) {
-            	        alt68=1;
-            	    }
-            	    else if ( (LA68_0==DOT) ) {
-            	        alt68=2;
-            	    }
-            	    else {
-            	        NoViableAltException nvae =
-            	            new NoViableAltException("749:13: ( LPAREN argList RPAREN | DOT IDENT ( LPAREN argList RPAREN )? )", 68, 0, input);
+                                }
+                                    break;
+                                case 2 :
+                                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:752:8: DOT IDENT ( LPAREN argList RPAREN )?
+                                {
+                                    match( this.input,
+                                           DOT,
+                                           FOLLOW_DOT_in_postfixExpression2704 );
+                                    match( this.input,
+                                           IDENT,
+                                           FOLLOW_IDENT_in_postfixExpression2706 );
+                                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:753:17: ( LPAREN argList RPAREN )?
+                                    int alt67 = 2;
+                                    final int LA67_0 = this.input.LA( 1 );
+                                    if ( (LA67_0 == LPAREN) ) {
+                                        alt67 = 1;
+                                    }
+                                    switch ( alt67 ) {
+                                        case 1 :
+                                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:753:19: LPAREN argList RPAREN
+                                        {
+                                            match( this.input,
+                                                   LPAREN,
+                                                   FOLLOW_LPAREN_in_postfixExpression2726 );
+                                            pushFollow( FOLLOW_argList_in_postfixExpression2749 );
+                                            argList();
+                                            this._fsp--;
 
-            	        throw nvae;
-            	    }
-            	    switch (alt68) {
-            	        case 1 :
-            	            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:750:17: LPAREN argList RPAREN
-            	            {
-            	            match(input,LPAREN,FOLLOW_LPAREN_in_postfixExpression2674); 
-            	            pushFollow(FOLLOW_argList_in_postfixExpression2676);
-            	            argList();
-            	            _fsp--;
+                                            match( this.input,
+                                                   RPAREN,
+                                                   FOLLOW_RPAREN_in_postfixExpression2771 );
 
-            	            match(input,RPAREN,FOLLOW_RPAREN_in_postfixExpression2678); 
+                                        }
+                                            break;
 
-            	            }
-            	            break;
-            	        case 2 :
-            	            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:752:8: DOT IDENT ( LPAREN argList RPAREN )?
-            	            {
-            	            match(input,DOT,FOLLOW_DOT_in_postfixExpression2704); 
-            	            match(input,IDENT,FOLLOW_IDENT_in_postfixExpression2706); 
-            	            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:753:17: ( LPAREN argList RPAREN )?
-            	            int alt67=2;
-            	            int LA67_0 = input.LA(1);
-            	            if ( (LA67_0==LPAREN) ) {
-            	                alt67=1;
-            	            }
-            	            switch (alt67) {
-            	                case 1 :
-            	                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:753:19: LPAREN argList RPAREN
-            	                    {
-            	                    match(input,LPAREN,FOLLOW_LPAREN_in_postfixExpression2726); 
-            	                    pushFollow(FOLLOW_argList_in_postfixExpression2749);
-            	                    argList();
-            	                    _fsp--;
+                                    }
 
-            	                    match(input,RPAREN,FOLLOW_RPAREN_in_postfixExpression2771); 
+                                }
+                                    break;
 
-            	                    }
-            	                    break;
+                            }
 
-            	            }
+                        }
+                            break;
+                        case 4 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:758:5: DOT newExpression
+                        {
+                            match( this.input,
+                                   DOT,
+                                   FOLLOW_DOT_in_postfixExpression2810 );
+                            pushFollow( FOLLOW_newExpression_in_postfixExpression2812 );
+                            newExpression();
+                            this._fsp--;
 
+                        }
+                            break;
+                        case 5 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:759:5: LBRACK expression RBRACK
+                        {
+                            match( this.input,
+                                   LBRACK,
+                                   FOLLOW_LBRACK_in_postfixExpression2818 );
+                            pushFollow( FOLLOW_expression_in_postfixExpression2821 );
+                            expression();
+                            this._fsp--;
 
-            	            }
-            	            break;
+                            match( this.input,
+                                   RBRACK,
+                                   FOLLOW_RBRACK_in_postfixExpression2823 );
 
-            	    }
+                        }
+                            break;
 
+                        default :
+                            break loop69;
+                    }
+                } while ( true );
 
-            	    }
-            	    break;
-            	case 4 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:758:5: DOT newExpression
-            	    {
-            	    match(input,DOT,FOLLOW_DOT_in_postfixExpression2810); 
-            	    pushFollow(FOLLOW_newExpression_in_postfixExpression2812);
-            	    newExpression();
-            	    _fsp--;
-
-
-            	    }
-            	    break;
-            	case 5 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:759:5: LBRACK expression RBRACK
-            	    {
-            	    match(input,LBRACK,FOLLOW_LBRACK_in_postfixExpression2818); 
-            	    pushFollow(FOLLOW_expression_in_postfixExpression2821);
-            	    expression();
-            	    _fsp--;
-
-            	    match(input,RBRACK,FOLLOW_RBRACK_in_postfixExpression2823); 
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop69;
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:762:3: ( (INC|DEC))?
+                int alt70 = 2;
+                final int LA70_0 = this.input.LA( 1 );
+                if ( ((LA70_0 >= INC && LA70_0 <= DEC)) ) {
+                    alt70 = 1;
                 }
-            } while (true);
-
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:762:3: ( (INC|DEC))?
-            int alt70=2;
-            int LA70_0 = input.LA(1);
-            if ( ((LA70_0>=INC && LA70_0<=DEC)) ) {
-                alt70=1;
-            }
-            switch (alt70) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:764:4: (INC|DEC)
+                switch ( alt70 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:764:4: (INC|DEC)
                     {
-                    if ( (input.LA(1)>=INC && input.LA(1)<=DEC) ) {
-                        input.consume();
-                        errorRecovery=false;
-                    }
-                    else {
-                        MismatchedSetException mse =
-                            new MismatchedSetException(null,input);
-                        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_postfixExpression2854);    throw mse;
-                    }
+                        if ( (this.input.LA( 1 ) >= INC && this.input.LA( 1 ) <= DEC) ) {
+                            this.input.consume();
+                            this.errorRecovery = false;
+                        } else {
+                            final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                                     this.input );
+                            recoverFromMismatchedSet( this.input,
+                                                      mse,
+                                                      FOLLOW_set_in_postfixExpression2854 );
+                            throw mse;
+                        }
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end postfixExpression
 
-
     // $ANTLR start primaryExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:770:1: primaryExpression : ( identPrimary ( options {greedy=true; } : DOT 'class' )? | constant | 'true' | 'false' | 'null' | newExpression | 'this' | 'super' | LPAREN assignmentExpression RPAREN | builtInType ( LBRACK RBRACK )* DOT 'class' );
-    public void primaryExpression() throws RecognitionException {   
+    public void primaryExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:771:4: ( identPrimary ( options {greedy=true; } : DOT 'class' )? | constant | 'true' | 'false' | 'null' | newExpression | 'this' | 'super' | LPAREN assignmentExpression RPAREN | builtInType ( LBRACK RBRACK )* DOT 'class' )
-            int alt73=10;
-            switch ( input.LA(1) ) {
-            case IDENT:
-                alt73=1;
-                break;
-            case NUM_INT:
-            case CHAR_LITERAL:
-            case STRING_LITERAL:
-            case NUM_FLOAT:
-                alt73=2;
-                break;
-            case 112:
-                alt73=3;
-                break;
-            case 113:
-                alt73=4;
-                break;
-            case 114:
-                alt73=5;
-                break;
-            case 115:
-                alt73=6;
-                break;
-            case 93:
-                alt73=7;
-                break;
-            case 94:
-                alt73=8;
-                break;
-            case LPAREN:
-                alt73=9;
-                break;
-            case 68:
-            case 69:
-            case 70:
-            case 71:
-            case 72:
-            case 73:
-            case 74:
-            case 75:
-            case 76:
-                alt73=10;
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("770:1: primaryExpression : ( identPrimary ( options {greedy=true; } : DOT 'class' )? | constant | 'true' | 'false' | 'null' | newExpression | 'this' | 'super' | LPAREN assignmentExpression RPAREN | builtInType ( LBRACK RBRACK )* DOT 'class' );", 73, 0, input);
+            int alt73 = 10;
+            switch ( this.input.LA( 1 ) ) {
+                case IDENT :
+                    alt73 = 1;
+                    break;
+                case NUM_INT :
+                case CHAR_LITERAL :
+                case STRING_LITERAL :
+                case NUM_FLOAT :
+                    alt73 = 2;
+                    break;
+                case 112 :
+                    alt73 = 3;
+                    break;
+                case 113 :
+                    alt73 = 4;
+                    break;
+                case 114 :
+                    alt73 = 5;
+                    break;
+                case 115 :
+                    alt73 = 6;
+                    break;
+                case 93 :
+                    alt73 = 7;
+                    break;
+                case 94 :
+                    alt73 = 8;
+                    break;
+                case LPAREN :
+                    alt73 = 9;
+                    break;
+                case 68 :
+                case 69 :
+                case 70 :
+                case 71 :
+                case 72 :
+                case 73 :
+                case 74 :
+                case 75 :
+                case 76 :
+                    alt73 = 10;
+                    break;
+                default :
+                    final NoViableAltException nvae = new NoViableAltException( "770:1: primaryExpression : ( identPrimary ( options {greedy=true; } : DOT 'class' )? | constant | 'true' | 'false' | 'null' | newExpression | 'this' | 'super' | LPAREN assignmentExpression RPAREN | builtInType ( LBRACK RBRACK )* DOT 'class' );",
+                                                                          73,
+                                                                          0,
+                                                                          this.input );
 
-                throw nvae;
+                    throw nvae;
             }
 
-            switch (alt73) {
+            switch ( alt73 ) {
                 case 1 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:771:4: identPrimary ( options {greedy=true; } : DOT 'class' )?
-                    {
-                    pushFollow(FOLLOW_identPrimary_in_primaryExpression2881);
+                {
+                    pushFollow( FOLLOW_identPrimary_in_primaryExpression2881 );
                     identPrimary();
-                    _fsp--;
+                    this._fsp--;
 
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:771:17: ( options {greedy=true; } : DOT 'class' )?
-                    int alt71=2;
-                    int LA71_0 = input.LA(1);
-                    if ( (LA71_0==DOT) ) {
-                        int LA71_1 = input.LA(2);
-                        if ( (LA71_1==89) ) {
-                            alt71=1;
+                    int alt71 = 2;
+                    final int LA71_0 = this.input.LA( 1 );
+                    if ( (LA71_0 == DOT) ) {
+                        final int LA71_1 = this.input.LA( 2 );
+                        if ( (LA71_1 == 89) ) {
+                            alt71 = 1;
                         }
                     }
-                    switch (alt71) {
+                    switch ( alt71 ) {
                         case 1 :
                             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:771:43: DOT 'class'
-                            {
-                            match(input,DOT,FOLLOW_DOT_in_primaryExpression2893); 
-                            match(input,89,FOLLOW_89_in_primaryExpression2895); 
+                        {
+                            match( this.input,
+                                   DOT,
+                                   FOLLOW_DOT_in_primaryExpression2893 );
+                            match( this.input,
+                                   89,
+                                   FOLLOW_89_in_primaryExpression2895 );
 
-                            }
+                        }
                             break;
 
                     }
 
-
-                    }
+                }
                     break;
                 case 2 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:772:9: constant
-                    {
-                    pushFollow(FOLLOW_constant_in_primaryExpression2908);
+                {
+                    pushFollow( FOLLOW_constant_in_primaryExpression2908 );
                     constant();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 3 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:773:4: 'true'
-                    {
-                    match(input,112,FOLLOW_112_in_primaryExpression2913); 
+                {
+                    match( this.input,
+                           112,
+                           FOLLOW_112_in_primaryExpression2913 );
 
-                    }
+                }
                     break;
                 case 4 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:774:4: 'false'
-                    {
-                    match(input,113,FOLLOW_113_in_primaryExpression2918); 
+                {
+                    match( this.input,
+                           113,
+                           FOLLOW_113_in_primaryExpression2918 );
 
-                    }
+                }
                     break;
                 case 5 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:775:4: 'null'
-                    {
-                    match(input,114,FOLLOW_114_in_primaryExpression2923); 
+                {
+                    match( this.input,
+                           114,
+                           FOLLOW_114_in_primaryExpression2923 );
 
-                    }
+                }
                     break;
                 case 6 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:776:9: newExpression
-                    {
-                    pushFollow(FOLLOW_newExpression_in_primaryExpression2933);
+                {
+                    pushFollow( FOLLOW_newExpression_in_primaryExpression2933 );
                     newExpression();
-                    _fsp--;
+                    this._fsp--;
 
-
-                    }
+                }
                     break;
                 case 7 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:777:4: 'this'
-                    {
-                    match(input,93,FOLLOW_93_in_primaryExpression2938); 
+                {
+                    match( this.input,
+                           93,
+                           FOLLOW_93_in_primaryExpression2938 );
 
-                    }
+                }
                     break;
                 case 8 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:778:4: 'super'
-                    {
-                    match(input,94,FOLLOW_94_in_primaryExpression2943); 
+                {
+                    match( this.input,
+                           94,
+                           FOLLOW_94_in_primaryExpression2943 );
 
-                    }
+                }
                     break;
                 case 9 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:779:4: LPAREN assignmentExpression RPAREN
-                    {
-                    match(input,LPAREN,FOLLOW_LPAREN_in_primaryExpression2948); 
-                    pushFollow(FOLLOW_assignmentExpression_in_primaryExpression2950);
+                {
+                    match( this.input,
+                           LPAREN,
+                           FOLLOW_LPAREN_in_primaryExpression2948 );
+                    pushFollow( FOLLOW_assignmentExpression_in_primaryExpression2950 );
                     assignmentExpression();
-                    _fsp--;
+                    this._fsp--;
 
-                    match(input,RPAREN,FOLLOW_RPAREN_in_primaryExpression2952); 
+                    match( this.input,
+                           RPAREN,
+                           FOLLOW_RPAREN_in_primaryExpression2952 );
 
-                    }
+                }
                     break;
                 case 10 :
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:781:4: builtInType ( LBRACK RBRACK )* DOT 'class'
-                    {
-                    pushFollow(FOLLOW_builtInType_in_primaryExpression2960);
+                {
+                    pushFollow( FOLLOW_builtInType_in_primaryExpression2960 );
                     builtInType();
-                    _fsp--;
+                    this._fsp--;
 
                     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:782:3: ( LBRACK RBRACK )*
-                    loop72:
-                    do {
-                        int alt72=2;
-                        int LA72_0 = input.LA(1);
-                        if ( (LA72_0==LBRACK) ) {
-                            alt72=1;
+                    loop72 : do {
+                        int alt72 = 2;
+                        final int LA72_0 = this.input.LA( 1 );
+                        if ( (LA72_0 == LBRACK) ) {
+                            alt72 = 1;
                         }
 
+                        switch ( alt72 ) {
+                            case 1 :
+                                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:782:5: LBRACK RBRACK
+                            {
+                                match( this.input,
+                                       LBRACK,
+                                       FOLLOW_LBRACK_in_primaryExpression2966 );
+                                match( this.input,
+                                       RBRACK,
+                                       FOLLOW_RBRACK_in_primaryExpression2969 );
 
-                        switch (alt72) {
-                    	case 1 :
-                    	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:782:5: LBRACK RBRACK
-                    	    {
-                    	    match(input,LBRACK,FOLLOW_LBRACK_in_primaryExpression2966); 
-                    	    match(input,RBRACK,FOLLOW_RBRACK_in_primaryExpression2969); 
+                            }
+                                break;
 
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    break loop72;
+                            default :
+                                break loop72;
                         }
-                    } while (true);
+                    } while ( true );
 
-                    match(input,DOT,FOLLOW_DOT_in_primaryExpression2976); 
-                    match(input,89,FOLLOW_89_in_primaryExpression2978); 
+                    match( this.input,
+                           DOT,
+                           FOLLOW_DOT_in_primaryExpression2976 );
+                    match( this.input,
+                           89,
+                           FOLLOW_89_in_primaryExpression2978 );
 
-                    }
+                }
                     break;
 
             }
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end primaryExpression
 
-
     // $ANTLR start identPrimary
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:786:1: identPrimary : i= IDENT ( options {greedy=true; k=2; } : DOT IDENT )* ( options {greedy=true; } : ( LPAREN argList RPAREN ) | ( options {greedy=true; } : LBRACK RBRACK )+ )? ;
-    public void identPrimary() throws RecognitionException {   
-        Token i=null;
+    public void identPrimary() throws RecognitionException {
+        Token i = null;
 
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:791:4: (i= IDENT ( options {greedy=true; k=2; } : DOT IDENT )* ( options {greedy=true; } : ( LPAREN argList RPAREN ) | ( options {greedy=true; } : LBRACK RBRACK )+ )? )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:791:4: i= IDENT ( options {greedy=true; k=2; } : DOT IDENT )* ( options {greedy=true; } : ( LPAREN argList RPAREN ) | ( options {greedy=true; } : LBRACK RBRACK )+ )?
             {
-            i=(Token)input.LT(1);
-            match(input,IDENT,FOLLOW_IDENT_in_identPrimary2993); 
-             identifiers.add( i.getText() );  
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:792:3: ( options {greedy=true; k=2; } : DOT IDENT )*
-            loop74:
-            do {
-                int alt74=2;
-                int LA74_0 = input.LA(1);
-                if ( (LA74_0==DOT) ) {
-                    int LA74_3 = input.LA(2);
-                    if ( (LA74_3==IDENT) ) {
-                        alt74=1;
+                i = (Token) this.input.LT( 1 );
+                match( this.input,
+                       IDENT,
+                       FOLLOW_IDENT_in_identPrimary2993 );
+                this.identifiers.add( i.getText() );
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:792:3: ( options {greedy=true; k=2; } : DOT IDENT )*
+                loop74 : do {
+                    int alt74 = 2;
+                    final int LA74_0 = this.input.LA( 1 );
+                    if ( (LA74_0 == DOT) ) {
+                        final int LA74_3 = this.input.LA( 2 );
+                        if ( (LA74_3 == IDENT) ) {
+                            alt74 = 1;
+                        }
+
                     }
 
+                    switch ( alt74 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:796:5: DOT IDENT
+                        {
+                            match( this.input,
+                                   DOT,
+                                   FOLLOW_DOT_in_identPrimary3031 );
+                            match( this.input,
+                                   IDENT,
+                                   FOLLOW_IDENT_in_identPrimary3033 );
 
-                }
+                        }
+                            break;
 
+                        default :
+                            break loop74;
+                    }
+                } while ( true );
 
-                switch (alt74) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:796:5: DOT IDENT
-            	    {
-            	    match(input,DOT,FOLLOW_DOT_in_identPrimary3031); 
-            	    match(input,IDENT,FOLLOW_IDENT_in_identPrimary3033); 
-
-            	    }
-            	    break;
-
-            	default :
-            	    break loop74;
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:798:3: ( options {greedy=true; } : ( LPAREN argList RPAREN ) | ( options {greedy=true; } : LBRACK RBRACK )+ )?
+                int alt76 = 3;
+                final int LA76_0 = this.input.LA( 1 );
+                if ( (LA76_0 == LPAREN) ) {
+                    alt76 = 1;
+                } else if ( (LA76_0 == LBRACK) ) {
+                    final int LA76_2 = this.input.LA( 2 );
+                    if ( (LA76_2 == RBRACK) ) {
+                        alt76 = 2;
+                    }
                 }
-            } while (true);
-
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:798:3: ( options {greedy=true; } : ( LPAREN argList RPAREN ) | ( options {greedy=true; } : LBRACK RBRACK )+ )?
-            int alt76=3;
-            int LA76_0 = input.LA(1);
-            if ( (LA76_0==LPAREN) ) {
-                alt76=1;
-            }
-            else if ( (LA76_0==LBRACK) ) {
-                int LA76_2 = input.LA(2);
-                if ( (LA76_2==RBRACK) ) {
-                    alt76=2;
-                }
-            }
-            switch (alt76) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:804:7: ( LPAREN argList RPAREN )
+                switch ( alt76 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:804:7: ( LPAREN argList RPAREN )
                     {
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:804:7: ( LPAREN argList RPAREN )
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:804:9: LPAREN argList RPAREN
-                    {
-                    match(input,LPAREN,FOLLOW_LPAREN_in_identPrimary3095); 
-                    pushFollow(FOLLOW_argList_in_identPrimary3098);
-                    argList();
-                    _fsp--;
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:804:7: ( LPAREN argList RPAREN )
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:804:9: LPAREN argList RPAREN
+                        {
+                            match( this.input,
+                                   LPAREN,
+                                   FOLLOW_LPAREN_in_identPrimary3095 );
+                            pushFollow( FOLLOW_argList_in_identPrimary3098 );
+                            argList();
+                            this._fsp--;
 
-                    match(input,RPAREN,FOLLOW_RPAREN_in_identPrimary3100); 
+                            match( this.input,
+                                   RPAREN,
+                                   FOLLOW_RPAREN_in_identPrimary3100 );
 
-                    }
+                        }
 
-
                     }
-                    break;
-                case 2 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:805:5: ( options {greedy=true; } : LBRACK RBRACK )+
+                        break;
+                    case 2 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:805:5: ( options {greedy=true; } : LBRACK RBRACK )+
                     {
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:805:5: ( options {greedy=true; } : LBRACK RBRACK )+
-                    int cnt75=0;
-                    loop75:
-                    do {
-                        int alt75=2;
-                        int LA75_0 = input.LA(1);
-                        if ( (LA75_0==LBRACK) ) {
-                            int LA75_2 = input.LA(2);
-                            if ( (LA75_2==RBRACK) ) {
-                                alt75=1;
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:805:5: ( options {greedy=true; } : LBRACK RBRACK )+
+                        int cnt75 = 0;
+                        loop75 : do {
+                            int alt75 = 2;
+                            final int LA75_0 = this.input.LA( 1 );
+                            if ( (LA75_0 == LBRACK) ) {
+                                final int LA75_2 = this.input.LA( 2 );
+                                if ( (LA75_2 == RBRACK) ) {
+                                    alt75 = 1;
+                                }
+
                             }
 
+                            switch ( alt75 ) {
+                                case 1 :
+                                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:806:15: LBRACK RBRACK
+                                {
+                                    match( this.input,
+                                           LBRACK,
+                                           FOLLOW_LBRACK_in_identPrimary3133 );
+                                    match( this.input,
+                                           RBRACK,
+                                           FOLLOW_RBRACK_in_identPrimary3136 );
 
-                        }
+                                }
+                                    break;
 
+                                default :
+                                    if ( cnt75 >= 1 ) {
+                                        break loop75;
+                                    }
+                                    final EarlyExitException eee = new EarlyExitException( 75,
+                                                                                     this.input );
+                                    throw eee;
+                            }
+                            cnt75++;
+                        } while ( true );
 
-                        switch (alt75) {
-                    	case 1 :
-                    	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:806:15: LBRACK RBRACK
-                    	    {
-                    	    match(input,LBRACK,FOLLOW_LBRACK_in_identPrimary3133); 
-                    	    match(input,RBRACK,FOLLOW_RBRACK_in_identPrimary3136); 
-
-                    	    }
-                    	    break;
-
-                    	default :
-                    	    if ( cnt75 >= 1 ) break loop75;
-                                EarlyExitException eee =
-                                    new EarlyExitException(75, input);
-                                throw eee;
-                        }
-                        cnt75++;
-                    } while (true);
-
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end identPrimary
 
-
     // $ANTLR start newExpression
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:811:1: newExpression : 'new' type ( LPAREN argList RPAREN ( classBlock )? | newArrayDeclarator ( arrayInitializer )? ) ;
-    public void newExpression() throws RecognitionException {   
+    public void newExpression() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:861:4: ( 'new' type ( LPAREN argList RPAREN ( classBlock )? | newArrayDeclarator ( arrayInitializer )? ) )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:861:4: 'new' type ( LPAREN argList RPAREN ( classBlock )? | newArrayDeclarator ( arrayInitializer )? )
             {
-            match(input,115,FOLLOW_115_in_newExpression3172); 
-            pushFollow(FOLLOW_type_in_newExpression3174);
-            type();
-            _fsp--;
+                match( this.input,
+                       115,
+                       FOLLOW_115_in_newExpression3172 );
+                pushFollow( FOLLOW_type_in_newExpression3174 );
+                type();
+                this._fsp--;
 
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:862:3: ( LPAREN argList RPAREN ( classBlock )? | newArrayDeclarator ( arrayInitializer )? )
-            int alt79=2;
-            int LA79_0 = input.LA(1);
-            if ( (LA79_0==LPAREN) ) {
-                alt79=1;
-            }
-            else if ( (LA79_0==LBRACK) ) {
-                alt79=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("862:3: ( LPAREN argList RPAREN ( classBlock )? | newArrayDeclarator ( arrayInitializer )? )", 79, 0, input);
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:862:3: ( LPAREN argList RPAREN ( classBlock )? | newArrayDeclarator ( arrayInitializer )? )
+                int alt79 = 2;
+                final int LA79_0 = this.input.LA( 1 );
+                if ( (LA79_0 == LPAREN) ) {
+                    alt79 = 1;
+                } else if ( (LA79_0 == LBRACK) ) {
+                    alt79 = 2;
+                } else {
+                    final NoViableAltException nvae = new NoViableAltException( "862:3: ( LPAREN argList RPAREN ( classBlock )? | newArrayDeclarator ( arrayInitializer )? )",
+                                                                          79,
+                                                                          0,
+                                                                          this.input );
 
-                throw nvae;
-            }
-            switch (alt79) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:862:5: LPAREN argList RPAREN ( classBlock )?
+                    throw nvae;
+                }
+                switch ( alt79 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:862:5: LPAREN argList RPAREN ( classBlock )?
                     {
-                    match(input,LPAREN,FOLLOW_LPAREN_in_newExpression3180); 
-                    pushFollow(FOLLOW_argList_in_newExpression3182);
-                    argList();
-                    _fsp--;
+                        match( this.input,
+                               LPAREN,
+                               FOLLOW_LPAREN_in_newExpression3180 );
+                        pushFollow( FOLLOW_argList_in_newExpression3182 );
+                        argList();
+                        this._fsp--;
 
-                    match(input,RPAREN,FOLLOW_RPAREN_in_newExpression3184); 
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:862:27: ( classBlock )?
-                    int alt77=2;
-                    int LA77_0 = input.LA(1);
-                    if ( (LA77_0==LCURLY) ) {
-                        alt77=1;
-                    }
-                    switch (alt77) {
-                        case 1 :
-                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:862:28: classBlock
+                        match( this.input,
+                               RPAREN,
+                               FOLLOW_RPAREN_in_newExpression3184 );
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:862:27: ( classBlock )?
+                        int alt77 = 2;
+                        final int LA77_0 = this.input.LA( 1 );
+                        if ( (LA77_0 == LCURLY) ) {
+                            alt77 = 1;
+                        }
+                        switch ( alt77 ) {
+                            case 1 :
+                                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:862:28: classBlock
                             {
-                            pushFollow(FOLLOW_classBlock_in_newExpression3187);
-                            classBlock();
-                            _fsp--;
+                                pushFollow( FOLLOW_classBlock_in_newExpression3187 );
+                                classBlock();
+                                this._fsp--;
 
-
                             }
-                            break;
+                                break;
 
-                    }
+                        }
 
-
                     }
-                    break;
-                case 2 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:872:5: newArrayDeclarator ( arrayInitializer )?
+                        break;
+                    case 2 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:872:5: newArrayDeclarator ( arrayInitializer )?
                     {
-                    pushFollow(FOLLOW_newArrayDeclarator_in_newExpression3225);
-                    newArrayDeclarator();
-                    _fsp--;
+                        pushFollow( FOLLOW_newArrayDeclarator_in_newExpression3225 );
+                        newArrayDeclarator();
+                        this._fsp--;
 
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:872:24: ( arrayInitializer )?
-                    int alt78=2;
-                    int LA78_0 = input.LA(1);
-                    if ( (LA78_0==LCURLY) ) {
-                        alt78=1;
-                    }
-                    switch (alt78) {
-                        case 1 :
-                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:872:25: arrayInitializer
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:872:24: ( arrayInitializer )?
+                        int alt78 = 2;
+                        final int LA78_0 = this.input.LA( 1 );
+                        if ( (LA78_0 == LCURLY) ) {
+                            alt78 = 1;
+                        }
+                        switch ( alt78 ) {
+                            case 1 :
+                                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:872:25: arrayInitializer
                             {
-                            pushFollow(FOLLOW_arrayInitializer_in_newExpression3228);
-                            arrayInitializer();
-                            _fsp--;
+                                pushFollow( FOLLOW_arrayInitializer_in_newExpression3228 );
+                                arrayInitializer();
+                                this._fsp--;
 
-
                             }
-                            break;
+                                break;
 
-                    }
+                        }
 
-
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end newExpression
 
-
     // $ANTLR start argList
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:876:1: argList : ( expressionList | ) ;
-    public void argList() throws RecognitionException {   
+    public void argList() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:877:4: ( ( expressionList | ) )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:877:4: ( expressionList | )
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:877:4: ( expressionList | )
-            int alt80=2;
-            int LA80_0 = input.LA(1);
-            if ( (LA80_0==IDENT||LA80_0==LPAREN||(LA80_0>=PLUS && LA80_0<=MINUS)||(LA80_0>=INC && LA80_0<=NUM_FLOAT)||(LA80_0>=68 && LA80_0<=76)||(LA80_0>=93 && LA80_0<=94)||(LA80_0>=112 && LA80_0<=115)) ) {
-                alt80=1;
-            }
-            else if ( (LA80_0==RPAREN) ) {
-                alt80=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("877:4: ( expressionList | )", 80, 0, input);
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:877:4: ( expressionList | )
+                int alt80 = 2;
+                final int LA80_0 = this.input.LA( 1 );
+                if ( (LA80_0 == IDENT || LA80_0 == LPAREN || (LA80_0 >= PLUS && LA80_0 <= MINUS) || (LA80_0 >= INC && LA80_0 <= NUM_FLOAT) || (LA80_0 >= 68 && LA80_0 <= 76) || (LA80_0 >= 93 && LA80_0 <= 94) || (LA80_0 >= 112 && LA80_0 <= 115)) ) {
+                    alt80 = 1;
+                } else if ( (LA80_0 == RPAREN) ) {
+                    alt80 = 2;
+                } else {
+                    final NoViableAltException nvae = new NoViableAltException( "877:4: ( expressionList | )",
+                                                                          80,
+                                                                          0,
+                                                                          this.input );
 
-                throw nvae;
-            }
-            switch (alt80) {
-                case 1 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:877:6: expressionList
+                    throw nvae;
+                }
+                switch ( alt80 ) {
+                    case 1 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:877:6: expressionList
                     {
-                    pushFollow(FOLLOW_expressionList_in_argList3247);
-                    expressionList();
-                    _fsp--;
+                        pushFollow( FOLLOW_expressionList_in_argList3247 );
+                        expressionList();
+                        this._fsp--;
 
-
                     }
-                    break;
-                case 2 :
-                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:880:3: 
+                        break;
+                    case 2 :
+                        // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:880:3: 
                     {
                     }
-                    break;
+                        break;
 
-            }
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end argList
 
-
     // $ANTLR start newArrayDeclarator
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:883:1: newArrayDeclarator : ( options {k=1; } : LBRACK ( expression )? RBRACK )+ ;
-    public void newArrayDeclarator() throws RecognitionException {   
+    public void newArrayDeclarator() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:884:4: ( ( options {k=1; } : LBRACK ( expression )? RBRACK )+ )
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:884:4: ( options {k=1; } : LBRACK ( expression )? RBRACK )+
             {
-            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:884:4: ( options {k=1; } : LBRACK ( expression )? RBRACK )+
-            int cnt82=0;
-            loop82:
-            do {
-                int alt82=2;
-                int LA82_0 = input.LA(1);
-                if ( (LA82_0==LBRACK) ) {
-                    alt82=1;
-                }
+                // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:884:4: ( options {k=1; } : LBRACK ( expression )? RBRACK )+
+                int cnt82 = 0;
+                loop82 : do {
+                    int alt82 = 2;
+                    final int LA82_0 = this.input.LA( 1 );
+                    if ( (LA82_0 == LBRACK) ) {
+                        alt82 = 1;
+                    }
 
+                    switch ( alt82 ) {
+                        case 1 :
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:893:4: LBRACK ( expression )? RBRACK
+                        {
+                            match( this.input,
+                                   LBRACK,
+                                   FOLLOW_LBRACK_in_newArrayDeclarator3317 );
+                            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:894:5: ( expression )?
+                            int alt81 = 2;
+                            final int LA81_0 = this.input.LA( 1 );
+                            if ( (LA81_0 == IDENT || LA81_0 == LPAREN || (LA81_0 >= PLUS && LA81_0 <= MINUS) || (LA81_0 >= INC && LA81_0 <= NUM_FLOAT) || (LA81_0 >= 68 && LA81_0 <= 76) || (LA81_0 >= 93 && LA81_0 <= 94) || (LA81_0 >= 112 && LA81_0 <= 115)) ) {
+                                alt81 = 1;
+                            }
+                            switch ( alt81 ) {
+                                case 1 :
+                                    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:894:6: expression
+                                {
+                                    pushFollow( FOLLOW_expression_in_newArrayDeclarator3325 );
+                                    expression();
+                                    this._fsp--;
 
-                switch (alt82) {
-            	case 1 :
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:893:4: LBRACK ( expression )? RBRACK
-            	    {
-            	    match(input,LBRACK,FOLLOW_LBRACK_in_newArrayDeclarator3317); 
-            	    // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:894:5: ( expression )?
-            	    int alt81=2;
-            	    int LA81_0 = input.LA(1);
-            	    if ( (LA81_0==IDENT||LA81_0==LPAREN||(LA81_0>=PLUS && LA81_0<=MINUS)||(LA81_0>=INC && LA81_0<=NUM_FLOAT)||(LA81_0>=68 && LA81_0<=76)||(LA81_0>=93 && LA81_0<=94)||(LA81_0>=112 && LA81_0<=115)) ) {
-            	        alt81=1;
-            	    }
-            	    switch (alt81) {
-            	        case 1 :
-            	            // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:894:6: expression
-            	            {
-            	            pushFollow(FOLLOW_expression_in_newArrayDeclarator3325);
-            	            expression();
-            	            _fsp--;
+                                }
+                                    break;
 
+                            }
 
-            	            }
-            	            break;
+                            match( this.input,
+                                   RBRACK,
+                                   FOLLOW_RBRACK_in_newArrayDeclarator3332 );
 
-            	    }
+                        }
+                            break;
 
-            	    match(input,RBRACK,FOLLOW_RBRACK_in_newArrayDeclarator3332); 
+                        default :
+                            if ( cnt82 >= 1 ) {
+                                break loop82;
+                            }
+                            final EarlyExitException eee = new EarlyExitException( 82,
+                                                                             this.input );
+                            throw eee;
+                    }
+                    cnt82++;
+                } while ( true );
 
-            	    }
-            	    break;
-
-            	default :
-            	    if ( cnt82 >= 1 ) break loop82;
-                        EarlyExitException eee =
-                            new EarlyExitException(82, input);
-                        throw eee;
-                }
-                cnt82++;
-            } while (true);
-
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end newArrayDeclarator
 
-
     // $ANTLR start constant
     // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:899:1: constant : (NUM_INT|CHAR_LITERAL|STRING_LITERAL|NUM_FLOAT);
-    public void constant() throws RecognitionException {   
+    public void constant() throws RecognitionException {
         try {
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:900:2: ( (NUM_INT|CHAR_LITERAL|STRING_LITERAL|NUM_FLOAT))
             // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\semantics\\java\\parser\\JavaParser.g:900:4: (NUM_INT|CHAR_LITERAL|STRING_LITERAL|NUM_FLOAT)
             {
-            if ( (input.LA(1)>=NUM_INT && input.LA(1)<=NUM_FLOAT) ) {
-                input.consume();
-                errorRecovery=false;
-            }
-            else {
-                MismatchedSetException mse =
-                    new MismatchedSetException(null,input);
-                recoverFromMismatchedSet(input,mse,FOLLOW_set_in_constant3348);    throw mse;
-            }
+                if ( (this.input.LA( 1 ) >= NUM_INT && this.input.LA( 1 ) <= NUM_FLOAT) ) {
+                    this.input.consume();
+                    this.errorRecovery = false;
+                } else {
+                    final MismatchedSetException mse = new MismatchedSetException( null,
+                                                                             this.input );
+                    recoverFromMismatchedSet( this.input,
+                                              mse,
+                                              FOLLOW_set_in_constant3348 );
+                    throw mse;
+                }
 
-
             }
 
+        } catch ( final RecognitionException re ) {
+            reportError( re );
+            recover( this.input,
+                     re );
+        } finally {
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-       }
-        return ;
+        return;
     }
+
     // $ANTLR end constant
 
-
-    protected DFA41 dfa41 = new DFA41(this);
-    protected DFA45 dfa45 = new DFA45(this);
-    protected DFA65 dfa65 = new DFA65(this);
-    public static final String DFA41_eotS =
-        "\34\uffff";
-    public static final String DFA41_eofS =
-        "\34\uffff";
-    public static final String DFA41_minS =
-        "\1\6\1\uffff\1\6\2\4\14\uffff\1\6\4\uffff\1\6\2\5\3\4";
-    public static final String DFA41_maxS =
-        "\1\163\1\uffff\1\131\1\157\1\7\14\uffff\1\131\4\uffff\2\163\1\5"+
-        "\2\157\1\7";
-    public static final String DFA41_acceptS =
-        "\1\uffff\1\1\3\uffff\1\3\1\4\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1"+
-        "\15\1\16\1\17\1\uffff\1\21\1\20\1\2\1\5\6\uffff";
-    public static final String DFA41_specialS =
-        "\34\uffff}>";
+    protected DFA41              dfa41            = new DFA41( this );
+    protected DFA45              dfa45            = new DFA45( this );
+    protected DFA65              dfa65            = new DFA65( this );
+    public static final String   DFA41_eotS       = "\34\uffff";
+    public static final String   DFA41_eofS       = "\34\uffff";
+    public static final String   DFA41_minS       = "\1\6\1\uffff\1\6\2\4\14\uffff\1\6\4\uffff\1\6\2\5\3\4";
+    public static final String   DFA41_maxS       = "\1\163\1\uffff\1\131\1\157\1\7\14\uffff\1\131\4\uffff\2\163\1\5" + "\2\157\1\7";
+    public static final String   DFA41_acceptS    = "\1\uffff\1\1\3\uffff\1\3\1\4\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1" + "\15\1\16\1\17\1\uffff\1\21\1\20\1\2\1\5\6\uffff";
+    public static final String   DFA41_specialS   = "\34\uffff}>";
     public static final String[] DFA41_transition = {
-        "\1\3\2\uffff\1\1\1\22\2\uffff\1\5\35\uffff\2\5\2\uffff\10\5\15\uffff"+
-        "\11\4\11\21\1\2\2\21\1\6\3\uffff\2\5\1\uffff\1\7\1\uffff\1\10\1"+
-        "\11\1\12\1\13\1\14\1\15\1\16\1\20\2\uffff\1\17\3\uffff\4\5",
-        "",
-        "\1\24\6\uffff\1\23\66\uffff\11\24\14\21\1\6",
-        "\1\27\1\uffff\1\24\1\26\1\5\1\uffff\1\5\2\uffff\1\5\1\uffff\1\5"+
-        "\1\25\40\5\76\uffff\1\5",
-        "\1\30\1\uffff\1\24\1\5",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "",
-        "\1\24\75\uffff\11\24\14\21\1\6",
-        "",
-        "",
-        "",
-        "",
-        "\1\31\122\uffff\1\5\3\uffff\2\5\24\uffff\1\5",
-        "\1\32\1\5\6\uffff\1\5\35\uffff\2\5\2\uffff\10\5\15\uffff\11\5\20"+
-        "\uffff\2\5\21\uffff\4\5",
-        "\1\33",
-        "\1\27\1\uffff\1\24\1\26\1\5\1\uffff\1\5\2\uffff\1\5\1\uffff\1\5"+
-        "\1\uffff\40\5\76\uffff\1\5",
-        "\1\27\1\uffff\1\24\2\5\1\uffff\1\5\4\uffff\1\5\1\uffff\40\5\76\uffff"+
-        "\1\5",
-        "\1\30\1\uffff\1\24\1\5"
-    };
+            "\1\3\2\uffff\1\1\1\22\2\uffff\1\5\35\uffff\2\5\2\uffff\10\5\15\uffff" + "\11\4\11\21\1\2\2\21\1\6\3\uffff\2\5\1\uffff\1\7\1\uffff\1\10\1" + "\11\1\12\1\13\1\14\1\15\1\16\1\20\2\uffff\1\17\3\uffff\4\5", "",
+            "\1\24\6\uffff\1\23\66\uffff\11\24\14\21\1\6", "\1\27\1\uffff\1\24\1\26\1\5\1\uffff\1\5\2\uffff\1\5\1\uffff\1\5" + "\1\25\40\5\76\uffff\1\5", "\1\30\1\uffff\1\24\1\5", "", "", "", "", "", "", "", "", "", "", "", "",
+            "\1\24\75\uffff\11\24\14\21\1\6", "", "", "", "", "\1\31\122\uffff\1\5\3\uffff\2\5\24\uffff\1\5", "\1\32\1\5\6\uffff\1\5\35\uffff\2\5\2\uffff\10\5\15\uffff\11\5\20" + "\uffff\2\5\21\uffff\4\5", "\1\33",
+            "\1\27\1\uffff\1\24\1\26\1\5\1\uffff\1\5\2\uffff\1\5\1\uffff\1\5" + "\1\uffff\40\5\76\uffff\1\5", "\1\27\1\uffff\1\24\2\5\1\uffff\1\5\4\uffff\1\5\1\uffff\40\5\76\uffff" + "\1\5", "\1\30\1\uffff\1\24\1\5"};
 
     class DFA41 extends DFA {
-        public DFA41(BaseRecognizer recognizer) {
+        public DFA41(final BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 41;
-            this.eot = DFA.unpackEncodedString(DFA41_eotS);
-            this.eof = DFA.unpackEncodedString(DFA41_eofS);
-            this.min = DFA.unpackEncodedStringToUnsignedChars(DFA41_minS);
-            this.max = DFA.unpackEncodedStringToUnsignedChars(DFA41_maxS);
-            this.accept = DFA.unpackEncodedString(DFA41_acceptS);
-            this.special = DFA.unpackEncodedString(DFA41_specialS);
-            int numStates = DFA41_transition.length;
+            this.eot = DFA.unpackEncodedString( DFA41_eotS );
+            this.eof = DFA.unpackEncodedString( DFA41_eofS );
+            this.min = DFA.unpackEncodedStringToUnsignedChars( DFA41_minS );
+            this.max = DFA.unpackEncodedStringToUnsignedChars( DFA41_maxS );
+            this.accept = DFA.unpackEncodedString( DFA41_acceptS );
+            this.special = DFA.unpackEncodedString( DFA41_specialS );
+            final int numStates = DFA41_transition.length;
             this.transition = new short[numStates][];
-            for (int i=0; i<numStates; i++) {
-                transition[i] = DFA.unpackEncodedString(DFA41_transition[i]);
+            for ( int i = 0; i < numStates; i++ ) {
+                this.transition[i] = DFA.unpackEncodedString( DFA41_transition[i] );
             }
         }
+
         public String getDescription() {
             return "434:1: statement : ( compoundStatement | declaration SEMI | expression SEMI | modifiers classDefinition | IDENT COLON statement | 'if' LPAREN expression RPAREN statement ( 'else' statement )? | 'for' LPAREN forInit SEMI forCond SEMI forIter RPAREN statement | 'while' LPAREN expression RPAREN statement | 'do' statement 'while' LPAREN expression RPAREN SEMI | 'break' ( IDENT )? SEMI | 'continue' ( IDENT )? SEMI | 'return' ( expression )? SEMI | 'switch' LPAREN expression RPAREN LCURLY ( casesGroup )* RCURLY | tryBlock | 'throw' expression SEMI | 'synchronized' LPAREN expression RPAREN compoundStatement | SEMI );";
         }
     }
-    public static final String DFA45_eotS =
-        "\14\uffff";
-    public static final String DFA45_eofS =
-        "\14\uffff";
-    public static final String DFA45_minS =
-        "\1\6\1\uffff\2\4\2\uffff\1\6\2\5\3\4";
-    public static final String DFA45_maxS =
-        "\1\163\1\uffff\1\157\1\7\2\uffff\2\163\1\5\2\157\1\7";
-    public static final String DFA45_acceptS =
-        "\1\uffff\1\1\2\uffff\1\2\1\3\6\uffff";
-    public static final String DFA45_specialS =
-        "\14\uffff}>";
-    public static final String[] DFA45_transition = {
-        "\1\2\3\uffff\1\5\2\uffff\1\4\35\uffff\2\4\2\uffff\10\4\15\uffff"+
-        "\11\3\14\1\4\uffff\2\4\21\uffff\4\4",
-        "",
-        "\1\7\1\uffff\1\1\1\6\1\4\1\uffff\1\4\1\uffff\2\4\1\uffff\1\4\1\uffff"+
-        "\40\4\76\uffff\1\4",
-        "\1\10\1\uffff\1\1\1\4",
-        "",
-        "",
-        "\1\11\122\uffff\1\4\3\uffff\2\4\24\uffff\1\4",
-        "\1\12\1\4\6\uffff\1\4\35\uffff\2\4\2\uffff\10\4\15\uffff\11\4\20"+
-        "\uffff\2\4\21\uffff\4\4",
-        "\1\13",
-        "\1\7\1\uffff\1\1\1\6\1\4\1\uffff\1\4\1\uffff\2\4\1\uffff\1\4\1\uffff"+
-        "\40\4\76\uffff\1\4",
-        "\1\7\1\uffff\1\1\2\4\1\uffff\1\4\1\uffff\1\4\2\uffff\1\4\1\uffff"+
-        "\40\4\76\uffff\1\4",
-        "\1\10\1\uffff\1\1\1\4"
-    };
 
+    public static final String   DFA45_eotS       = "\14\uffff";
+    public static final String   DFA45_eofS       = "\14\uffff";
+    public static final String   DFA45_minS       = "\1\6\1\uffff\2\4\2\uffff\1\6\2\5\3\4";
+    public static final String   DFA45_maxS       = "\1\163\1\uffff\1\157\1\7\2\uffff\2\163\1\5\2\157\1\7";
+    public static final String   DFA45_acceptS    = "\1\uffff\1\1\2\uffff\1\2\1\3\6\uffff";
+    public static final String   DFA45_specialS   = "\14\uffff}>";
+    public static final String[] DFA45_transition = {"\1\2\3\uffff\1\5\2\uffff\1\4\35\uffff\2\4\2\uffff\10\4\15\uffff" + "\11\3\14\1\4\uffff\2\4\21\uffff\4\4", "",
+            "\1\7\1\uffff\1\1\1\6\1\4\1\uffff\1\4\1\uffff\2\4\1\uffff\1\4\1\uffff" + "\40\4\76\uffff\1\4", "\1\10\1\uffff\1\1\1\4", "", "", "\1\11\122\uffff\1\4\3\uffff\2\4\24\uffff\1\4",
+            "\1\12\1\4\6\uffff\1\4\35\uffff\2\4\2\uffff\10\4\15\uffff\11\4\20" + "\uffff\2\4\21\uffff\4\4", "\1\13", "\1\7\1\uffff\1\1\1\6\1\4\1\uffff\1\4\1\uffff\2\4\1\uffff\1\4\1\uffff" + "\40\4\76\uffff\1\4",
+            "\1\7\1\uffff\1\1\2\4\1\uffff\1\4\1\uffff\1\4\2\uffff\1\4\1\uffff" + "\40\4\76\uffff\1\4", "\1\10\1\uffff\1\1\1\4"};
+
     class DFA45 extends DFA {
-        public DFA45(BaseRecognizer recognizer) {
+        public DFA45(final BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 45;
-            this.eot = DFA.unpackEncodedString(DFA45_eotS);
-            this.eof = DFA.unpackEncodedString(DFA45_eofS);
-            this.min = DFA.unpackEncodedStringToUnsignedChars(DFA45_minS);
-            this.max = DFA.unpackEncodedStringToUnsignedChars(DFA45_maxS);
-            this.accept = DFA.unpackEncodedString(DFA45_acceptS);
-            this.special = DFA.unpackEncodedString(DFA45_specialS);
-            int numStates = DFA45_transition.length;
+            this.eot = DFA.unpackEncodedString( DFA45_eotS );
+            this.eof = DFA.unpackEncodedString( DFA45_eofS );
+            this.min = DFA.unpackEncodedStringToUnsignedChars( DFA45_minS );
+            this.max = DFA.unpackEncodedStringToUnsignedChars( DFA45_maxS );
+            this.accept = DFA.unpackEncodedString( DFA45_acceptS );
+            this.special = DFA.unpackEncodedString( DFA45_specialS );
+            final int numStates = DFA45_transition.length;
             this.transition = new short[numStates][];
-            for (int i=0; i<numStates; i++) {
-                transition[i] = DFA.unpackEncodedString(DFA45_transition[i]);
+            for ( int i = 0; i < numStates; i++ ) {
+                this.transition[i] = DFA.unpackEncodedString( DFA45_transition[i] );
             }
         }
+
         public String getDescription() {
             return "536:4: ( declaration | expressionList )?";
         }
     }
-    public static final String DFA65_eotS =
-        "\20\uffff";
-    public static final String DFA65_eofS =
-        "\20\uffff";
-    public static final String DFA65_minS =
-        "\1\6\2\uffff\1\6\1\uffff\2\4\1\6\1\5\1\4\1\5\1\uffff\2\4\1\uffff"+
-        "\1\4";
-    public static final String DFA65_maxS =
-        "\1\163\2\uffff\1\163\1\uffff\1\157\1\16\3\163\1\5\1\uffff\2\157"+
-        "\1\uffff\1\16";
-    public static final String DFA65_acceptS =
-        "\1\uffff\1\1\1\2\1\uffff\1\5\6\uffff\1\3\2\uffff\1\4\1\uffff";
-    public static final String DFA65_specialS =
-        "\20\uffff}>";
-    public static final String[] DFA65_transition = {
-        "\1\4\6\uffff\1\3\43\uffff\1\1\1\2\4\4\15\uffff\11\4\20\uffff\2\4"+
-        "\21\uffff\4\4",
-        "",
-        "",
-        "\1\5\6\uffff\1\4\35\uffff\2\4\2\uffff\10\4\15\uffff\11\6\20\uffff"+
-        "\2\4\21\uffff\4\4",
-        "",
-        "\1\10\2\uffff\1\7\1\4\4\uffff\1\4\1\11\1\4\1\uffff\40\4\76\uffff"+
-        "\1\4",
-        "\1\12\2\uffff\1\4\6\uffff\1\13",
-        "\1\14\122\uffff\1\4\3\uffff\2\4\24\uffff\1\4",
-        "\1\15\1\4\6\uffff\1\4\35\uffff\2\4\2\uffff\10\4\15\uffff\11\4\20"+
-        "\uffff\2\4\21\uffff\4\4",
-        "\2\4\1\16\2\4\1\uffff\3\4\1\16\43\4\6\16\15\uffff\11\16\20\uffff"+
-        "\2\16\20\uffff\1\4\4\16",
-        "\1\17",
-        "",
-        "\1\10\2\uffff\1\7\1\4\4\uffff\1\4\1\11\1\4\1\uffff\40\4\76\uffff"+
-        "\1\4",
-        "\1\10\2\uffff\2\4\5\uffff\1\11\1\4\1\uffff\40\4\76\uffff\1\4",
-        "",
-        "\1\12\2\uffff\1\4\6\uffff\1\13"
-    };
 
+    public static final String   DFA65_eotS       = "\20\uffff";
+    public static final String   DFA65_eofS       = "\20\uffff";
+    public static final String   DFA65_minS       = "\1\6\2\uffff\1\6\1\uffff\2\4\1\6\1\5\1\4\1\5\1\uffff\2\4\1\uffff" + "\1\4";
+    public static final String   DFA65_maxS       = "\1\163\2\uffff\1\163\1\uffff\1\157\1\16\3\163\1\5\1\uffff\2\157" + "\1\uffff\1\16";
+    public static final String   DFA65_acceptS    = "\1\uffff\1\1\1\2\1\uffff\1\5\6\uffff\1\3\2\uffff\1\4\1\uffff";
+    public static final String   DFA65_specialS   = "\20\uffff}>";
+    public static final String[] DFA65_transition = {"\1\4\6\uffff\1\3\43\uffff\1\1\1\2\4\4\15\uffff\11\4\20\uffff\2\4" + "\21\uffff\4\4", "", "", "\1\5\6\uffff\1\4\35\uffff\2\4\2\uffff\10\4\15\uffff\11\6\20\uffff" + "\2\4\21\uffff\4\4", "",
+            "\1\10\2\uffff\1\7\1\4\4\uffff\1\4\1\11\1\4\1\uffff\40\4\76\uffff" + "\1\4", "\1\12\2\uffff\1\4\6\uffff\1\13", "\1\14\122\uffff\1\4\3\uffff\2\4\24\uffff\1\4",
+            "\1\15\1\4\6\uffff\1\4\35\uffff\2\4\2\uffff\10\4\15\uffff\11\4\20" + "\uffff\2\4\21\uffff\4\4", "\2\4\1\16\2\4\1\uffff\3\4\1\16\43\4\6\16\15\uffff\11\16\20\uffff" + "\2\16\20\uffff\1\4\4\16", "\1\17", "",
+            "\1\10\2\uffff\1\7\1\4\4\uffff\1\4\1\11\1\4\1\uffff\40\4\76\uffff" + "\1\4", "\1\10\2\uffff\2\4\5\uffff\1\11\1\4\1\uffff\40\4\76\uffff\1\4", "", "\1\12\2\uffff\1\4\6\uffff\1\13"};
+
     class DFA65 extends DFA {
-        public DFA65(BaseRecognizer recognizer) {
+        public DFA65(final BaseRecognizer recognizer) {
             this.recognizer = recognizer;
             this.decisionNumber = 65;
-            this.eot = DFA.unpackEncodedString(DFA65_eotS);
-            this.eof = DFA.unpackEncodedString(DFA65_eofS);
-            this.min = DFA.unpackEncodedStringToUnsignedChars(DFA65_minS);
-            this.max = DFA.unpackEncodedStringToUnsignedChars(DFA65_maxS);
-            this.accept = DFA.unpackEncodedString(DFA65_acceptS);
-            this.special = DFA.unpackEncodedString(DFA65_specialS);
-            int numStates = DFA65_transition.length;
+            this.eot = DFA.unpackEncodedString( DFA65_eotS );
+            this.eof = DFA.unpackEncodedString( DFA65_eofS );
+            this.min = DFA.unpackEncodedStringToUnsignedChars( DFA65_minS );
+            this.max = DFA.unpackEncodedStringToUnsignedChars( DFA65_maxS );
+            this.accept = DFA.unpackEncodedString( DFA65_acceptS );
+            this.special = DFA.unpackEncodedString( DFA65_specialS );
+            final int numStates = DFA65_transition.length;
             this.transition = new short[numStates][];
-            for (int i=0; i<numStates; i++) {
-                transition[i] = DFA.unpackEncodedString(DFA65_transition[i]);
+            for ( int i = 0; i < numStates; i++ ) {
+                this.transition[i] = DFA.unpackEncodedString( DFA65_transition[i] );
             }
         }
+
         public String getDescription() {
             return "722:1: unaryExpressionNotPlusMinus : ( BNOT unaryExpression | LNOT unaryExpression | LPAREN builtInTypeSpec RPAREN unaryExpression | LPAREN classTypeSpec RPAREN unaryExpressionNotPlusMinus | postfixExpression );";
         }
     }
- 
 
-    public static final BitSet FOLLOW_modifiers_in_declaration59 = new BitSet(new long[]{0x0000000000000040L,0x0000000000001FF0L});
-    public static final BitSet FOLLOW_typeSpec_in_declaration61 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_variableDefinitions_in_declaration63 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_classTypeSpec_in_typeSpec79 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_builtInTypeSpec_in_typeSpec84 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_classTypeSpec97 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_LBRACK_in_classTypeSpec100 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RBRACK_in_classTypeSpec103 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_builtInType_in_builtInTypeSpec118 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_LBRACK_in_builtInTypeSpec121 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RBRACK_in_builtInTypeSpec124 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_identifier_in_type139 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_builtInType_in_type144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_set_in_builtInType156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IDENT_in_identifier209 = new BitSet(new long[]{0x0000000000000082L});
-    public static final BitSet FOLLOW_DOT_in_identifier214 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_IDENT_in_identifier216 = new BitSet(new long[]{0x0000000000000082L});
-    public static final BitSet FOLLOW_IDENT_in_identifierStar230 = new BitSet(new long[]{0x0000000000000082L});
-    public static final BitSet FOLLOW_DOT_in_identifierStar236 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_IDENT_in_identifierStar238 = new BitSet(new long[]{0x0000000000000082L});
-    public static final BitSet FOLLOW_DOT_in_identifierStar247 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_STAR_in_identifierStar249 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_modifier_in_modifiers270 = new BitSet(new long[]{0x0000000000000002L,0x0000000001FFE000L});
-    public static final BitSet FOLLOW_set_in_modifier288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_89_in_classDefinition356 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_IDENT_in_classDefinition358 = new BitSet(new long[]{0x0000000000000200L,0x0000000014000000L});
-    public static final BitSet FOLLOW_superClassClause_in_classDefinition365 = new BitSet(new long[]{0x0000000000000200L,0x0000000010000000L});
-    public static final BitSet FOLLOW_implementsClause_in_classDefinition372 = new BitSet(new long[]{0x0000000000000200L});
-    public static final BitSet FOLLOW_classBlock_in_classDefinition379 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_90_in_superClassClause392 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_identifier_in_superClassClause394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_91_in_interfaceDefinition412 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_IDENT_in_interfaceDefinition414 = new BitSet(new long[]{0x0000000000000200L,0x0000000004000000L});
-    public static final BitSet FOLLOW_interfaceExtends_in_interfaceDefinition421 = new BitSet(new long[]{0x0000000000000200L});
-    public static final BitSet FOLLOW_classBlock_in_interfaceDefinition428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LCURLY_in_classBlock442 = new BitSet(new long[]{0x0000000000000E40L,0x000000000BFFFFF0L});
-    public static final BitSet FOLLOW_field_in_classBlock449 = new BitSet(new long[]{0x0000000000000E40L,0x000000000BFFFFF0L});
-    public static final BitSet FOLLOW_SEMI_in_classBlock453 = new BitSet(new long[]{0x0000000000000E40L,0x000000000BFFFFF0L});
-    public static final BitSet FOLLOW_RCURLY_in_classBlock460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_90_in_interfaceExtends479 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_identifier_in_interfaceExtends483 = new BitSet(new long[]{0x0000000000001002L});
-    public static final BitSet FOLLOW_COMMA_in_interfaceExtends487 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_identifier_in_interfaceExtends489 = new BitSet(new long[]{0x0000000000001002L});
-    public static final BitSet FOLLOW_92_in_implementsClause514 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_identifier_in_implementsClause516 = new BitSet(new long[]{0x0000000000001002L});
-    public static final BitSet FOLLOW_COMMA_in_implementsClause520 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_identifier_in_implementsClause522 = new BitSet(new long[]{0x0000000000001002L});
-    public static final BitSet FOLLOW_modifiers_in_field548 = new BitSet(new long[]{0x0000000000000040L,0x000000000A001FF0L});
-    public static final BitSet FOLLOW_ctorHead_in_field554 = new BitSet(new long[]{0x0000000000000200L});
-    public static final BitSet FOLLOW_constructorBody_in_field556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_classDefinition_in_field568 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_interfaceDefinition_in_field586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_typeSpec_in_field600 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_IDENT_in_field609 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_LPAREN_in_field623 = new BitSet(new long[]{0x0000000000004040L,0x0000000000041FF0L});
-    public static final BitSet FOLLOW_parameterDeclarationList_in_field625 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_field627 = new BitSet(new long[]{0x0000000000000610L,0x0000000080000000L});
-    public static final BitSet FOLLOW_declaratorBrackets_in_field634 = new BitSet(new long[]{0x0000000000000600L,0x0000000080000000L});
-    public static final BitSet FOLLOW_throwsClause_in_field652 = new BitSet(new long[]{0x0000000000000600L});
-    public static final BitSet FOLLOW_compoundStatement_in_field663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_SEMI_in_field667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_variableDefinitions_in_field676 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_SEMI_in_field678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_field704 = new BitSet(new long[]{0x0000000000000200L});
-    public static final BitSet FOLLOW_compoundStatement_in_field706 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_compoundStatement_in_field720 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LCURLY_in_constructorBody739 = new BitSet(new long[]{0x007F980000002E40L,0x000F13FD61FFFFF0L});
-    public static final BitSet FOLLOW_explicitConstructorInvocation_in_constructorBody765 = new BitSet(new long[]{0x007F980000002E40L,0x000F13FD61FFFFF0L});
-    public static final BitSet FOLLOW_statement_in_constructorBody782 = new BitSet(new long[]{0x007F980000002E40L,0x000F13FD61FFFFF0L});
-    public static final BitSet FOLLOW_RCURLY_in_constructorBody794 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_93_in_explicitConstructorInvocation815 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_LPAREN_in_explicitConstructorInvocation817 = new BitSet(new long[]{0x007F980000006040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_argList_in_explicitConstructorInvocation819 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_explicitConstructorInvocation821 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_SEMI_in_explicitConstructorInvocation823 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_94_in_explicitConstructorInvocation836 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_LPAREN_in_explicitConstructorInvocation838 = new BitSet(new long[]{0x007F980000006040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_argList_in_explicitConstructorInvocation840 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_explicitConstructorInvocation842 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_SEMI_in_explicitConstructorInvocation844 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_variableDeclarator_in_variableDefinitions861 = new BitSet(new long[]{0x0000000000001002L});
-    public static final BitSet FOLLOW_COMMA_in_variableDefinitions867 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_variableDeclarator_in_variableDefinitions872 = new BitSet(new long[]{0x0000000000001002L});
-    public static final BitSet FOLLOW_IDENT_in_variableDeclarator890 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_declaratorBrackets_in_variableDeclarator892 = new BitSet(new long[]{0x0000000000008002L});
-    public static final BitSet FOLLOW_varInitializer_in_variableDeclarator894 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LBRACK_in_declaratorBrackets912 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RBRACK_in_declaratorBrackets915 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_ASSIGN_in_varInitializer930 = new BitSet(new long[]{0x007F980000002240L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_initializer_in_varInitializer932 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LCURLY_in_arrayInitializer947 = new BitSet(new long[]{0x007F980000002A40L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_initializer_in_arrayInitializer955 = new BitSet(new long[]{0x0000000000001800L});
-    public static final BitSet FOLLOW_COMMA_in_arrayInitializer992 = new BitSet(new long[]{0x007F980000002240L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_initializer_in_arrayInitializer994 = new BitSet(new long[]{0x0000000000001800L});
-    public static final BitSet FOLLOW_COMMA_in_arrayInitializer1008 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_RCURLY_in_arrayInitializer1020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_expression_in_initializer1034 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_arrayInitializer_in_initializer1039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IDENT_in_ctorHead1053 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_LPAREN_in_ctorHead1063 = new BitSet(new long[]{0x0000000000004040L,0x0000000000041FF0L});
-    public static final BitSet FOLLOW_parameterDeclarationList_in_ctorHead1065 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_ctorHead1067 = new BitSet(new long[]{0x0000000000000002L,0x0000000080000000L});
-    public static final BitSet FOLLOW_throwsClause_in_ctorHead1076 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_95_in_throwsClause1090 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_identifier_in_throwsClause1092 = new BitSet(new long[]{0x0000000000001002L});
-    public static final BitSet FOLLOW_COMMA_in_throwsClause1096 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_identifier_in_throwsClause1098 = new BitSet(new long[]{0x0000000000001002L});
-    public static final BitSet FOLLOW_parameterDeclaration_in_parameterDeclarationList1116 = new BitSet(new long[]{0x0000000000001002L});
-    public static final BitSet FOLLOW_COMMA_in_parameterDeclarationList1120 = new BitSet(new long[]{0x0000000000000040L,0x0000000000041FF0L});
-    public static final BitSet FOLLOW_parameterDeclaration_in_parameterDeclarationList1122 = new BitSet(new long[]{0x0000000000001002L});
-    public static final BitSet FOLLOW_parameterModifier_in_parameterDeclaration1140 = new BitSet(new long[]{0x0000000000000040L,0x0000000000001FF0L});
-    public static final BitSet FOLLOW_typeSpec_in_parameterDeclaration1142 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_IDENT_in_parameterDeclaration1144 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_declaratorBrackets_in_parameterDeclaration1148 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_82_in_parameterModifier1160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LCURLY_in_compoundStatement1185 = new BitSet(new long[]{0x007F980000002E40L,0x000F13FD61FFFFF0L});
-    public static final BitSet FOLLOW_statement_in_compoundStatement1196 = new BitSet(new long[]{0x007F980000002E40L,0x000F13FD61FFFFF0L});
-    public static final BitSet FOLLOW_RCURLY_in_compoundStatement1202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_compoundStatement_in_statement1216 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_declaration_in_statement1232 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_SEMI_in_statement1234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_expression_in_statement1246 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_SEMI_in_statement1248 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_modifiers_in_statement1256 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
-    public static final BitSet FOLLOW_classDefinition_in_statement1258 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IDENT_in_statement1266 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_COLON_in_statement1268 = new BitSet(new long[]{0x007F980000002640L,0x000F13FD61FFFFF0L});
-    public static final BitSet FOLLOW_statement_in_statement1271 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_96_in_statement1279 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_LPAREN_in_statement1281 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_expression_in_statement1283 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_statement1285 = new BitSet(new long[]{0x007F980000002640L,0x000F13FD61FFFFF0L});
-    public static final BitSet FOLLOW_statement_in_statement1287 = new BitSet(new long[]{0x0000000000000002L,0x0000000200000000L});
-    public static final BitSet FOLLOW_97_in_statement1308 = new BitSet(new long[]{0x007F980000002640L,0x000F13FD61FFFFF0L});
-    public static final BitSet FOLLOW_statement_in_statement1310 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_98_in_statement1323 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_LPAREN_in_statement1328 = new BitSet(new long[]{0x007F980000002440L,0x000F000061FFFFF0L});
-    public static final BitSet FOLLOW_forInit_in_statement1334 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_SEMI_in_statement1336 = new BitSet(new long[]{0x007F980000002440L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_forCond_in_statement1345 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_SEMI_in_statement1347 = new BitSet(new long[]{0x007F980000006040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_forIter_in_statement1356 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_statement1370 = new BitSet(new long[]{0x007F980000002640L,0x000F13FD61FFFFF0L});
-    public static final BitSet FOLLOW_statement_in_statement1375 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_99_in_statement1404 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_LPAREN_in_statement1406 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_expression_in_statement1408 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_statement1410 = new BitSet(new long[]{0x007F980000002640L,0x000F13FD61FFFFF0L});
-    public static final BitSet FOLLOW_statement_in_statement1412 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_100_in_statement1420 = new BitSet(new long[]{0x007F980000002640L,0x000F13FD61FFFFF0L});
-    public static final BitSet FOLLOW_statement_in_statement1422 = new BitSet(new long[]{0x0000000000000000L,0x0000000800000000L});
-    public static final BitSet FOLLOW_99_in_statement1424 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_LPAREN_in_statement1426 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_expression_in_statement1428 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_statement1430 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_SEMI_in_statement1432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_101_in_statement1440 = new BitSet(new long[]{0x0000000000000440L});
-    public static final BitSet FOLLOW_IDENT_in_statement1443 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_SEMI_in_statement1447 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_102_in_statement1455 = new BitSet(new long[]{0x0000000000000440L});
-    public static final BitSet FOLLOW_IDENT_in_statement1458 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_SEMI_in_statement1462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_103_in_statement1470 = new BitSet(new long[]{0x007F980000002440L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_expression_in_statement1473 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_SEMI_in_statement1477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_104_in_statement1485 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_LPAREN_in_statement1487 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_expression_in_statement1489 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_statement1491 = new BitSet(new long[]{0x0000000000000200L});
-    public static final BitSet FOLLOW_LCURLY_in_statement1493 = new BitSet(new long[]{0x0000000000000800L,0x00000C0000000000L});
-    public static final BitSet FOLLOW_casesGroup_in_statement1500 = new BitSet(new long[]{0x0000000000000800L,0x00000C0000000000L});
-    public static final BitSet FOLLOW_RCURLY_in_statement1507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_tryBlock_in_statement1515 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_105_in_statement1523 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_expression_in_statement1525 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_SEMI_in_statement1527 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_86_in_statement1535 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_LPAREN_in_statement1537 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_expression_in_statement1539 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_statement1541 = new BitSet(new long[]{0x0000000000000200L});
-    public static final BitSet FOLLOW_compoundStatement_in_statement1543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_SEMI_in_statement1556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_aCase_in_casesGroup1602 = new BitSet(new long[]{0x007F980000002642L,0x000F1FFD61FFFFF0L});
-    public static final BitSet FOLLOW_caseSList_in_casesGroup1611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_106_in_aCase1626 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_expression_in_aCase1628 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_107_in_aCase1632 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_COLON_in_aCase1635 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_statement_in_caseSList1647 = new BitSet(new long[]{0x007F980000002642L,0x000F13FD61FFFFF0L});
-    public static final BitSet FOLLOW_declaration_in_forInit1678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_expressionList_in_forInit1687 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_expression_in_forCond1707 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_expressionList_in_forIter1724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_108_in_tryBlock1741 = new BitSet(new long[]{0x0000000000000200L});
-    public static final BitSet FOLLOW_compoundStatement_in_tryBlock1743 = new BitSet(new long[]{0x0000000000000002L,0x0000600000000000L});
-    public static final BitSet FOLLOW_handler_in_tryBlock1748 = new BitSet(new long[]{0x0000000000000002L,0x0000600000000000L});
-    public static final BitSet FOLLOW_finallyClause_in_tryBlock1756 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_109_in_finallyClause1770 = new BitSet(new long[]{0x0000000000000200L});
-    public static final BitSet FOLLOW_compoundStatement_in_finallyClause1772 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_110_in_handler1784 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_LPAREN_in_handler1786 = new BitSet(new long[]{0x0000000000000040L,0x0000000000041FF0L});
-    public static final BitSet FOLLOW_parameterDeclaration_in_handler1788 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_handler1790 = new BitSet(new long[]{0x0000000000000200L});
-    public static final BitSet FOLLOW_compoundStatement_in_handler1792 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_assignmentExpression_in_expression1839 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_expression_in_expressionList1855 = new BitSet(new long[]{0x0000000000001002L});
-    public static final BitSet FOLLOW_COMMA_in_expressionList1858 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_expression_in_expressionList1860 = new BitSet(new long[]{0x0000000000001002L});
-    public static final BitSet FOLLOW_conditionalExpression_in_assignmentExpression1878 = new BitSet(new long[]{0x000000000FFE8002L});
-    public static final BitSet FOLLOW_set_in_assignmentExpression1886 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_assignmentExpression_in_assignmentExpression2103 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_logicalOrExpression_in_conditionalExpression2121 = new BitSet(new long[]{0x0000000010000002L});
-    public static final BitSet FOLLOW_QUESTION_in_conditionalExpression2127 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_assignmentExpression_in_conditionalExpression2129 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_COLON_in_conditionalExpression2131 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_conditionalExpression_in_conditionalExpression2133 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression2149 = new BitSet(new long[]{0x0000000020000002L});
-    public static final BitSet FOLLOW_LOR_in_logicalOrExpression2152 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression2154 = new BitSet(new long[]{0x0000000020000002L});
-    public static final BitSet FOLLOW_inclusiveOrExpression_in_logicalAndExpression2169 = new BitSet(new long[]{0x0000000040000002L});
-    public static final BitSet FOLLOW_LAND_in_logicalAndExpression2172 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_inclusiveOrExpression_in_logicalAndExpression2174 = new BitSet(new long[]{0x0000000040000002L});
-    public static final BitSet FOLLOW_exclusiveOrExpression_in_inclusiveOrExpression2189 = new BitSet(new long[]{0x0000000080000002L});
-    public static final BitSet FOLLOW_BOR_in_inclusiveOrExpression2192 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_exclusiveOrExpression_in_inclusiveOrExpression2194 = new BitSet(new long[]{0x0000000080000002L});
-    public static final BitSet FOLLOW_andExpression_in_exclusiveOrExpression2209 = new BitSet(new long[]{0x0000000100000002L});
-    public static final BitSet FOLLOW_BXOR_in_exclusiveOrExpression2212 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_andExpression_in_exclusiveOrExpression2214 = new BitSet(new long[]{0x0000000100000002L});
-    public static final BitSet FOLLOW_equalityExpression_in_andExpression2229 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_BAND_in_andExpression2232 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_equalityExpression_in_andExpression2234 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_relationalExpression_in_equalityExpression2249 = new BitSet(new long[]{0x0000000C00000002L});
-    public static final BitSet FOLLOW_set_in_equalityExpression2253 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_relationalExpression_in_equalityExpression2260 = new BitSet(new long[]{0x0000000C00000002L});
-    public static final BitSet FOLLOW_shiftExpression_in_relationalExpression2275 = new BitSet(new long[]{0x000000F000000002L,0x0000800000000000L});
-    public static final BitSet FOLLOW_set_in_relationalExpression2285 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_shiftExpression_in_relationalExpression2321 = new BitSet(new long[]{0x000000F000000002L});
-    public static final BitSet FOLLOW_111_in_relationalExpression2333 = new BitSet(new long[]{0x0000000000000040L,0x0000000000001FF0L});
-    public static final BitSet FOLLOW_typeSpec_in_relationalExpression2335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_additiveExpression_in_shiftExpression2352 = new BitSet(new long[]{0x0000070000000002L});
-    public static final BitSet FOLLOW_set_in_shiftExpression2356 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_additiveExpression_in_shiftExpression2367 = new BitSet(new long[]{0x0000070000000002L});
-    public static final BitSet FOLLOW_multiplicativeExpression_in_additiveExpression2382 = new BitSet(new long[]{0x0000180000000002L});
-    public static final BitSet FOLLOW_set_in_additiveExpression2386 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_multiplicativeExpression_in_additiveExpression2393 = new BitSet(new long[]{0x0000180000000002L});
-    public static final BitSet FOLLOW_unaryExpression_in_multiplicativeExpression2408 = new BitSet(new long[]{0x0000600000000102L});
-    public static final BitSet FOLLOW_set_in_multiplicativeExpression2412 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_unaryExpression_in_multiplicativeExpression2424 = new BitSet(new long[]{0x0000600000000102L});
-    public static final BitSet FOLLOW_INC_in_unaryExpression2437 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_unaryExpression_in_unaryExpression2439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DEC_in_unaryExpression2444 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_unaryExpression_in_unaryExpression2446 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_MINUS_in_unaryExpression2451 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_unaryExpression_in_unaryExpression2454 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_PLUS_in_unaryExpression2459 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_unaryExpression_in_unaryExpression2463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_unaryExpressionNotPlusMinus_in_unaryExpression2468 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_BNOT_in_unaryExpressionNotPlusMinus2479 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_unaryExpression_in_unaryExpressionNotPlusMinus2481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LNOT_in_unaryExpressionNotPlusMinus2486 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_unaryExpression_in_unaryExpressionNotPlusMinus2488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_unaryExpressionNotPlusMinus2499 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001FF0L});
-    public static final BitSet FOLLOW_builtInTypeSpec_in_unaryExpressionNotPlusMinus2501 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_unaryExpressionNotPlusMinus2503 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_unaryExpression_in_unaryExpressionNotPlusMinus2513 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_unaryExpressionNotPlusMinus2549 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_classTypeSpec_in_unaryExpressionNotPlusMinus2551 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_unaryExpressionNotPlusMinus2553 = new BitSet(new long[]{0x007E000000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_unaryExpressionNotPlusMinus_in_unaryExpressionNotPlusMinus2563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_postfixExpression_in_unaryExpressionNotPlusMinus2572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_primaryExpression_in_postfixExpression2586 = new BitSet(new long[]{0x0001800000000092L});
-    public static final BitSet FOLLOW_DOT_in_postfixExpression2594 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_IDENT_in_postfixExpression2596 = new BitSet(new long[]{0x0001800000002092L});
-    public static final BitSet FOLLOW_LPAREN_in_postfixExpression2603 = new BitSet(new long[]{0x007F980000006040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_argList_in_postfixExpression2610 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_postfixExpression2616 = new BitSet(new long[]{0x0001800000000092L});
-    public static final BitSet FOLLOW_DOT_in_postfixExpression2628 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_93_in_postfixExpression2630 = new BitSet(new long[]{0x0001800000000092L});
-    public static final BitSet FOLLOW_DOT_in_postfixExpression2637 = new BitSet(new long[]{0x0000000000000000L,0x0000000040000000L});
-    public static final BitSet FOLLOW_94_in_postfixExpression2639 = new BitSet(new long[]{0x0000000000002080L});
-    public static final BitSet FOLLOW_LPAREN_in_postfixExpression2674 = new BitSet(new long[]{0x007F980000006040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_argList_in_postfixExpression2676 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_postfixExpression2678 = new BitSet(new long[]{0x0001800000000092L});
-    public static final BitSet FOLLOW_DOT_in_postfixExpression2704 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_IDENT_in_postfixExpression2706 = new BitSet(new long[]{0x0001800000002092L});
-    public static final BitSet FOLLOW_LPAREN_in_postfixExpression2726 = new BitSet(new long[]{0x007F980000006040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_argList_in_postfixExpression2749 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_postfixExpression2771 = new BitSet(new long[]{0x0001800000000092L});
-    public static final BitSet FOLLOW_DOT_in_postfixExpression2810 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
-    public static final BitSet FOLLOW_newExpression_in_postfixExpression2812 = new BitSet(new long[]{0x0001800000000092L});
-    public static final BitSet FOLLOW_LBRACK_in_postfixExpression2818 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_expression_in_postfixExpression2821 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RBRACK_in_postfixExpression2823 = new BitSet(new long[]{0x0001800000000092L});
-    public static final BitSet FOLLOW_set_in_postfixExpression2854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identPrimary_in_primaryExpression2881 = new BitSet(new long[]{0x0000000000000082L});
-    public static final BitSet FOLLOW_DOT_in_primaryExpression2893 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
-    public static final BitSet FOLLOW_89_in_primaryExpression2895 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_constant_in_primaryExpression2908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_112_in_primaryExpression2913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_113_in_primaryExpression2918 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_114_in_primaryExpression2923 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_newExpression_in_primaryExpression2933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_93_in_primaryExpression2938 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_94_in_primaryExpression2943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LPAREN_in_primaryExpression2948 = new BitSet(new long[]{0x007F980000002040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_assignmentExpression_in_primaryExpression2950 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_primaryExpression2952 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_builtInType_in_primaryExpression2960 = new BitSet(new long[]{0x0000000000000090L});
-    public static final BitSet FOLLOW_LBRACK_in_primaryExpression2966 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RBRACK_in_primaryExpression2969 = new BitSet(new long[]{0x0000000000000090L});
-    public static final BitSet FOLLOW_DOT_in_primaryExpression2976 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
-    public static final BitSet FOLLOW_89_in_primaryExpression2978 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IDENT_in_identPrimary2993 = new BitSet(new long[]{0x0000000000002092L});
-    public static final BitSet FOLLOW_DOT_in_identPrimary3031 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_IDENT_in_identPrimary3033 = new BitSet(new long[]{0x0000000000002092L});
-    public static final BitSet FOLLOW_LPAREN_in_identPrimary3095 = new BitSet(new long[]{0x007F980000006040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_argList_in_identPrimary3098 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_identPrimary3100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LBRACK_in_identPrimary3133 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RBRACK_in_identPrimary3136 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_115_in_newExpression3172 = new BitSet(new long[]{0x0000000000000040L,0x0000000000001FF0L});
-    public static final BitSet FOLLOW_type_in_newExpression3174 = new BitSet(new long[]{0x0000000000002010L});
-    public static final BitSet FOLLOW_LPAREN_in_newExpression3180 = new BitSet(new long[]{0x007F980000006040L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_argList_in_newExpression3182 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_RPAREN_in_newExpression3184 = new BitSet(new long[]{0x0000000000000202L});
-    public static final BitSet FOLLOW_classBlock_in_newExpression3187 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_newArrayDeclarator_in_newExpression3225 = new BitSet(new long[]{0x0000000000000202L});
-    public static final BitSet FOLLOW_arrayInitializer_in_newExpression3228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_expressionList_in_argList3247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LBRACK_in_newArrayDeclarator3317 = new BitSet(new long[]{0x007F980000002060L,0x000F000060001FF0L});
-    public static final BitSet FOLLOW_expression_in_newArrayDeclarator3325 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_RBRACK_in_newArrayDeclarator3332 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_set_in_constant3348 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_modifiers_in_declaration59                                     = new BitSet( new long[]{0x0000000000000040L, 0x0000000000001FF0L} );
+    public static final BitSet FOLLOW_typeSpec_in_declaration61                                      = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_variableDefinitions_in_declaration63                           = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_classTypeSpec_in_typeSpec79                                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_builtInTypeSpec_in_typeSpec84                                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_identifier_in_classTypeSpec97                                  = new BitSet( new long[]{0x0000000000000012L} );
+    public static final BitSet FOLLOW_LBRACK_in_classTypeSpec100                                     = new BitSet( new long[]{0x0000000000000020L} );
+    public static final BitSet FOLLOW_RBRACK_in_classTypeSpec103                                     = new BitSet( new long[]{0x0000000000000012L} );
+    public static final BitSet FOLLOW_builtInType_in_builtInTypeSpec118                              = new BitSet( new long[]{0x0000000000000012L} );
+    public static final BitSet FOLLOW_LBRACK_in_builtInTypeSpec121                                   = new BitSet( new long[]{0x0000000000000020L} );
+    public static final BitSet FOLLOW_RBRACK_in_builtInTypeSpec124                                   = new BitSet( new long[]{0x0000000000000012L} );
+    public static final BitSet FOLLOW_identifier_in_type139                                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_builtInType_in_type144                                         = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_set_in_builtInType156                                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_IDENT_in_identifier209                                         = new BitSet( new long[]{0x0000000000000082L} );
+    public static final BitSet FOLLOW_DOT_in_identifier214                                           = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_IDENT_in_identifier216                                         = new BitSet( new long[]{0x0000000000000082L} );
+    public static final BitSet FOLLOW_IDENT_in_identifierStar230                                     = new BitSet( new long[]{0x0000000000000082L} );
+    public static final BitSet FOLLOW_DOT_in_identifierStar236                                       = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_IDENT_in_identifierStar238                                     = new BitSet( new long[]{0x0000000000000082L} );
+    public static final BitSet FOLLOW_DOT_in_identifierStar247                                       = new BitSet( new long[]{0x0000000000000100L} );
+    public static final BitSet FOLLOW_STAR_in_identifierStar249                                      = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_modifier_in_modifiers270                                       = new BitSet( new long[]{0x0000000000000002L, 0x0000000001FFE000L} );
+    public static final BitSet FOLLOW_set_in_modifier288                                             = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_89_in_classDefinition356                                       = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_IDENT_in_classDefinition358                                    = new BitSet( new long[]{0x0000000000000200L, 0x0000000014000000L} );
+    public static final BitSet FOLLOW_superClassClause_in_classDefinition365                         = new BitSet( new long[]{0x0000000000000200L, 0x0000000010000000L} );
+    public static final BitSet FOLLOW_implementsClause_in_classDefinition372                         = new BitSet( new long[]{0x0000000000000200L} );
+    public static final BitSet FOLLOW_classBlock_in_classDefinition379                               = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_90_in_superClassClause392                                      = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_identifier_in_superClassClause394                              = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_91_in_interfaceDefinition412                                   = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_IDENT_in_interfaceDefinition414                                = new BitSet( new long[]{0x0000000000000200L, 0x0000000004000000L} );
+    public static final BitSet FOLLOW_interfaceExtends_in_interfaceDefinition421                     = new BitSet( new long[]{0x0000000000000200L} );
+    public static final BitSet FOLLOW_classBlock_in_interfaceDefinition428                           = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LCURLY_in_classBlock442                                        = new BitSet( new long[]{0x0000000000000E40L, 0x000000000BFFFFF0L} );
+    public static final BitSet FOLLOW_field_in_classBlock449                                         = new BitSet( new long[]{0x0000000000000E40L, 0x000000000BFFFFF0L} );
+    public static final BitSet FOLLOW_SEMI_in_classBlock453                                          = new BitSet( new long[]{0x0000000000000E40L, 0x000000000BFFFFF0L} );
+    public static final BitSet FOLLOW_RCURLY_in_classBlock460                                        = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_90_in_interfaceExtends479                                      = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_identifier_in_interfaceExtends483                              = new BitSet( new long[]{0x0000000000001002L} );
+    public static final BitSet FOLLOW_COMMA_in_interfaceExtends487                                   = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_identifier_in_interfaceExtends489                              = new BitSet( new long[]{0x0000000000001002L} );
+    public static final BitSet FOLLOW_92_in_implementsClause514                                      = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_identifier_in_implementsClause516                              = new BitSet( new long[]{0x0000000000001002L} );
+    public static final BitSet FOLLOW_COMMA_in_implementsClause520                                   = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_identifier_in_implementsClause522                              = new BitSet( new long[]{0x0000000000001002L} );
+    public static final BitSet FOLLOW_modifiers_in_field548                                          = new BitSet( new long[]{0x0000000000000040L, 0x000000000A001FF0L} );
+    public static final BitSet FOLLOW_ctorHead_in_field554                                           = new BitSet( new long[]{0x0000000000000200L} );
+    public static final BitSet FOLLOW_constructorBody_in_field556                                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_classDefinition_in_field568                                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_interfaceDefinition_in_field586                                = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_typeSpec_in_field600                                           = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_IDENT_in_field609                                              = new BitSet( new long[]{0x0000000000002000L} );
+    public static final BitSet FOLLOW_LPAREN_in_field623                                             = new BitSet( new long[]{0x0000000000004040L, 0x0000000000041FF0L} );
+    public static final BitSet FOLLOW_parameterDeclarationList_in_field625                           = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_field627                                             = new BitSet( new long[]{0x0000000000000610L, 0x0000000080000000L} );
+    public static final BitSet FOLLOW_declaratorBrackets_in_field634                                 = new BitSet( new long[]{0x0000000000000600L, 0x0000000080000000L} );
+    public static final BitSet FOLLOW_throwsClause_in_field652                                       = new BitSet( new long[]{0x0000000000000600L} );
+    public static final BitSet FOLLOW_compoundStatement_in_field663                                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_SEMI_in_field667                                               = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_variableDefinitions_in_field676                                = new BitSet( new long[]{0x0000000000000400L} );
+    public static final BitSet FOLLOW_SEMI_in_field678                                               = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_80_in_field704                                                 = new BitSet( new long[]{0x0000000000000200L} );
+    public static final BitSet FOLLOW_compoundStatement_in_field706                                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_compoundStatement_in_field720                                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LCURLY_in_constructorBody739                                   = new BitSet( new long[]{0x007F980000002E40L, 0x000F13FD61FFFFF0L} );
+    public static final BitSet FOLLOW_explicitConstructorInvocation_in_constructorBody765            = new BitSet( new long[]{0x007F980000002E40L, 0x000F13FD61FFFFF0L} );
+    public static final BitSet FOLLOW_statement_in_constructorBody782                                = new BitSet( new long[]{0x007F980000002E40L, 0x000F13FD61FFFFF0L} );
+    public static final BitSet FOLLOW_RCURLY_in_constructorBody794                                   = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_93_in_explicitConstructorInvocation815                         = new BitSet( new long[]{0x0000000000002000L} );
+    public static final BitSet FOLLOW_LPAREN_in_explicitConstructorInvocation817                     = new BitSet( new long[]{0x007F980000006040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_argList_in_explicitConstructorInvocation819                    = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_explicitConstructorInvocation821                     = new BitSet( new long[]{0x0000000000000400L} );
+    public static final BitSet FOLLOW_SEMI_in_explicitConstructorInvocation823                       = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_94_in_explicitConstructorInvocation836                         = new BitSet( new long[]{0x0000000000002000L} );
+    public static final BitSet FOLLOW_LPAREN_in_explicitConstructorInvocation838                     = new BitSet( new long[]{0x007F980000006040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_argList_in_explicitConstructorInvocation840                    = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_explicitConstructorInvocation842                     = new BitSet( new long[]{0x0000000000000400L} );
+    public static final BitSet FOLLOW_SEMI_in_explicitConstructorInvocation844                       = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_variableDeclarator_in_variableDefinitions861                   = new BitSet( new long[]{0x0000000000001002L} );
+    public static final BitSet FOLLOW_COMMA_in_variableDefinitions867                                = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_variableDeclarator_in_variableDefinitions872                   = new BitSet( new long[]{0x0000000000001002L} );
+    public static final BitSet FOLLOW_IDENT_in_variableDeclarator890                                 = new BitSet( new long[]{0x0000000000008012L} );
+    public static final BitSet FOLLOW_declaratorBrackets_in_variableDeclarator892                    = new BitSet( new long[]{0x0000000000008002L} );
+    public static final BitSet FOLLOW_varInitializer_in_variableDeclarator894                        = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LBRACK_in_declaratorBrackets912                                = new BitSet( new long[]{0x0000000000000020L} );
+    public static final BitSet FOLLOW_RBRACK_in_declaratorBrackets915                                = new BitSet( new long[]{0x0000000000000012L} );
+    public static final BitSet FOLLOW_ASSIGN_in_varInitializer930                                    = new BitSet( new long[]{0x007F980000002240L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_initializer_in_varInitializer932                               = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LCURLY_in_arrayInitializer947                                  = new BitSet( new long[]{0x007F980000002A40L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_initializer_in_arrayInitializer955                             = new BitSet( new long[]{0x0000000000001800L} );
+    public static final BitSet FOLLOW_COMMA_in_arrayInitializer992                                   = new BitSet( new long[]{0x007F980000002240L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_initializer_in_arrayInitializer994                             = new BitSet( new long[]{0x0000000000001800L} );
+    public static final BitSet FOLLOW_COMMA_in_arrayInitializer1008                                  = new BitSet( new long[]{0x0000000000000800L} );
+    public static final BitSet FOLLOW_RCURLY_in_arrayInitializer1020                                 = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_expression_in_initializer1034                                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_arrayInitializer_in_initializer1039                            = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_IDENT_in_ctorHead1053                                          = new BitSet( new long[]{0x0000000000002000L} );
+    public static final BitSet FOLLOW_LPAREN_in_ctorHead1063                                         = new BitSet( new long[]{0x0000000000004040L, 0x0000000000041FF0L} );
+    public static final BitSet FOLLOW_parameterDeclarationList_in_ctorHead1065                       = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_ctorHead1067                                         = new BitSet( new long[]{0x0000000000000002L, 0x0000000080000000L} );
+    public static final BitSet FOLLOW_throwsClause_in_ctorHead1076                                   = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_95_in_throwsClause1090                                         = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_identifier_in_throwsClause1092                                 = new BitSet( new long[]{0x0000000000001002L} );
+    public static final BitSet FOLLOW_COMMA_in_throwsClause1096                                      = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_identifier_in_throwsClause1098                                 = new BitSet( new long[]{0x0000000000001002L} );
+    public static final BitSet FOLLOW_parameterDeclaration_in_parameterDeclarationList1116           = new BitSet( new long[]{0x0000000000001002L} );
+    public static final BitSet FOLLOW_COMMA_in_parameterDeclarationList1120                          = new BitSet( new long[]{0x0000000000000040L, 0x0000000000041FF0L} );
+    public static final BitSet FOLLOW_parameterDeclaration_in_parameterDeclarationList1122           = new BitSet( new long[]{0x0000000000001002L} );
+    public static final BitSet FOLLOW_parameterModifier_in_parameterDeclaration1140                  = new BitSet( new long[]{0x0000000000000040L, 0x0000000000001FF0L} );
+    public static final BitSet FOLLOW_typeSpec_in_parameterDeclaration1142                           = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_IDENT_in_parameterDeclaration1144                              = new BitSet( new long[]{0x0000000000000012L} );
+    public static final BitSet FOLLOW_declaratorBrackets_in_parameterDeclaration1148                 = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_82_in_parameterModifier1160                                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LCURLY_in_compoundStatement1185                                = new BitSet( new long[]{0x007F980000002E40L, 0x000F13FD61FFFFF0L} );
+    public static final BitSet FOLLOW_statement_in_compoundStatement1196                             = new BitSet( new long[]{0x007F980000002E40L, 0x000F13FD61FFFFF0L} );
+    public static final BitSet FOLLOW_RCURLY_in_compoundStatement1202                                = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_compoundStatement_in_statement1216                             = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_declaration_in_statement1232                                   = new BitSet( new long[]{0x0000000000000400L} );
+    public static final BitSet FOLLOW_SEMI_in_statement1234                                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_expression_in_statement1246                                    = new BitSet( new long[]{0x0000000000000400L} );
+    public static final BitSet FOLLOW_SEMI_in_statement1248                                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_modifiers_in_statement1256                                     = new BitSet( new long[]{0x0000000000000000L, 0x0000000002000000L} );
+    public static final BitSet FOLLOW_classDefinition_in_statement1258                               = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_IDENT_in_statement1266                                         = new BitSet( new long[]{0x0000000000010000L} );
+    public static final BitSet FOLLOW_COLON_in_statement1268                                         = new BitSet( new long[]{0x007F980000002640L, 0x000F13FD61FFFFF0L} );
+    public static final BitSet FOLLOW_statement_in_statement1271                                     = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_96_in_statement1279                                            = new BitSet( new long[]{0x0000000000002000L} );
+    public static final BitSet FOLLOW_LPAREN_in_statement1281                                        = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_expression_in_statement1283                                    = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_statement1285                                        = new BitSet( new long[]{0x007F980000002640L, 0x000F13FD61FFFFF0L} );
+    public static final BitSet FOLLOW_statement_in_statement1287                                     = new BitSet( new long[]{0x0000000000000002L, 0x0000000200000000L} );
+    public static final BitSet FOLLOW_97_in_statement1308                                            = new BitSet( new long[]{0x007F980000002640L, 0x000F13FD61FFFFF0L} );
+    public static final BitSet FOLLOW_statement_in_statement1310                                     = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_98_in_statement1323                                            = new BitSet( new long[]{0x0000000000002000L} );
+    public static final BitSet FOLLOW_LPAREN_in_statement1328                                        = new BitSet( new long[]{0x007F980000002440L, 0x000F000061FFFFF0L} );
+    public static final BitSet FOLLOW_forInit_in_statement1334                                       = new BitSet( new long[]{0x0000000000000400L} );
+    public static final BitSet FOLLOW_SEMI_in_statement1336                                          = new BitSet( new long[]{0x007F980000002440L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_forCond_in_statement1345                                       = new BitSet( new long[]{0x0000000000000400L} );
+    public static final BitSet FOLLOW_SEMI_in_statement1347                                          = new BitSet( new long[]{0x007F980000006040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_forIter_in_statement1356                                       = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_statement1370                                        = new BitSet( new long[]{0x007F980000002640L, 0x000F13FD61FFFFF0L} );
+    public static final BitSet FOLLOW_statement_in_statement1375                                     = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_99_in_statement1404                                            = new BitSet( new long[]{0x0000000000002000L} );
+    public static final BitSet FOLLOW_LPAREN_in_statement1406                                        = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_expression_in_statement1408                                    = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_statement1410                                        = new BitSet( new long[]{0x007F980000002640L, 0x000F13FD61FFFFF0L} );
+    public static final BitSet FOLLOW_statement_in_statement1412                                     = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_100_in_statement1420                                           = new BitSet( new long[]{0x007F980000002640L, 0x000F13FD61FFFFF0L} );
+    public static final BitSet FOLLOW_statement_in_statement1422                                     = new BitSet( new long[]{0x0000000000000000L, 0x0000000800000000L} );
+    public static final BitSet FOLLOW_99_in_statement1424                                            = new BitSet( new long[]{0x0000000000002000L} );
+    public static final BitSet FOLLOW_LPAREN_in_statement1426                                        = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_expression_in_statement1428                                    = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_statement1430                                        = new BitSet( new long[]{0x0000000000000400L} );
+    public static final BitSet FOLLOW_SEMI_in_statement1432                                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_101_in_statement1440                                           = new BitSet( new long[]{0x0000000000000440L} );
+    public static final BitSet FOLLOW_IDENT_in_statement1443                                         = new BitSet( new long[]{0x0000000000000400L} );
+    public static final BitSet FOLLOW_SEMI_in_statement1447                                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_102_in_statement1455                                           = new BitSet( new long[]{0x0000000000000440L} );
+    public static final BitSet FOLLOW_IDENT_in_statement1458                                         = new BitSet( new long[]{0x0000000000000400L} );
+    public static final BitSet FOLLOW_SEMI_in_statement1462                                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_103_in_statement1470                                           = new BitSet( new long[]{0x007F980000002440L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_expression_in_statement1473                                    = new BitSet( new long[]{0x0000000000000400L} );
+    public static final BitSet FOLLOW_SEMI_in_statement1477                                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_104_in_statement1485                                           = new BitSet( new long[]{0x0000000000002000L} );
+    public static final BitSet FOLLOW_LPAREN_in_statement1487                                        = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_expression_in_statement1489                                    = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_statement1491                                        = new BitSet( new long[]{0x0000000000000200L} );
+    public static final BitSet FOLLOW_LCURLY_in_statement1493                                        = new BitSet( new long[]{0x0000000000000800L, 0x00000C0000000000L} );
+    public static final BitSet FOLLOW_casesGroup_in_statement1500                                    = new BitSet( new long[]{0x0000000000000800L, 0x00000C0000000000L} );
+    public static final BitSet FOLLOW_RCURLY_in_statement1507                                        = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_tryBlock_in_statement1515                                      = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_105_in_statement1523                                           = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_expression_in_statement1525                                    = new BitSet( new long[]{0x0000000000000400L} );
+    public static final BitSet FOLLOW_SEMI_in_statement1527                                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_86_in_statement1535                                            = new BitSet( new long[]{0x0000000000002000L} );
+    public static final BitSet FOLLOW_LPAREN_in_statement1537                                        = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_expression_in_statement1539                                    = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_statement1541                                        = new BitSet( new long[]{0x0000000000000200L} );
+    public static final BitSet FOLLOW_compoundStatement_in_statement1543                             = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_SEMI_in_statement1556                                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_aCase_in_casesGroup1602                                        = new BitSet( new long[]{0x007F980000002642L, 0x000F1FFD61FFFFF0L} );
+    public static final BitSet FOLLOW_caseSList_in_casesGroup1611                                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_106_in_aCase1626                                               = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_expression_in_aCase1628                                        = new BitSet( new long[]{0x0000000000010000L} );
+    public static final BitSet FOLLOW_107_in_aCase1632                                               = new BitSet( new long[]{0x0000000000010000L} );
+    public static final BitSet FOLLOW_COLON_in_aCase1635                                             = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_statement_in_caseSList1647                                     = new BitSet( new long[]{0x007F980000002642L, 0x000F13FD61FFFFF0L} );
+    public static final BitSet FOLLOW_declaration_in_forInit1678                                     = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_expressionList_in_forInit1687                                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_expression_in_forCond1707                                      = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_expressionList_in_forIter1724                                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_108_in_tryBlock1741                                            = new BitSet( new long[]{0x0000000000000200L} );
+    public static final BitSet FOLLOW_compoundStatement_in_tryBlock1743                              = new BitSet( new long[]{0x0000000000000002L, 0x0000600000000000L} );
+    public static final BitSet FOLLOW_handler_in_tryBlock1748                                        = new BitSet( new long[]{0x0000000000000002L, 0x0000600000000000L} );
+    public static final BitSet FOLLOW_finallyClause_in_tryBlock1756                                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_109_in_finallyClause1770                                       = new BitSet( new long[]{0x0000000000000200L} );
+    public static final BitSet FOLLOW_compoundStatement_in_finallyClause1772                         = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_110_in_handler1784                                             = new BitSet( new long[]{0x0000000000002000L} );
+    public static final BitSet FOLLOW_LPAREN_in_handler1786                                          = new BitSet( new long[]{0x0000000000000040L, 0x0000000000041FF0L} );
+    public static final BitSet FOLLOW_parameterDeclaration_in_handler1788                            = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_handler1790                                          = new BitSet( new long[]{0x0000000000000200L} );
+    public static final BitSet FOLLOW_compoundStatement_in_handler1792                               = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_assignmentExpression_in_expression1839                         = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_expression_in_expressionList1855                               = new BitSet( new long[]{0x0000000000001002L} );
+    public static final BitSet FOLLOW_COMMA_in_expressionList1858                                    = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_expression_in_expressionList1860                               = new BitSet( new long[]{0x0000000000001002L} );
+    public static final BitSet FOLLOW_conditionalExpression_in_assignmentExpression1878              = new BitSet( new long[]{0x000000000FFE8002L} );
+    public static final BitSet FOLLOW_set_in_assignmentExpression1886                                = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_assignmentExpression_in_assignmentExpression2103               = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_logicalOrExpression_in_conditionalExpression2121               = new BitSet( new long[]{0x0000000010000002L} );
+    public static final BitSet FOLLOW_QUESTION_in_conditionalExpression2127                          = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_assignmentExpression_in_conditionalExpression2129              = new BitSet( new long[]{0x0000000000010000L} );
+    public static final BitSet FOLLOW_COLON_in_conditionalExpression2131                             = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_conditionalExpression_in_conditionalExpression2133             = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression2149                = new BitSet( new long[]{0x0000000020000002L} );
+    public static final BitSet FOLLOW_LOR_in_logicalOrExpression2152                                 = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_logicalAndExpression_in_logicalOrExpression2154                = new BitSet( new long[]{0x0000000020000002L} );
+    public static final BitSet FOLLOW_inclusiveOrExpression_in_logicalAndExpression2169              = new BitSet( new long[]{0x0000000040000002L} );
+    public static final BitSet FOLLOW_LAND_in_logicalAndExpression2172                               = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_inclusiveOrExpression_in_logicalAndExpression2174              = new BitSet( new long[]{0x0000000040000002L} );
+    public static final BitSet FOLLOW_exclusiveOrExpression_in_inclusiveOrExpression2189             = new BitSet( new long[]{0x0000000080000002L} );
+    public static final BitSet FOLLOW_BOR_in_inclusiveOrExpression2192                               = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_exclusiveOrExpression_in_inclusiveOrExpression2194             = new BitSet( new long[]{0x0000000080000002L} );
+    public static final BitSet FOLLOW_andExpression_in_exclusiveOrExpression2209                     = new BitSet( new long[]{0x0000000100000002L} );
+    public static final BitSet FOLLOW_BXOR_in_exclusiveOrExpression2212                              = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_andExpression_in_exclusiveOrExpression2214                     = new BitSet( new long[]{0x0000000100000002L} );
+    public static final BitSet FOLLOW_equalityExpression_in_andExpression2229                        = new BitSet( new long[]{0x0000000200000002L} );
+    public static final BitSet FOLLOW_BAND_in_andExpression2232                                      = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_equalityExpression_in_andExpression2234                        = new BitSet( new long[]{0x0000000200000002L} );
+    public static final BitSet FOLLOW_relationalExpression_in_equalityExpression2249                 = new BitSet( new long[]{0x0000000C00000002L} );
+    public static final BitSet FOLLOW_set_in_equalityExpression2253                                  = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_relationalExpression_in_equalityExpression2260                 = new BitSet( new long[]{0x0000000C00000002L} );
+    public static final BitSet FOLLOW_shiftExpression_in_relationalExpression2275                    = new BitSet( new long[]{0x000000F000000002L, 0x0000800000000000L} );
+    public static final BitSet FOLLOW_set_in_relationalExpression2285                                = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_shiftExpression_in_relationalExpression2321                    = new BitSet( new long[]{0x000000F000000002L} );
+    public static final BitSet FOLLOW_111_in_relationalExpression2333                                = new BitSet( new long[]{0x0000000000000040L, 0x0000000000001FF0L} );
+    public static final BitSet FOLLOW_typeSpec_in_relationalExpression2335                           = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_additiveExpression_in_shiftExpression2352                      = new BitSet( new long[]{0x0000070000000002L} );
+    public static final BitSet FOLLOW_set_in_shiftExpression2356                                     = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_additiveExpression_in_shiftExpression2367                      = new BitSet( new long[]{0x0000070000000002L} );
+    public static final BitSet FOLLOW_multiplicativeExpression_in_additiveExpression2382             = new BitSet( new long[]{0x0000180000000002L} );
+    public static final BitSet FOLLOW_set_in_additiveExpression2386                                  = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_multiplicativeExpression_in_additiveExpression2393             = new BitSet( new long[]{0x0000180000000002L} );
+    public static final BitSet FOLLOW_unaryExpression_in_multiplicativeExpression2408                = new BitSet( new long[]{0x0000600000000102L} );
+    public static final BitSet FOLLOW_set_in_multiplicativeExpression2412                            = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_unaryExpression_in_multiplicativeExpression2424                = new BitSet( new long[]{0x0000600000000102L} );
+    public static final BitSet FOLLOW_INC_in_unaryExpression2437                                     = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_unaryExpression_in_unaryExpression2439                         = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_DEC_in_unaryExpression2444                                     = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_unaryExpression_in_unaryExpression2446                         = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_MINUS_in_unaryExpression2451                                   = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_unaryExpression_in_unaryExpression2454                         = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_PLUS_in_unaryExpression2459                                    = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_unaryExpression_in_unaryExpression2463                         = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_unaryExpressionNotPlusMinus_in_unaryExpression2468             = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_BNOT_in_unaryExpressionNotPlusMinus2479                        = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_unaryExpression_in_unaryExpressionNotPlusMinus2481             = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LNOT_in_unaryExpressionNotPlusMinus2486                        = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_unaryExpression_in_unaryExpressionNotPlusMinus2488             = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LPAREN_in_unaryExpressionNotPlusMinus2499                      = new BitSet( new long[]{0x0000000000000000L, 0x0000000000001FF0L} );
+    public static final BitSet FOLLOW_builtInTypeSpec_in_unaryExpressionNotPlusMinus2501             = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_unaryExpressionNotPlusMinus2503                      = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_unaryExpression_in_unaryExpressionNotPlusMinus2513             = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LPAREN_in_unaryExpressionNotPlusMinus2549                      = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_classTypeSpec_in_unaryExpressionNotPlusMinus2551               = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_unaryExpressionNotPlusMinus2553                      = new BitSet( new long[]{0x007E000000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_unaryExpressionNotPlusMinus_in_unaryExpressionNotPlusMinus2563 = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_postfixExpression_in_unaryExpressionNotPlusMinus2572           = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_primaryExpression_in_postfixExpression2586                     = new BitSet( new long[]{0x0001800000000092L} );
+    public static final BitSet FOLLOW_DOT_in_postfixExpression2594                                   = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_IDENT_in_postfixExpression2596                                 = new BitSet( new long[]{0x0001800000002092L} );
+    public static final BitSet FOLLOW_LPAREN_in_postfixExpression2603                                = new BitSet( new long[]{0x007F980000006040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_argList_in_postfixExpression2610                               = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_postfixExpression2616                                = new BitSet( new long[]{0x0001800000000092L} );
+    public static final BitSet FOLLOW_DOT_in_postfixExpression2628                                   = new BitSet( new long[]{0x0000000000000000L, 0x0000000020000000L} );
+    public static final BitSet FOLLOW_93_in_postfixExpression2630                                    = new BitSet( new long[]{0x0001800000000092L} );
+    public static final BitSet FOLLOW_DOT_in_postfixExpression2637                                   = new BitSet( new long[]{0x0000000000000000L, 0x0000000040000000L} );
+    public static final BitSet FOLLOW_94_in_postfixExpression2639                                    = new BitSet( new long[]{0x0000000000002080L} );
+    public static final BitSet FOLLOW_LPAREN_in_postfixExpression2674                                = new BitSet( new long[]{0x007F980000006040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_argList_in_postfixExpression2676                               = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_postfixExpression2678                                = new BitSet( new long[]{0x0001800000000092L} );
+    public static final BitSet FOLLOW_DOT_in_postfixExpression2704                                   = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_IDENT_in_postfixExpression2706                                 = new BitSet( new long[]{0x0001800000002092L} );
+    public static final BitSet FOLLOW_LPAREN_in_postfixExpression2726                                = new BitSet( new long[]{0x007F980000006040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_argList_in_postfixExpression2749                               = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_postfixExpression2771                                = new BitSet( new long[]{0x0001800000000092L} );
+    public static final BitSet FOLLOW_DOT_in_postfixExpression2810                                   = new BitSet( new long[]{0x0000000000000000L, 0x0008000000000000L} );
+    public static final BitSet FOLLOW_newExpression_in_postfixExpression2812                         = new BitSet( new long[]{0x0001800000000092L} );
+    public static final BitSet FOLLOW_LBRACK_in_postfixExpression2818                                = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_expression_in_postfixExpression2821                            = new BitSet( new long[]{0x0000000000000020L} );
+    public static final BitSet FOLLOW_RBRACK_in_postfixExpression2823                                = new BitSet( new long[]{0x0001800000000092L} );
+    public static final BitSet FOLLOW_set_in_postfixExpression2854                                   = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_identPrimary_in_primaryExpression2881                          = new BitSet( new long[]{0x0000000000000082L} );
+    public static final BitSet FOLLOW_DOT_in_primaryExpression2893                                   = new BitSet( new long[]{0x0000000000000000L, 0x0000000002000000L} );
+    public static final BitSet FOLLOW_89_in_primaryExpression2895                                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_constant_in_primaryExpression2908                              = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_112_in_primaryExpression2913                                   = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_113_in_primaryExpression2918                                   = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_114_in_primaryExpression2923                                   = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_newExpression_in_primaryExpression2933                         = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_93_in_primaryExpression2938                                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_94_in_primaryExpression2943                                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LPAREN_in_primaryExpression2948                                = new BitSet( new long[]{0x007F980000002040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_assignmentExpression_in_primaryExpression2950                  = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_primaryExpression2952                                = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_builtInType_in_primaryExpression2960                           = new BitSet( new long[]{0x0000000000000090L} );
+    public static final BitSet FOLLOW_LBRACK_in_primaryExpression2966                                = new BitSet( new long[]{0x0000000000000020L} );
+    public static final BitSet FOLLOW_RBRACK_in_primaryExpression2969                                = new BitSet( new long[]{0x0000000000000090L} );
+    public static final BitSet FOLLOW_DOT_in_primaryExpression2976                                   = new BitSet( new long[]{0x0000000000000000L, 0x0000000002000000L} );
+    public static final BitSet FOLLOW_89_in_primaryExpression2978                                    = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_IDENT_in_identPrimary2993                                      = new BitSet( new long[]{0x0000000000002092L} );
+    public static final BitSet FOLLOW_DOT_in_identPrimary3031                                        = new BitSet( new long[]{0x0000000000000040L} );
+    public static final BitSet FOLLOW_IDENT_in_identPrimary3033                                      = new BitSet( new long[]{0x0000000000002092L} );
+    public static final BitSet FOLLOW_LPAREN_in_identPrimary3095                                     = new BitSet( new long[]{0x007F980000006040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_argList_in_identPrimary3098                                    = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_identPrimary3100                                     = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LBRACK_in_identPrimary3133                                     = new BitSet( new long[]{0x0000000000000020L} );
+    public static final BitSet FOLLOW_RBRACK_in_identPrimary3136                                     = new BitSet( new long[]{0x0000000000000012L} );
+    public static final BitSet FOLLOW_115_in_newExpression3172                                       = new BitSet( new long[]{0x0000000000000040L, 0x0000000000001FF0L} );
+    public static final BitSet FOLLOW_type_in_newExpression3174                                      = new BitSet( new long[]{0x0000000000002010L} );
+    public static final BitSet FOLLOW_LPAREN_in_newExpression3180                                    = new BitSet( new long[]{0x007F980000006040L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_argList_in_newExpression3182                                   = new BitSet( new long[]{0x0000000000004000L} );
+    public static final BitSet FOLLOW_RPAREN_in_newExpression3184                                    = new BitSet( new long[]{0x0000000000000202L} );
+    public static final BitSet FOLLOW_classBlock_in_newExpression3187                                = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_newArrayDeclarator_in_newExpression3225                        = new BitSet( new long[]{0x0000000000000202L} );
+    public static final BitSet FOLLOW_arrayInitializer_in_newExpression3228                          = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_expressionList_in_argList3247                                  = new BitSet( new long[]{0x0000000000000002L} );
+    public static final BitSet FOLLOW_LBRACK_in_newArrayDeclarator3317                               = new BitSet( new long[]{0x007F980000002060L, 0x000F000060001FF0L} );
+    public static final BitSet FOLLOW_expression_in_newArrayDeclarator3325                           = new BitSet( new long[]{0x0000000000000020L} );
+    public static final BitSet FOLLOW_RBRACK_in_newArrayDeclarator3332                               = new BitSet( new long[]{0x0000000000000012L} );
+    public static final BitSet FOLLOW_set_in_constant3348                                            = new BitSet( new long[]{0x0000000000000002L} );
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -4,30 +4,27 @@
 
 import org.drools.base.mvel.DroolsMVELFactory;
 import org.drools.base.mvel.MVELConsequence;
-import org.drools.base.mvel.MVELEvalExpression;
 import org.drools.lang.descr.RuleDescr;
-import org.drools.rule.EvalCondition;
 import org.drools.rule.builder.BuildContext;
 import org.drools.rule.builder.ConsequenceBuilder;
 import org.drools.rule.builder.dialect.java.BuildUtils;
-import org.drools.spi.Consequence;
 import org.mvel.MVEL;
 
 public class MVELConsequenceBuilder
     implements
     ConsequenceBuilder {
 
-    public void build(BuildContext context,
-                      BuildUtils utils,
-                      RuleDescr ruleDescr) {
+    public void build(final BuildContext context,
+                      final BuildUtils utils,
+                      final RuleDescr ruleDescr) {
         // pushing consequence LHS into the stack for variable resolution
         context.getBuildStack().push( context.getRule().getLhs() );
 
-        DroolsMVELFactory factory = new DroolsMVELFactory();
+        final DroolsMVELFactory factory = new DroolsMVELFactory();
         factory.setPreviousDeclarationMap( context.getDeclarationResolver().getDeclarations() );
         factory.setGlobalsMap( context.getPkg().getGlobals() );
 
-        Serializable expr = MVEL.compileExpression( (String) ruleDescr.getConsequence() );
+        final Serializable expr = MVEL.compileExpression( (String) ruleDescr.getConsequence() );
 
         context.getRule().setConsequence( new MVELConsequence( expr,
                                                                factory ) );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -17,9 +17,6 @@
 package org.drools.rule.builder.dialect.mvel;
 
 import java.io.Serializable;
-import java.util.List;
-
-import org.antlr.stringtemplate.StringTemplate;
 import org.drools.base.mvel.DroolsMVELFactory;
 import org.drools.base.mvel.MVELEvalExpression;
 import org.drools.lang.descr.BaseDescr;
@@ -31,7 +28,6 @@
 import org.drools.rule.builder.ColumnBuilder;
 import org.drools.rule.builder.ConditionalElementBuilder;
 import org.drools.rule.builder.dialect.java.BuildUtils;
-import org.drools.spi.DeclarationScopeResolver;
 import org.mvel.MVEL;
 
 /**
@@ -57,27 +53,28 @@
                                     final ColumnBuilder columnBuilder,
                                     final BaseDescr descr) {
         // it must be an EvalDescr
-        EvalDescr evalDescr = (EvalDescr) descr;
+        final EvalDescr evalDescr = (EvalDescr) descr;
 
         final Declaration[] declarations = new Declaration[0];
-//        final List[] usedIdentifiers = utils.getUsedIdentifiers( context,
-//                                                                 evalDescr,
-//                                                                 evalDescr.getText() );
-//
-//        final Declaration[] declarations = new Declaration[usedIdentifiers[0].size()];
-//        for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
-//            declarations[i] = (Declaration) context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
-//        }
+        //        final List[] usedIdentifiers = utils.getUsedIdentifiers( context,
+        //                                                                 evalDescr,
+        //                                                                 evalDescr.getText() );
+        //
+        //        final Declaration[] declarations = new Declaration[usedIdentifiers[0].size()];
+        //        for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
+        //            declarations[i] = (Declaration) context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
+        //        }
 
-        DroolsMVELFactory factory = new DroolsMVELFactory( );
+        final DroolsMVELFactory factory = new DroolsMVELFactory();
         factory.setPreviousDeclarationMap( context.getDeclarationResolver().getDeclarations() );
-        factory.setGlobalsMap( context.getPkg().getGlobals() );        
-        
-        Serializable expr = MVEL.compileExpression( (String) evalDescr.getContent() );       
+        factory.setGlobalsMap( context.getPkg().getGlobals() );
+
+        final Serializable expr = MVEL.compileExpression( (String) evalDescr.getContent() );
         final EvalCondition eval = new EvalCondition( declarations );
-        eval.setEvalExpression( new MVELEvalExpression(expr,factory) );
-        
+        eval.setEvalExpression( new MVELEvalExpression( expr,
+                                                        factory ) );
+
         return eval;
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -33,8 +33,6 @@
 import org.drools.rule.builder.FromBuilder;
 import org.drools.rule.builder.dialect.java.BuildUtils;
 import org.drools.spi.DataProvider;
-import org.mvel.CompiledExpression;
-import org.mvel.ExpressionParser;
 import org.mvel.MVEL;
 
 /**
@@ -44,7 +42,8 @@
  */
 public class MVELFromBuilder
     implements
-    ConditionalElementBuilder, FromBuilder {
+    ConditionalElementBuilder,
+    FromBuilder {
 
     /* (non-Javadoc)
      * @see org.drools.dialect.mvel.FromBuilder#build(org.drools.semantics.java.builder.BuildContext, org.drools.semantics.java.builder.BuildUtils, org.drools.semantics.java.builder.ColumnBuilder, org.drools.lang.descr.BaseDescr)
@@ -53,7 +52,7 @@
                                     final BuildUtils utils,
                                     final ColumnBuilder columnBuilder,
                                     final BaseDescr descr) {
-        FromDescr fromDescr = (FromDescr) descr;
+        final FromDescr fromDescr = (FromDescr) descr;
 
         final Column column = columnBuilder.build( context,
                                                    utils,
@@ -63,17 +62,17 @@
             return null;
         }
 
-        AccessorDescr accessor = (AccessorDescr) fromDescr.getDataSource();
+        final AccessorDescr accessor = (AccessorDescr) fromDescr.getDataSource();
         DataProvider dataProvider = null;
         try {
-//            JFDIParser parser = createParser( utils,
-//                                              accessor.toString() );
-            DroolsMVELFactory factory = new DroolsMVELFactory( );
+            //            JFDIParser parser = createParser( utils,
+            //                                              accessor.toString() );
+            final DroolsMVELFactory factory = new DroolsMVELFactory();
             factory.setPreviousDeclarationMap( context.getDeclarationResolver().getDeclarations() );
             factory.setGlobalsMap( context.getPkg().getGlobals() );
-            
+
             //parser.setValueHandlerFactory( factory );
-            Serializable compiled = MVEL.compileExpression( accessor.toString() );
+            final Serializable compiled = MVEL.compileExpression( accessor.toString() );
 
             dataProvider = new MVELDataProvider( compiled,
                                                  factory );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -21,24 +21,14 @@
 import java.util.List;
 import java.util.Map;
 
-import org.antlr.stringtemplate.StringTemplate;
 import org.drools.base.mvel.DroolsMVELFactory;
-import org.drools.base.mvel.MVELEvalExpression;
 import org.drools.base.mvel.MVELPredicateExpression;
-import org.drools.lang.descr.BaseDescr;
-import org.drools.lang.descr.EvalDescr;
 import org.drools.lang.descr.PredicateDescr;
-import org.drools.rule.ConditionalElement;
 import org.drools.rule.Declaration;
-import org.drools.rule.EvalCondition;
 import org.drools.rule.PredicateConstraint;
 import org.drools.rule.builder.BuildContext;
-import org.drools.rule.builder.ColumnBuilder;
-import org.drools.rule.builder.ConditionalElementBuilder;
 import org.drools.rule.builder.PredicateBuilder;
 import org.drools.rule.builder.dialect.java.BuildUtils;
-import org.drools.spi.BetaNodeFieldConstraint;
-import org.drools.spi.DeclarationScopeResolver;
 import org.mvel.MVEL;
 
 /**
@@ -58,33 +48,36 @@
                       final PredicateDescr predicateDescr) {
 
         //final Declaration[] declarations = new Declaration[0];
-//        final List[] usedIdentifiers = utils.getUsedIdentifiers( context,
-//                                                                 evalDescr,
-//                                                                 evalDescr.getText() );
-//
-//        final Declaration[] declarations = new Declaration[usedIdentifiers[0].size()];
-//        for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
-//            declarations[i] = (Declaration) context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
-//        }
-        
-        DroolsMVELFactory factory = new DroolsMVELFactory( );
-        
+        //        final List[] usedIdentifiers = utils.getUsedIdentifiers( context,
+        //                                                                 evalDescr,
+        //                                                                 evalDescr.getText() );
+        //
+        //        final Declaration[] declarations = new Declaration[usedIdentifiers[0].size()];
+        //        for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
+        //            declarations[i] = (Declaration) context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
+        //        }
+
+        final DroolsMVELFactory factory = new DroolsMVELFactory();
+
         Map map = new HashMap();
         for ( int i = 0, length = previousDeclarations.length; i < length; i++ ) {
-            map.put( previousDeclarations[i].getIdentifier(), previousDeclarations[i] );
-        }        
+            map.put( previousDeclarations[i].getIdentifier(),
+                     previousDeclarations[i] );
+        }
         factory.setPreviousDeclarationMap( map );
-        
+
         map = new HashMap();
         for ( int i = 0, length = localDeclarations.length; i < length; i++ ) {
-            map.put( localDeclarations[i].getIdentifier(), localDeclarations[i] );
-        }                
+            map.put( localDeclarations[i].getIdentifier(),
+                     localDeclarations[i] );
+        }
         factory.setLocalDeclarationMap( map );
-        
-        factory.setGlobalsMap( context.getPkg().getGlobals() );        
-        
-        Serializable expr = MVEL.compileExpression( (String) predicateDescr.getContent() );
-        predicate.setPredicateExpression( new MVELPredicateExpression(expr,factory) );        
+
+        factory.setGlobalsMap( context.getPkg().getGlobals() );
+
+        final Serializable expr = MVEL.compileExpression( (String) predicateDescr.getContent() );
+        predicate.setPredicateExpression( new MVELPredicateExpression( expr,
+                                                                       factory ) );
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -21,28 +21,17 @@
 import java.util.List;
 import java.util.Map;
 
-import org.antlr.stringtemplate.StringTemplate;
 import org.drools.base.mvel.DroolsMVELFactory;
-import org.drools.base.mvel.MVELEvalExpression;
 import org.drools.base.mvel.MVELPredicateExpression;
 import org.drools.base.mvel.MVELReturnValueExpression;
-import org.drools.lang.descr.BaseDescr;
-import org.drools.lang.descr.EvalDescr;
 import org.drools.lang.descr.PredicateDescr;
 import org.drools.lang.descr.ReturnValueRestrictionDescr;
-import org.drools.rule.ConditionalElement;
 import org.drools.rule.Declaration;
-import org.drools.rule.EvalCondition;
 import org.drools.rule.PredicateConstraint;
 import org.drools.rule.ReturnValueRestriction;
 import org.drools.rule.builder.BuildContext;
-import org.drools.rule.builder.ColumnBuilder;
-import org.drools.rule.builder.ConditionalElementBuilder;
-import org.drools.rule.builder.PredicateBuilder;
 import org.drools.rule.builder.ReturnValueBuilder;
 import org.drools.rule.builder.dialect.java.BuildUtils;
-import org.drools.spi.BetaNodeFieldConstraint;
-import org.drools.spi.DeclarationScopeResolver;
 import org.mvel.MVEL;
 
 /**
@@ -60,26 +49,29 @@
                       final Declaration[] localDeclarations,
                       final ReturnValueRestriction returnValueRestriction,
                       final ReturnValueRestrictionDescr returnValueRestrictionDescr) {
-        DroolsMVELFactory factory = new DroolsMVELFactory( );
-        
+        final DroolsMVELFactory factory = new DroolsMVELFactory();
+
         Map map = new HashMap();
         for ( int i = 0, length = previousDeclarations.length; i < length; i++ ) {
-            map.put( previousDeclarations[i].getIdentifier(), previousDeclarations[i] );
-        }        
+            map.put( previousDeclarations[i].getIdentifier(),
+                     previousDeclarations[i] );
+        }
         factory.setPreviousDeclarationMap( map );
-        
+
         map = new HashMap();
         for ( int i = 0, length = localDeclarations.length; i < length; i++ ) {
-            map.put( localDeclarations[i].getIdentifier(), localDeclarations[i] );
-        }                
+            map.put( localDeclarations[i].getIdentifier(),
+                     localDeclarations[i] );
+        }
         factory.setLocalDeclarationMap( map );
-        
-        factory.setGlobalsMap( context.getPkg().getGlobals() );        
-        
-        Serializable expr = MVEL.compileExpression( (String) returnValueRestrictionDescr.getContent() );
-        returnValueRestriction.setReturnValueExpression( new MVELReturnValueExpression(expr,factory) );        
+
+        factory.setGlobalsMap( context.getPkg().getGlobals() );
+
+        final Serializable expr = MVEL.compileExpression( (String) returnValueRestrictionDescr.getContent() );
+        returnValueRestriction.setReturnValueExpression( new MVELReturnValueExpression( expr,
+                                                                                        factory ) );
     }
-    
+
     public void build(final BuildContext context,
                       final BuildUtils utils,
                       final List[] usedIdentifiers,
@@ -89,33 +81,36 @@
                       final PredicateDescr predicateDescr) {
 
         //final Declaration[] declarations = new Declaration[0];
-//        final List[] usedIdentifiers = utils.getUsedIdentifiers( context,
-//                                                                 evalDescr,
-//                                                                 evalDescr.getText() );
-//
-//        final Declaration[] declarations = new Declaration[usedIdentifiers[0].size()];
-//        for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
-//            declarations[i] = (Declaration) context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
-//        }
-        
-        DroolsMVELFactory factory = new DroolsMVELFactory( );
-        
+        //        final List[] usedIdentifiers = utils.getUsedIdentifiers( context,
+        //                                                                 evalDescr,
+        //                                                                 evalDescr.getText() );
+        //
+        //        final Declaration[] declarations = new Declaration[usedIdentifiers[0].size()];
+        //        for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
+        //            declarations[i] = (Declaration) context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
+        //        }
+
+        final DroolsMVELFactory factory = new DroolsMVELFactory();
+
         Map map = new HashMap();
         for ( int i = 0, length = previousDeclarations.length; i < length; i++ ) {
-            map.put( previousDeclarations[i].getIdentifier(), previousDeclarations[i] );
-        }        
+            map.put( previousDeclarations[i].getIdentifier(),
+                     previousDeclarations[i] );
+        }
         factory.setPreviousDeclarationMap( map );
-        
+
         map = new HashMap();
         for ( int i = 0, length = localDeclarations.length; i < length; i++ ) {
-            map.put( localDeclarations[i].getIdentifier(), localDeclarations[i] );
-        }                
+            map.put( localDeclarations[i].getIdentifier(),
+                     localDeclarations[i] );
+        }
         factory.setLocalDeclarationMap( map );
-        
-        factory.setGlobalsMap( context.getPkg().getGlobals() );        
-        
-        Serializable expr = MVEL.compileExpression( (String) predicateDescr.getContent() );
-        predicate.setPredicateExpression( new MVELPredicateExpression(expr,factory) );        
+
+        factory.setGlobalsMap( context.getPkg().getGlobals() );
+
+        final Serializable expr = MVEL.compileExpression( (String) predicateDescr.getContent() );
+        predicate.setPredicateExpression( new MVELPredicateExpression( expr,
+                                                                       factory ) );
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/util/ArrayUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/util/ArrayUtils.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/util/ArrayUtils.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,4 +1,5 @@
 package org.drools.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +17,6 @@
  * limitations under the License.
  */
 
-
 /**
  * Taken from commons lang
  * 
@@ -43,9 +43,9 @@
  */
 public class ArrayUtils {
     // Taken from commons ArrayUtils
-    
+
     public static final int INDEX_NOT_FOUND = -1;
-    
+
     /**
      * <p>Checks if the object is in the given array.</p>
      *
@@ -55,13 +55,15 @@
      * @param objectToFind  the object to find
      * @return <code>true</code> if the array contains the object
      */
-    public static boolean contains(Object[] array, Object objectToFind) {
-        return indexOf(array, objectToFind) != INDEX_NOT_FOUND;
-    }    
-    
+    public static boolean contains(final Object[] array,
+                                   final Object objectToFind) {
+        return indexOf( array,
+                        objectToFind ) != INDEX_NOT_FOUND;
+    }
+
     // IndexOf search
     // ----------------------------------------------------------------------
-    
+
     // Object IndexOf
     //-----------------------------------------------------------------------
     /**
@@ -74,8 +76,11 @@
      * @return the index of the object within the array, 
      *  {@link #INDEX_NOT_FOUND} (<code>-1</code>) if not found or <code>null</code> array input
      */
-    public static int indexOf(Object[] array, Object objectToFind) {
-        return indexOf(array, objectToFind, 0);
+    public static int indexOf(final Object[] array,
+                              final Object objectToFind) {
+        return indexOf( array,
+                        objectToFind,
+                        0 );
     }
 
     /**
@@ -92,22 +97,24 @@
      * @return the index of the object within the array starting at the index,
      *  {@link #INDEX_NOT_FOUND} (<code>-1</code>) if not found or <code>null</code> array input
      */
-    public static int indexOf(Object[] array, Object objectToFind, int startIndex) {
-        if (array == null) {
+    public static int indexOf(final Object[] array,
+                              final Object objectToFind,
+                              int startIndex) {
+        if ( array == null ) {
             return INDEX_NOT_FOUND;
         }
-        if (startIndex < 0) {
+        if ( startIndex < 0 ) {
             startIndex = 0;
         }
-        if (objectToFind == null) {
-            for (int i = startIndex; i < array.length; i++) {
-                if (array[i] == null) {
+        if ( objectToFind == null ) {
+            for ( int i = startIndex; i < array.length; i++ ) {
+                if ( array[i] == null ) {
                     return i;
                 }
             }
         } else {
-            for (int i = startIndex; i < array.length; i++) {
-                if (objectToFind.equals(array[i])) {
+            for ( int i = startIndex; i < array.length; i++ ) {
+                if ( objectToFind.equals( array[i] ) ) {
                     return i;
                 }
             }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/util/StringUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/util/StringUtils.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/util/StringUtils.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -17,10 +17,7 @@
  * limitations under the License.
  */
 
-
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -120,12 +117,12 @@
  * @version $Id$
  */
 public class StringUtils {
-    
+
     /**
      * An empty immutable <code>String</code> array.
      */
     public static final String[] EMPTY_STRING_ARRAY = new String[0];
-    
+
     // Performance testing notes (JDK 1.4, Jul03, scolebourne)
     // Whitespace:
     // Character.isWhitespace() is faster than WHITESPACE.indexOf()
@@ -146,18 +143,18 @@
      * The empty String <code>""</code>.
      * @since 2.0
      */
-    public static final String EMPTY = "";
+    public static final String   EMPTY              = "";
 
     /**
      * Represents a failed index search.
      * @since 2.1
      */
-    public static final int INDEX_NOT_FOUND = -1;
+    public static final int      INDEX_NOT_FOUND    = -1;
 
     /**
      * <p>The maximum size to which the padding constant(s) can expand.</p>
      */
-    private static final int PAD_LIMIT = 8192;
+    private static final int     PAD_LIMIT          = 8192;
 
     /**
      * <p><code>StringUtils</code> instances should NOT be constructed in
@@ -191,10 +188,10 @@
      * @param str  the String to check, may be null
      * @return <code>true</code> if the String is empty or null
      */
-    public static boolean isEmpty(String str) {
+    public static boolean isEmpty(final String str) {
         return str == null || str.length() == 0;
     }
-    
+
     // Padding
     //-----------------------------------------------------------------------
     /**
@@ -215,49 +212,51 @@
      * @return a new String consisting of the original String repeated,
      *  <code>null</code> if null String input
      */
-    public static String repeat(String str, int repeat) {
+    public static String repeat(final String str,
+                                final int repeat) {
         // Performance tuned for 2.0 (JDK1.4)
 
-        if (str == null) {
+        if ( str == null ) {
             return null;
         }
-        if (repeat <= 0) {
+        if ( repeat <= 0 ) {
             return EMPTY;
         }
-        int inputLength = str.length();
-        if (repeat == 1 || inputLength == 0) {
+        final int inputLength = str.length();
+        if ( repeat == 1 || inputLength == 0 ) {
             return str;
         }
-        if (inputLength == 1 && repeat <= PAD_LIMIT) {
-            return padding(repeat, str.charAt(0));
+        if ( inputLength == 1 && repeat <= PAD_LIMIT ) {
+            return padding( repeat,
+                            str.charAt( 0 ) );
         }
 
-        int outputLength = inputLength * repeat;
-        switch (inputLength) {
+        final int outputLength = inputLength * repeat;
+        switch ( inputLength ) {
             case 1 :
-                char ch = str.charAt(0);
-                char[] output1 = new char[outputLength];
-                for (int i = repeat - 1; i >= 0; i--) {
+                final char ch = str.charAt( 0 );
+                final char[] output1 = new char[outputLength];
+                for ( int i = repeat - 1; i >= 0; i-- ) {
                     output1[i] = ch;
                 }
-                return new String(output1);
+                return new String( output1 );
             case 2 :
-                char ch0 = str.charAt(0);
-                char ch1 = str.charAt(1);
-                char[] output2 = new char[outputLength];
-                for (int i = repeat * 2 - 2; i >= 0; i--, i--) {
+                final char ch0 = str.charAt( 0 );
+                final char ch1 = str.charAt( 1 );
+                final char[] output2 = new char[outputLength];
+                for ( int i = repeat * 2 - 2; i >= 0; i--, i-- ) {
                     output2[i] = ch0;
                     output2[i + 1] = ch1;
                 }
-                return new String(output2);
+                return new String( output2 );
             default :
-                StringBuffer buf = new StringBuffer(outputLength);
-                for (int i = 0; i < repeat; i++) {
-                    buf.append(str);
+                final StringBuffer buf = new StringBuffer( outputLength );
+                for ( int i = 0; i < repeat; i++ ) {
+                    buf.append( str );
                 }
                 return buf.toString();
         }
-    }    
+    }
 
     // Splitting
     //-----------------------------------------------------------------------
@@ -283,8 +282,10 @@
      * @param str  the String to parse, may be null
      * @return an array of parsed Strings, <code>null</code> if null String input
      */
-    public static String[] split(String str) {
-        return split(str, null, -1);
+    public static String[] split(final String str) {
+        return split( str,
+                      null,
+                      -1 );
     }
 
     /**
@@ -313,8 +314,11 @@
      * @return an array of parsed Strings, <code>null</code> if null String input
      * @since 2.0
      */
-    public static String[] split(String str, char separatorChar) {
-        return splitWorker(str, separatorChar, false);
+    public static String[] split(final String str,
+                                 final char separatorChar) {
+        return splitWorker( str,
+                            separatorChar,
+                            false );
     }
 
     /**
@@ -342,8 +346,12 @@
      *  <code>null</code> splits on whitespace
      * @return an array of parsed Strings, <code>null</code> if null String input
      */
-    public static String[] split(String str, String separatorChars) {
-        return splitWorker(str, separatorChars, -1, false);
+    public static String[] split(final String str,
+                                 final String separatorChars) {
+        return splitWorker( str,
+                            separatorChars,
+                            -1,
+                            false );
     }
 
     /**
@@ -376,8 +384,13 @@
      *  array. A zero or negative value implies no limit
      * @return an array of parsed Strings, <code>null</code> if null String input
      */
-    public static String[] split(String str, String separatorChars, int max) {
-        return splitWorker(str, separatorChars, max, false);
+    public static String[] split(final String str,
+                                 final String separatorChars,
+                                 final int max) {
+        return splitWorker( str,
+                            separatorChars,
+                            max,
+                            false );
     }
 
     /**
@@ -403,8 +416,11 @@
      *  <code>null</code> splits on whitespace
      * @return an array of parsed Strings, <code>null</code> if null String was input
      */
-    public static String[] splitByWholeSeparator(String str, String separator) {
-        return splitByWholeSeparator( str, separator, -1 ) ;
+    public static String[] splitByWholeSeparator(final String str,
+                                                 final String separator) {
+        return splitByWholeSeparator( str,
+                                      separator,
+                                      -1 );
     }
 
     /**
@@ -434,64 +450,68 @@
      *  array. A zero or negative value implies no limit.
      * @return an array of parsed Strings, <code>null</code> if null String was input
      */
-    public static String[] splitByWholeSeparator( String str, String separator, int max ) {
-        if (str == null) {
+    public static String[] splitByWholeSeparator(final String str,
+                                                 final String separator,
+                                                 final int max) {
+        if ( str == null ) {
             return null;
         }
 
-        int len = str.length() ;
+        final int len = str.length();
 
-        if (len == 0) {
+        if ( len == 0 ) {
             return EMPTY_STRING_ARRAY;
         }
 
-        if ( ( separator == null ) || ( "".equals( separator ) ) ) {
+        if ( (separator == null) || ("".equals( separator )) ) {
             // Split on whitespace.
-            return split( str, null, max ) ;
+            return split( str,
+                          null,
+                          max );
         }
 
+        final int separatorLength = separator.length();
 
-        int separatorLength = separator.length() ;
-
-        ArrayList substrings = new ArrayList() ;
-        int numberOfSubstrings = 0 ;
-        int beg = 0 ;
-        int end = 0 ;
+        final ArrayList substrings = new ArrayList();
+        int numberOfSubstrings = 0;
+        int beg = 0;
+        int end = 0;
         while ( end < len ) {
-            end = str.indexOf( separator, beg ) ;
+            end = str.indexOf( separator,
+                               beg );
 
             if ( end > -1 ) {
                 if ( end > beg ) {
-                    numberOfSubstrings += 1 ;
+                    numberOfSubstrings += 1;
 
                     if ( numberOfSubstrings == max ) {
-                        end = len ;
-                        substrings.add( str.substring( beg ) ) ;
+                        end = len;
+                        substrings.add( str.substring( beg ) );
                     } else {
                         // The following is OK, because String.substring( beg, end ) excludes
                         // the character at the position 'end'.
-                        substrings.add( str.substring( beg, end ) ) ;
+                        substrings.add( str.substring( beg,
+                                                       end ) );
 
                         // Set the starting point for the next search.
                         // The following is equivalent to beg = end + (separatorLength - 1) + 1,
                         // which is the right calculation:
-                        beg = end + separatorLength ;
+                        beg = end + separatorLength;
                     }
                 } else {
                     // We found a consecutive occurrence of the separator, so skip it.
-                    beg = end + separatorLength ;
+                    beg = end + separatorLength;
                 }
             } else {
                 // String.substring( beg ) goes from 'beg' to the end of the String.
-                substrings.add( str.substring( beg ) ) ;
-                end = len ;
+                substrings.add( str.substring( beg ) );
+                end = len;
             }
         }
 
-        return (String[]) substrings.toArray( new String[substrings.size()] ) ;
+        return (String[]) substrings.toArray( new String[substrings.size()] );
     }
 
-
     //-----------------------------------------------------------------------
     /**
      * <p>Splits the provided text into an array, using whitespace as the
@@ -517,8 +537,11 @@
      * @return an array of parsed Strings, <code>null</code> if null String input
      * @since 2.1
      */
-    public static String[] splitPreserveAllTokens(String str) {
-        return splitWorker(str, null, -1, true);
+    public static String[] splitPreserveAllTokens(final String str) {
+        return splitWorker( str,
+                            null,
+                            -1,
+                            true );
     }
 
     /**
@@ -553,8 +576,11 @@
      * @return an array of parsed Strings, <code>null</code> if null String input
      * @since 2.1
      */
-    public static String[] splitPreserveAllTokens(String str, char separatorChar) {
-        return splitWorker(str, separatorChar, true);
+    public static String[] splitPreserveAllTokens(final String str,
+                                                  final char separatorChar) {
+        return splitWorker( str,
+                            separatorChar,
+                            true );
     }
 
     /**
@@ -569,24 +595,27 @@
      * separators are treated as one separator.
      * @return an array of parsed Strings, <code>null</code> if null String input
      */
-    private static String[] splitWorker(String str, char separatorChar, boolean preserveAllTokens) {
+    private static String[] splitWorker(final String str,
+                                        final char separatorChar,
+                                        final boolean preserveAllTokens) {
         // Performance tuned for 2.0 (JDK1.4)
 
-        if (str == null) {
+        if ( str == null ) {
             return null;
         }
-        int len = str.length();
-        if (len == 0) {
+        final int len = str.length();
+        if ( len == 0 ) {
             return EMPTY_STRING_ARRAY;
         }
-        List list = new ArrayList();
+        final List list = new ArrayList();
         int i = 0, start = 0;
         boolean match = false;
         boolean lastMatch = false;
-        while (i < len) {
-            if (str.charAt(i) == separatorChar) {
-                if (match || preserveAllTokens) {
-                    list.add(str.substring(start, i));
+        while ( i < len ) {
+            if ( str.charAt( i ) == separatorChar ) {
+                if ( match || preserveAllTokens ) {
+                    list.add( str.substring( start,
+                                             i ) );
                     match = false;
                     lastMatch = true;
                 }
@@ -598,10 +627,11 @@
             match = true;
             i++;
         }
-        if (match || (preserveAllTokens && lastMatch)) {
-            list.add(str.substring(start, i));
+        if ( match || (preserveAllTokens && lastMatch) ) {
+            list.add( str.substring( start,
+                                     i ) );
         }
-        return (String[]) list.toArray(new String[list.size()]);
+        return (String[]) list.toArray( new String[list.size()] );
     }
 
     /**
@@ -637,8 +667,12 @@
      * @return an array of parsed Strings, <code>null</code> if null String input
      * @since 2.1
      */
-    public static String[] splitPreserveAllTokens(String str, String separatorChars) {
-        return splitWorker(str, separatorChars, -1, true);
+    public static String[] splitPreserveAllTokens(final String str,
+                                                  final String separatorChars) {
+        return splitWorker( str,
+                            separatorChars,
+                            -1,
+                            true );
     }
 
     /**
@@ -677,8 +711,13 @@
      * @return an array of parsed Strings, <code>null</code> if null String input
      * @since 2.1
      */
-    public static String[] splitPreserveAllTokens(String str, String separatorChars, int max) {
-        return splitWorker(str, separatorChars, max, true);
+    public static String[] splitPreserveAllTokens(final String str,
+                                                  final String separatorChars,
+                                                  final int max) {
+        return splitWorker( str,
+                            separatorChars,
+                            max,
+                            true );
     }
 
     /**
@@ -695,34 +734,38 @@
      * separators are treated as one separator.
      * @return an array of parsed Strings, <code>null</code> if null String input
      */
-    private static String[] splitWorker(String str, String separatorChars, int max, boolean preserveAllTokens) {
+    private static String[] splitWorker(final String str,
+                                        final String separatorChars,
+                                        final int max,
+                                        final boolean preserveAllTokens) {
         // Performance tuned for 2.0 (JDK1.4)
         // Direct code is quicker than StringTokenizer.
         // Also, StringTokenizer uses isSpace() not isWhitespace()
 
-        if (str == null) {
+        if ( str == null ) {
             return null;
         }
-        int len = str.length();
-        if (len == 0) {
+        final int len = str.length();
+        if ( len == 0 ) {
             return EMPTY_STRING_ARRAY;
         }
-        List list = new ArrayList();
+        final List list = new ArrayList();
         int sizePlus1 = 1;
         int i = 0, start = 0;
         boolean match = false;
         boolean lastMatch = false;
-        if (separatorChars == null) {
+        if ( separatorChars == null ) {
             // Null separator means use whitespace
-            while (i < len) {
-                if (Character.isWhitespace(str.charAt(i))) {
-                    if (match || preserveAllTokens) {
+            while ( i < len ) {
+                if ( Character.isWhitespace( str.charAt( i ) ) ) {
+                    if ( match || preserveAllTokens ) {
                         lastMatch = true;
-                        if (sizePlus1++ == max) {
+                        if ( sizePlus1++ == max ) {
                             i = len;
                             lastMatch = false;
                         }
-                        list.add(str.substring(start, i));
+                        list.add( str.substring( start,
+                                                 i ) );
                         match = false;
                     }
                     start = ++i;
@@ -733,18 +776,19 @@
                 match = true;
                 i++;
             }
-        } else if (separatorChars.length() == 1) {
+        } else if ( separatorChars.length() == 1 ) {
             // Optimise 1 character case
-            char sep = separatorChars.charAt(0);
-            while (i < len) {
-                if (str.charAt(i) == sep) {
-                    if (match || preserveAllTokens) {
+            final char sep = separatorChars.charAt( 0 );
+            while ( i < len ) {
+                if ( str.charAt( i ) == sep ) {
+                    if ( match || preserveAllTokens ) {
                         lastMatch = true;
-                        if (sizePlus1++ == max) {
+                        if ( sizePlus1++ == max ) {
                             i = len;
                             lastMatch = false;
                         }
-                        list.add(str.substring(start, i));
+                        list.add( str.substring( start,
+                                                 i ) );
                         match = false;
                     }
                     start = ++i;
@@ -757,15 +801,16 @@
             }
         } else {
             // standard case
-            while (i < len) {
-                if (separatorChars.indexOf(str.charAt(i)) >= 0) {
-                    if (match || preserveAllTokens) {
+            while ( i < len ) {
+                if ( separatorChars.indexOf( str.charAt( i ) ) >= 0 ) {
+                    if ( match || preserveAllTokens ) {
                         lastMatch = true;
-                        if (sizePlus1++ == max) {
+                        if ( sizePlus1++ == max ) {
                             i = len;
                             lastMatch = false;
                         }
-                        list.add(str.substring(start, i));
+                        list.add( str.substring( start,
+                                                 i ) );
                         match = false;
                     }
                     start = ++i;
@@ -777,12 +822,13 @@
                 i++;
             }
         }
-        if (match || (preserveAllTokens && lastMatch)) {
-            list.add(str.substring(start, i));
+        if ( match || (preserveAllTokens && lastMatch) ) {
+            list.add( str.substring( start,
+                                     i ) );
         }
-        return (String[]) list.toArray(new String[list.size()]);
-    }   
-    
+        return (String[]) list.toArray( new String[list.size()] );
+    }
+
     /**
      * <p>Returns padding using the specified delimiter repeated
      * to a given length.</p>
@@ -806,14 +852,15 @@
      * @throws IndexOutOfBoundsException if <code>repeat &lt; 0</code>
      * @see #repeat(String, int)
      */
-    private static String padding(int repeat, char padChar) throws IndexOutOfBoundsException {
-        if (repeat < 0) {
-            throw new IndexOutOfBoundsException("Cannot pad a negative amount: " + repeat);
+    private static String padding(final int repeat,
+                                  final char padChar) throws IndexOutOfBoundsException {
+        if ( repeat < 0 ) {
+            throw new IndexOutOfBoundsException( "Cannot pad a negative amount: " + repeat );
         }
         final char[] buf = new char[repeat];
-        for (int i = 0; i < buf.length; i++) {
+        for ( int i = 0; i < buf.length; i++ ) {
             buf[i] = padChar;
         }
-        return new String(buf);
-    }    
+        return new String( buf );
+    }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/AndHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/AndHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/AndHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -68,7 +68,7 @@
                         final String localName,
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
-                                             attrs );
+                                                  attrs );
         final AndDescr andDescr = new AndDescr();
 
         return andDescr;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ColumnHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ColumnHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ColumnHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -67,7 +67,7 @@
                         final String localName,
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
-                                             attrs );
+                                                  attrs );
 
         final String objectType = attrs.getValue( "object-type" );
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/EvalHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/EvalHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/EvalHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -65,7 +65,7 @@
                         final String localName,
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
-                                             attrs );
+                                                  attrs );
 
         final EvalDescr evalDescr = new EvalDescr();
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExistsHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExistsHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExistsHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -65,7 +65,7 @@
                         final String localName,
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
-                                             attrs );
+                                                  attrs );
         final ExistsDescr existsDescr = new ExistsDescr();
 
         return existsDescr;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FieldBindingHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FieldBindingHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FieldBindingHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -57,7 +57,7 @@
                         final String localName,
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
-                                             attrs );
+                                                  attrs );
 
         final String identifier = attrs.getValue( "identifier" );
         if ( identifier == null || identifier.trim().equals( "" ) ) {
@@ -72,7 +72,7 @@
         }
 
         final FieldBindingDescr fieldBindingDescr = new FieldBindingDescr( fieldName,
-                                                                     identifier );
+                                                                           identifier );
 
         return fieldBindingDescr;
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FieldConstraintHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FieldConstraintHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FieldConstraintHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -21,7 +21,6 @@
 import java.util.ListIterator;
 
 import org.drools.lang.descr.ColumnDescr;
-import org.drools.lang.descr.ConditionalElementDescr;
 import org.drools.lang.descr.FieldBindingDescr;
 import org.drools.lang.descr.FieldConstraintDescr;
 import org.drools.lang.descr.PredicateDescr;
@@ -58,16 +57,16 @@
                         final String localName,
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
-                                             attrs );
+                                                  attrs );
 
         final String fieldName = attrs.getValue( "field-name" );
 
         if ( fieldName == null || fieldName.trim().equals( "" ) ) {
             throw new SAXParseException( "<field-constraint> requires a 'field-name' attribute",
                                          this.xmlPackageReader.getLocator() );
-        }               
+        }
 
-        FieldConstraintDescr fieldConstraint = new  FieldConstraintDescr( fieldName );
+        final FieldConstraintDescr fieldConstraint = new FieldConstraintDescr( fieldName );
 
         return fieldConstraint;
     }
@@ -83,7 +82,7 @@
         it.previous();
         final Object parent = it.previous();
 
-        final ColumnDescr columnDescr = ( ColumnDescr ) parent;
+        final ColumnDescr columnDescr = (ColumnDescr) parent;
         columnDescr.addDescr( fieldConstraintDescr );
 
         return null;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FunctionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FunctionHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FunctionHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -56,7 +56,7 @@
                         final String localName,
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
-                                             attrs );
+                                                  attrs );
         return null;
     }
 
@@ -77,7 +77,7 @@
         }
 
         final FunctionDescr functionDescr = new FunctionDescr( name,
-                                                         returnType );
+                                                               returnType );
 
         final Configuration[] parameters = config.getChildren( "parameter" );
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/LhsHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/LhsHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/LhsHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -54,7 +54,7 @@
                         final String localName,
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
-                                             attrs );
+                                                  attrs );
         return null;
     }
 
@@ -75,7 +75,7 @@
         }
 
         final FunctionDescr functionDescr = new FunctionDescr( name,
-                                                         returnType );
+                                                               returnType );
 
         final Configuration[] parameters = config.getChildren( "parameter" );
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/LiteralRestrictionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/LiteralRestrictionHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/LiteralRestrictionHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -24,11 +24,7 @@
 import org.drools.lang.descr.LiteralRestrictionDescr;
 import org.drools.lang.descr.RestrictionConnectiveDescr;
 import org.drools.lang.descr.ReturnValueRestrictionDescr;
-import org.drools.lang.descr.ColumnDescr;
-import org.drools.lang.descr.FieldBindingDescr;
-import org.drools.lang.descr.PredicateDescr;
 import org.drools.lang.descr.VariableRestrictionDescr;
-import org.drools.rule.LiteralRestriction;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/NotHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/NotHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/NotHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -65,7 +65,7 @@
                         final String localName,
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
-                                             attrs );
+                                                  attrs );
         final NotDescr notDescr = new NotDescr();
 
         return notDescr;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/OrHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/OrHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/OrHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -64,7 +64,7 @@
                         final String localName,
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
-                                             attrs );
+                                                  attrs );
         final OrDescr orDescr = new OrDescr();
 
         return orDescr;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PackageHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PackageHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PackageHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -52,7 +52,7 @@
                         final String localName,
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
-                                             attrs );
+                                                  attrs );
 
         final String ruleSetName = attrs.getValue( "name" );
 
@@ -99,7 +99,8 @@
                 throw new SAXParseException( "<global> must have specify a type",
                                              this.xmlPackageReader.getLocator() );
             }
-            GlobalDescr global = new GlobalDescr(identifier, type);
+            final GlobalDescr global = new GlobalDescr( identifier,
+                                                  type );
             packageDescr.addGlobal( global );
         }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PredicateHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PredicateHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PredicateHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -57,9 +57,9 @@
                         final String localName,
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
-                                             attrs );
+                                                  attrs );
 
-        final PredicateDescr predicateDescr = new PredicateDescr( );
+        final PredicateDescr predicateDescr = new PredicateDescr();
 
         return predicateDescr;
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/QueryHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/QueryHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/QueryHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -57,7 +57,7 @@
                         final String localName,
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
-                                             attrs );
+                                                  attrs );
 
         final String queryName = attrs.getValue( "name" );
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/RestrictionConnectiveHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/RestrictionConnectiveHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/RestrictionConnectiveHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -24,11 +24,7 @@
 import org.drools.lang.descr.LiteralRestrictionDescr;
 import org.drools.lang.descr.RestrictionConnectiveDescr;
 import org.drools.lang.descr.ReturnValueRestrictionDescr;
-import org.drools.lang.descr.ColumnDescr;
-import org.drools.lang.descr.FieldBindingDescr;
-import org.drools.lang.descr.PredicateDescr;
 import org.drools.lang.descr.VariableRestrictionDescr;
-import org.drools.rule.LiteralRestriction;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
@@ -72,7 +68,7 @@
         }
 
         RestrictionConnectiveDescr connectiveDescr = null;
-        if( connective.equals( "|" ) ) {
+        if ( connective.equals( "|" ) ) {
             connectiveDescr = new RestrictionConnectiveDescr( RestrictionConnectiveDescr.OR );
         } else {
             connectiveDescr = new RestrictionConnectiveDescr( RestrictionConnectiveDescr.AND );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/RuleHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/RuleHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/RuleHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -58,7 +58,7 @@
                         final String localName,
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
-                                             attrs );
+                                                  attrs );
 
         final String ruleName = attrs.getValue( "name" );
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/VariableRestrictionsHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/VariableRestrictionsHandler.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/VariableRestrictionsHandler.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -24,9 +24,6 @@
 import org.drools.lang.descr.LiteralRestrictionDescr;
 import org.drools.lang.descr.RestrictionConnectiveDescr;
 import org.drools.lang.descr.ReturnValueRestrictionDescr;
-import org.drools.lang.descr.ColumnDescr;
-import org.drools.lang.descr.FieldBindingDescr;
-import org.drools.lang.descr.PredicateDescr;
 import org.drools.lang.descr.VariableRestrictionDescr;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -62,7 +59,7 @@
                         final String localName,
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
-                                             attrs );
+                                                  attrs );
 
         final String evaluator = attrs.getValue( "evaluator" );
         if ( evaluator == null || evaluator.trim().equals( "" ) ) {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -84,9 +84,9 @@
         this.template = new String();
         if ( descr.getDescrs() != Collections.EMPTY_LIST ) {
             if ( descr.getIdentifier() != null ) {
-                this.template = "<column identifier=\"" + descr.getIdentifier() + "\" object-type=\"" + descr.getObjectType() + "\" >"  + XmlDumper.eol + processDescrList( descr.getDescrs() )  + XmlDumper.eol + "</column>" + XmlDumper.eol;
+                this.template = "<column identifier=\"" + descr.getIdentifier() + "\" object-type=\"" + descr.getObjectType() + "\" >" + XmlDumper.eol + processDescrList( descr.getDescrs() ) + XmlDumper.eol + "</column>" + XmlDumper.eol;
             } else {
-                this.template = "<column object-type=\"" + descr.getObjectType() + "\" >"  + XmlDumper.eol + processDescrList( descr.getDescrs() )  + XmlDumper.eol + "</column>" + XmlDumper.eol;
+                this.template = "<column object-type=\"" + descr.getObjectType() + "\" >" + XmlDumper.eol + processDescrList( descr.getDescrs() ) + XmlDumper.eol + "</column>" + XmlDumper.eol;
             }
         } else {
             if ( descr.getIdentifier() != null ) {
@@ -100,7 +100,7 @@
 
     public void visitFieldConstraintDescr(final FieldConstraintDescr descr) {
         if ( !descr.getRestrictions().isEmpty() ) {
-            this.template = "<field-constraint field-name=\"" + descr.getFieldName() + "\"> "  + XmlDumper.eol + processFieldConstraint( descr.getRestrictions() ) + XmlDumper.eol +"</field-constraint>";            
+            this.template = "<field-constraint field-name=\"" + descr.getFieldName() + "\"> " + XmlDumper.eol + processFieldConstraint( descr.getRestrictions() ) + XmlDumper.eol + "</field-constraint>";
         }
     }
 
@@ -128,8 +128,8 @@
         final String parameterTemplate = processParameters( functionDescr.getParameterNames(),
                                                             functionDescr.getParameterTypes() );
 
-        this.template = "<function return-type=\"" + functionDescr.getReturnType() + "\" name=\"" + functionDescr.getName() + "\">" + XmlDumper.eol + parameterTemplate + "<body>" + XmlDumper.eol + replaceIllegalChars( functionDescr.getText() ) + XmlDumper.eol + "</body>"
-                        + XmlDumper.eol + "</function>" + XmlDumper.eol;
+        this.template = "<function return-type=\"" + functionDescr.getReturnType() + "\" name=\"" + functionDescr.getName() + "\">" + XmlDumper.eol + parameterTemplate + "<body>" + XmlDumper.eol + replaceIllegalChars( functionDescr.getText() )
+                        + XmlDumper.eol + "</body>" + XmlDumper.eol + "</function>" + XmlDumper.eol;
     }
 
     public void visitLiteralRestrictionDescr(final LiteralRestrictionDescr descr) {
@@ -210,7 +210,7 @@
         return ruleList + XmlDumper.eol;
     }
 
-    private String processFieldConstraint(List list) {
+    private String processFieldConstraint(final List list) {
         String descrString = "";
         for ( final Iterator it = list.iterator(); it.hasNext(); ) {
             final Object temp = it.next();
@@ -301,34 +301,42 @@
     private void appendXmlDump(final String temp) {
         this.xmlDump.append( temp );
     }
-    
+
     /**
      * Replace illegal xml characters with their escaped equivalent
-      * <P>The escaped characters are :
-      * <ul>
-      * <li> <
-      * <li> >
-      * <li> &
-      * </ul>
-      * </p>
+     * <P>The escaped characters are :
+     * <ul>
+     * <li> <
+     * <li> >
+     * <li> &
+     * </ul>
+     * </p>
      * @author <a href="mailto:prietor at gmail.com">Author Javier Prieto</a>
      */
-    private String replaceIllegalChars(String code) {
-        StringBuffer sb = new StringBuffer();
-        if( code != null ) {
-            int n = code.length();
-            for (int i = 0; i < n; i++) {
-               char c = code.charAt(i);
-               switch (c) {
-                  case '<': sb.append("&lt;"); break;
-                  case '>': sb.append("&gt;"); break;
-                  case '&': sb.append("&amp;"); break;                   
-                  default:  sb.append(c); break;
-               }
+    private String replaceIllegalChars(final String code) {
+        final StringBuffer sb = new StringBuffer();
+        if ( code != null ) {
+            final int n = code.length();
+            for ( int i = 0; i < n; i++ ) {
+                final char c = code.charAt( i );
+                switch ( c ) {
+                    case '<' :
+                        sb.append( "&lt;" );
+                        break;
+                    case '>' :
+                        sb.append( "&gt;" );
+                        break;
+                    case '&' :
+                        sb.append( "&amp;" );
+                        break;
+                    default :
+                        sb.append( c );
+                        break;
+                }
             }
         } else {
             sb.append( "null" );
         }
         return sb.toString();
-    }    
+    }
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlPackageReader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlPackageReader.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlPackageReader.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -160,7 +160,7 @@
         this.handlers.put( "literal-restriction",
                            new LiteralRestrictionHandler( this ) );
         this.handlers.put( "variable-restriction",
-                           new VariableRestrictionsHandler( this ) );        
+                           new VariableRestrictionsHandler( this ) );
         this.handlers.put( "predicate",
                            new PredicateHandler( this ) );
         this.handlers.put( "return-value-restriction",

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Approve.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Approve.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Approve.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -6,19 +6,19 @@
  *
  */
 public class Approve {
-	
-	private String reason;
 
-	public Approve(String reason) {
-		this.reason = reason;
-	}
+    private String reason;
 
-	public String getReason() {
-		return reason;
-	}
+    public Approve(final String reason) {
+        this.reason = reason;
+    }
 
-	public void setReason(String reason) {
-		this.reason = reason;
-	}
+    public String getReason() {
+        return this.reason;
+    }
 
+    public void setReason(final String reason) {
+        this.reason = reason;
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Driver.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Driver.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Driver.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -7,35 +7,41 @@
  */
 public class Driver {
 
-	private String name = "Mr Joe Blogs";
-	private Integer age = new Integer(30);
-	private Integer priorClaims = new Integer(0);	
-	private String  locationRiskProfile = "LOW";
-	
-	public Integer getAge() {
-		return age;
-	}
-	public void setAge(Integer age) {
-		this.age = age;
-	}
-	public String getLocationRiskProfile() {
-		return locationRiskProfile;
-	}
-	public void setLocationRiskProfile(String locationRiskProfile) {
-		this.locationRiskProfile = locationRiskProfile;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public Integer getPriorClaims() {
-		return priorClaims;
-	}
-	public void setPriorClaims(Integer priorClaims) {
-		this.priorClaims = priorClaims;
-	}
-	
-	
+    private String  name                = "Mr Joe Blogs";
+    private Integer age                 = new Integer( 30 );
+    private Integer priorClaims         = new Integer( 0 );
+    private String  locationRiskProfile = "LOW";
+
+    public Integer getAge() {
+        return this.age;
+    }
+
+    public void setAge(final Integer age) {
+        this.age = age;
+    }
+
+    public String getLocationRiskProfile() {
+        return this.locationRiskProfile;
+    }
+
+    public void setLocationRiskProfile(final String locationRiskProfile) {
+        this.locationRiskProfile = locationRiskProfile;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public Integer getPriorClaims() {
+        return this.priorClaims;
+    }
+
+    public void setPriorClaims(final Integer priorClaims) {
+        this.priorClaims = priorClaims;
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Policy.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Policy.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Policy.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -10,40 +10,45 @@
  */
 public class Policy {
 
-	private String type = "COMPREHENSIVE";
-	private boolean approved = false;
-	private int discountPercent = 0;
-	private int basePrice;
-	
-	public boolean isApproved() {
-		return approved;
-	}
-	public void setApproved(boolean approved) {
-		this.approved = approved;
-	}
-	public int getDiscountPercent() {
-		return discountPercent;
-	}
-	public void setDiscountPercent(int discountPercent) {
-		this.discountPercent = discountPercent;
-	}
-	
-	public String getType() {
-		return type;
-	}
-	
-	public void setType(String type) {
-		this.type = type;
-	}
-	
-	public void applyDiscount(int discount) {
-		discountPercent += discount;
-	}
-	public int getBasePrice() {
-		return basePrice;
-	}
-	public void setBasePrice(int basePrice) {
-		this.basePrice = basePrice;
-	}
-	
+    private String  type            = "COMPREHENSIVE";
+    private boolean approved        = false;
+    private int     discountPercent = 0;
+    private int     basePrice;
+
+    public boolean isApproved() {
+        return this.approved;
+    }
+
+    public void setApproved(final boolean approved) {
+        this.approved = approved;
+    }
+
+    public int getDiscountPercent() {
+        return this.discountPercent;
+    }
+
+    public void setDiscountPercent(final int discountPercent) {
+        this.discountPercent = discountPercent;
+    }
+
+    public String getType() {
+        return this.type;
+    }
+
+    public void setType(final String type) {
+        this.type = type;
+    }
+
+    public void applyDiscount(final int discount) {
+        this.discountPercent += discount;
+    }
+
+    public int getBasePrice() {
+        return this.basePrice;
+    }
+
+    public void setBasePrice(final int basePrice) {
+        this.basePrice = basePrice;
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Rejection.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Rejection.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/acme/insurance/Rejection.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -6,18 +6,18 @@
  */
 public class Rejection {
 
-	private String reason;
+    private String reason;
 
-	public Rejection(String reason) {
-		this.reason = reason;
-	}
+    public Rejection(final String reason) {
+        this.reason = reason;
+    }
 
-	public String getReason() {
-		return reason;
-	}
+    public String getReason() {
+        return this.reason;
+    }
 
-	public void setReason(String reason) {
-		this.reason = reason;
-	}
-	
+    public void setReason(final String reason) {
+        this.reason = reason;
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Alarm.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Alarm.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Alarm.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -4,9 +4,9 @@
     private String message;
 
     public Alarm() {
-        
+
     }
-    
+
     public Alarm(final String message) {
         this.message = message;
     }
@@ -53,13 +53,13 @@
      * @return the message
      */
     public String getMessage() {
-        return message;
+        return this.message;
     }
 
     /**
      * @param message the message to set
      */
-    public void setMessage(String message) {
+    public void setMessage(final String message) {
         this.message = message;
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Approach.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Approach.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Approach.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -2,64 +2,80 @@
 
 public class Approach {
 
-	public String label;
-	public String label2;
-	public Float time;
-	public Float time2;
-	public Float distance;
-	public Float distance2;
-	public Float bearing;
-	public Float bearing2;
+    public String label;
+    public String label2;
+    public Float  time;
+    public Float  time2;
+    public Float  distance;
+    public Float  distance2;
+    public Float  bearing;
+    public Float  bearing2;
 
-	public Float getDistance2() {
-		return distance2;
-	}
-	public void setDistance2(Float distance2) {
-		this.distance2 = distance2;
-	}
-	public Float getTime2() {
-		return time2;
-	}
-	public void setTime2(Float time2) {
-		this.time2 = time2;
-	}
-	public Float getBearing() {
-		return bearing;
-	}
-	public void setBearing(Float bearing) {
-		this.bearing = bearing;
-	}
-	public Float getDistance() {
-		return distance;
-	}
-	public void setDistance(Float distance) {
-		this.distance = distance;
-	}
-	public String getLabel() {
-		return label;
-	}
-	public void setLabel(String label) {
-		this.label = label;
-	}
-	public String getLabel2() {
-		return label2;
-	}
-	public void setLabel2(String label2) {
-		this.label2 = label2;
-	}
-	public Float getTime() {
-		return time;
-	}
-	public void setTime(Float time) {
-		this.time = time;
-	}
-	public Float getBearing2() {
-		return bearing2;
-	}
-	public void setBearing2(Float bearing2) {
-		this.bearing2 = bearing2;
-	}
-	public String toString(){
-		return "Approach< label: "+label+" label2: "+label2+" time: "+time+" time2: "+time2+" distance: "+distance+" distance2: "+distance2+" bearing: "+bearing+" bearing2: "+bearing2+" >";
-	}
+    public Float getDistance2() {
+        return this.distance2;
+    }
+
+    public void setDistance2(final Float distance2) {
+        this.distance2 = distance2;
+    }
+
+    public Float getTime2() {
+        return this.time2;
+    }
+
+    public void setTime2(final Float time2) {
+        this.time2 = time2;
+    }
+
+    public Float getBearing() {
+        return this.bearing;
+    }
+
+    public void setBearing(final Float bearing) {
+        this.bearing = bearing;
+    }
+
+    public Float getDistance() {
+        return this.distance;
+    }
+
+    public void setDistance(final Float distance) {
+        this.distance = distance;
+    }
+
+    public String getLabel() {
+        return this.label;
+    }
+
+    public void setLabel(final String label) {
+        this.label = label;
+    }
+
+    public String getLabel2() {
+        return this.label2;
+    }
+
+    public void setLabel2(final String label2) {
+        this.label2 = label2;
+    }
+
+    public Float getTime() {
+        return this.time;
+    }
+
+    public void setTime(final Float time) {
+        this.time = time;
+    }
+
+    public Float getBearing2() {
+        return this.bearing2;
+    }
+
+    public void setBearing2(final Float bearing2) {
+        this.bearing2 = bearing2;
+    }
+
+    public String toString() {
+        return "Approach< label: " + this.label + " label2: " + this.label2 + " time: " + this.time + " time2: " + this.time2 + " distance: " + this.distance + " distance2: " + this.distance2 + " bearing: " + this.bearing + " bearing2: " + this.bearing2 + " >";
+    }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/AssertedObject.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/AssertedObject.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/AssertedObject.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -4,19 +4,18 @@
     private String value;
 
     public String getValue() {
-        return value;
+        return this.value;
     }
 
-    public void setValue(String value) {
+    public void setValue(final String value) {
         this.value = value;
     }
 
-    public AssertedObject(String value) {
+    public AssertedObject(final String value) {
         this.value = value;
     }
-    
+
     public AssertedObject() {
     }
-    
-    
-} 
\ No newline at end of file
+
+}
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cell.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cell.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cell.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -21,9 +21,9 @@
     int value = 0;
 
     public Cell() {
-    	
+
     }
-    
+
     public Cell(final int value) {
         this.value = value;
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheese.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheese.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheese.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -25,13 +25,13 @@
      * 
      */
     private static final long serialVersionUID = -1187540653710115339L;
-    private String type;
-    private int    price;
+    private String            type;
+    private int               price;
 
     public Cheese() {
-    	
+
     }
-    
+
     public Cheese(final String type,
                   final int price) {
         super();
@@ -47,7 +47,7 @@
         return this.type;
     }
 
-    public void setType( String type ) {
+    public void setType(final String type) {
         this.type = type;
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/CheeseEqual.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/CheeseEqual.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/CheeseEqual.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -25,13 +25,13 @@
      * 
      */
     private static final long serialVersionUID = 10880087244353711L;
-    protected String type;
-    protected int    price;
+    protected String          type;
+    protected int             price;
 
-    public CheeseEqual(){
-        
+    public CheeseEqual() {
+
     }
-    
+
     public CheeseEqual(final String type,
                        final int price) {
         super();

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheesery.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheesery.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheesery.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -40,7 +40,7 @@
         return this.cheeses;
     }
 
-    public void addCheese(Cheese cheese) {
+    public void addCheese(final Cheese cheese) {
         this.cheeses.add( cheese );
         this.totalAmount += cheese.getPrice();
     }
@@ -51,21 +51,21 @@
 
     public int getStatus() {
         return this.status;
-    }        
+    }
 
     public Maturity getMaturity() {
-        return maturity;
+        return this.maturity;
     }
 
-    public void setMaturity(Maturity maturity) {
+    public void setMaturity(final Maturity maturity) {
         this.maturity = maturity;
     }
 
     public int getTotalAmount() {
-        return totalAmount;
+        return this.totalAmount;
     }
 
-    public void setTotalAmount(int totalAmount) {
+    public void setTotalAmount(final int totalAmount) {
         this.totalAmount = totalAmount;
     }
 
@@ -75,7 +75,7 @@
 
         private String               age;
 
-        public Maturity(String age) {
+        public Maturity(final String age) {
             this.age = age;
         }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Child.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Child.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Child.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,14 +1,12 @@
 package org.drools;
 
 public class Child extends Parent {
-    
+
     public Child() {
     }
-    
-    public Child( String name ) {
+
+    public Child(final String name) {
         super( name );
     }
-    
 
-
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Close.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Close.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Close.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -2,43 +2,53 @@
 
 public class Close {
 
-	public String label;
-	public String label2;
-	public Float time;
-	public Float distance;
-	public Float bearing;
+    public String label;
+    public String label2;
+    public Float  time;
+    public Float  distance;
+    public Float  bearing;
 
-	public Float getBearing() {
-		return bearing;
-	}
-	public void setBearing(Float bearing) {
-		this.bearing = bearing;
-	}
-	public Float getDistance() {
-		return distance;
-	}
-	public void setDistance(Float distance) {
-		this.distance = distance;
-	}
-	public String getLabel() {
-		return label;
-	}
-	public void setLabel(String label) {
-		this.label = label;
-	}
-	public String getLabel2() {
-		return label2;
-	}
-	public void setLabel2(String label2) {
-		this.label2 = label2;
-	}
-	public Float getTime() {
-		return time;
-	}
-	public void setTime(Float time) {
-		this.time = time;
-	}
-	public String toString(){
-		return "Close< label: "+label+" label2: "+label2+" time: "+time+" distance: "+distance+" bearing: "+bearing+">";
-	}
+    public Float getBearing() {
+        return this.bearing;
+    }
+
+    public void setBearing(final Float bearing) {
+        this.bearing = bearing;
+    }
+
+    public Float getDistance() {
+        return this.distance;
+    }
+
+    public void setDistance(final Float distance) {
+        this.distance = distance;
+    }
+
+    public String getLabel() {
+        return this.label;
+    }
+
+    public void setLabel(final String label) {
+        this.label = label;
+    }
+
+    public String getLabel2() {
+        return this.label2;
+    }
+
+    public void setLabel2(final String label2) {
+        this.label2 = label2;
+    }
+
+    public Float getTime() {
+        return this.time;
+    }
+
+    public void setTime(final Float time) {
+        this.time = time;
+    }
+
+    public String toString() {
+        return "Close< label: " + this.label + " label2: " + this.label2 + " time: " + this.time + " distance: " + this.distance + " bearing: " + this.bearing + ">";
+    }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/EmergencyTeam.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/EmergencyTeam.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/EmergencyTeam.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -2,6 +2,6 @@
 
 public class EmergencyTeam {
     public EmergencyTeam() {
-        
+
     }
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FactA.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FactA.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FactA.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,35 +1,43 @@
 package org.drools;
 
 public class FactA {
-    String field1;
+    String  field1;
     Integer field2;
-    Float field3;
-    
+    Float   field3;
+
     public FactA() {
     }
-    
-    public FactA(String f1, Integer f2, Float f3) {
-        field1 = f1;
-        field2 = f2;
-        field3 = f3;
+
+    public FactA(final String f1,
+                 final Integer f2,
+                 final Float f3) {
+        this.field1 = f1;
+        this.field2 = f2;
+        this.field3 = f3;
     }
+
     public String getField1() {
-        return field1;
+        return this.field1;
     }
-    public void setField1(String s) {
-        field1 = s;
+
+    public void setField1(final String s) {
+        this.field1 = s;
     }
+
     public Integer getField2() {
-        return field2;
+        return this.field2;
     }
-    public void setField2(Integer i) {
-        field2 = i;
+
+    public void setField2(final Integer i) {
+        this.field2 = i;
     }
+
     public Float getField3() {
-        return field3;
+        return this.field3;
     }
-    public void setField3(Float f) {
-        field3 = f;
+
+    public void setField3(final Float f) {
+        this.field3 = f;
     }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FactB.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FactB.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FactB.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,35 +1,43 @@
 package org.drools;
 
 public class FactB {
-    String f1;
+    String  f1;
     Integer f2;
-    Float f3;
-    
+    Float   f3;
+
     public FactB() {
     }
-    
-    public FactB(String a, Integer b, Float c) {
-        f1 = a;
-        f2 = b;
-        f3 = c;
+
+    public FactB(final String a,
+                 final Integer b,
+                 final Float c) {
+        this.f1 = a;
+        this.f2 = b;
+        this.f3 = c;
     }
+
     public String getF1() {
-        return f1;
+        return this.f1;
     }
-    public void setF1(String s) {
-        f1 = s;
+
+    public void setF1(final String s) {
+        this.f1 = s;
     }
+
     public Integer getF2() {
-        return f2;
+        return this.f2;
     }
-    public void setF2(Integer i) {
-        f2 = i;
+
+    public void setF2(final Integer i) {
+        this.f2 = i;
     }
+
     public Float getF3() {
-        return f3;
+        return this.f3;
     }
-    public void setF3(Float f) {
-        f3 = f;
+
+    public void setF3(final Float f) {
+        this.f3 = f;
     }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FactC.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FactC.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FactC.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,35 +1,44 @@
 package org.drools;
 
 public class FactC {
-    String f1;
+    String  f1;
     Integer f2;
-    Float f3;
-    
-    public FactC(String a, Integer b, Float c) {
-        f1 = a;
-        f2 = b;
-        f3 = c;
+    Float   f3;
+
+    public FactC(final String a,
+                 final Integer b,
+                 final Float c) {
+        this.f1 = a;
+        this.f2 = b;
+        this.f3 = c;
     }
+
     public FactC() {
 
     }
+
     public String getF1() {
-        return f1;
+        return this.f1;
     }
-    public void setF1(String s) {
-        f1 = s;
+
+    public void setF1(final String s) {
+        this.f1 = s;
     }
+
     public Integer getF2() {
-        return f2;
+        return this.f2;
     }
-    public void setF2(Integer i) {
-        f2 = i;
+
+    public void setF2(final Integer i) {
+        this.f2 = i;
     }
+
     public Float getF3() {
-        return f3;
+        return this.f3;
     }
-    public void setF3(Float f) {
-        f3 = f;
+
+    public void setF3(final Float f) {
+        this.f3 = f;
     }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FromTestClass.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FromTestClass.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FromTestClass.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -5,8 +5,13 @@
 import java.util.Map;
 
 public class FromTestClass {
-    public List toList(Object object1, Object object2, String object3, int integer, Map map, List inputList) {
-        List list = new ArrayList();
+    public List toList(final Object object1,
+                       final Object object2,
+                       final String object3,
+                       final int integer,
+                       final Map map,
+                       final List inputList) {
+        final List list = new ArrayList();
         list.add( object1 );
         list.add( object2 );
         list.add( object3 );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Func.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Func.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Func.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -2,14 +2,15 @@
 
 public class Func {
     public static void func() {
-        
+
     }
-    
-    public static void func(String string) {
-        
+
+    public static void func(final String string) {
+
     }
-    
-    public static void func(String x, String y) {
-        
-    }    
+
+    public static void func(final String x,
+                            final String y) {
+
+    }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/GrandParent.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/GrandParent.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/GrandParent.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -9,22 +9,22 @@
 
     public GrandParent() {
     }
-    
-    public GrandParent( String name ) {
+
+    public GrandParent(final String name) {
         this.name = name;
     }
-    
+
     /**
      * @return the name
      */
     public String getName() {
-        return name;
+        return this.name;
     }
 
     /**
      * @param name the name to set
      */
-    public void setName(String name) {
+    public void setName(final String name) {
         this.name = name;
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Guess.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Guess.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Guess.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,18 +1,15 @@
 package org.drools;
 
-public class Guess
-{
+public class Guess {
 
-   private Integer value;
+    private Integer value;
 
-   public void setValue(Integer guess)
-   {
-      this.value = guess;
-   }
-   
-   public Integer getValue()
-   {
-      return value;
-   }
+    public void setValue(final Integer guess) {
+        this.value = guess;
+    }
 
+    public Integer getValue() {
+        return this.value;
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/IndexedNumber.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/IndexedNumber.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/IndexedNumber.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -26,13 +26,13 @@
  */
 
 public class IndexedNumber {
-    
-    private int number = 0;
-    
-    private int index = 0;
-    
+
+    private int     number = 0;
+
+    private int     index  = 0;
+
     private boolean printed;
-    
+
     public IndexedNumber() {
     }
 
@@ -40,53 +40,53 @@
      * @param pNb
      * @param pIndex
      */
-    public IndexedNumber(int pNb, int pIndex) {
-        number = pNb;
-        index = pIndex;
+    public IndexedNumber(final int pNb,
+                         final int pIndex) {
+        this.number = pNb;
+        this.index = pIndex;
     }
 
     /**
      * @return le/la/les index.
      */
     public int getIndex() {
-        return index;
+        return this.index;
     }
 
     /**
      * @param pIndex le/la/les index à sauvegarder.
      */
-    public void setIndex(int pIndex) {
-        index = pIndex;
+    public void setIndex(final int pIndex) {
+        this.index = pIndex;
     }
 
     /**
      * @return le/la/les nb.
      */
     public int getNumber() {
-        return number;
+        return this.number;
     }
 
     /**
      * @param pNb le/la/les nb à sauvegarder.
      */
-    public void setNumber(int pNb) {
-        number = pNb;
+    public void setNumber(final int pNb) {
+        this.number = pNb;
     }
-    
+
     /**
      * {@inheritDoc}
      */
     public String toString() {
-        return "IndexedNumber[ " + number + ", " + index + " ]";
+        return "IndexedNumber[ " + this.number + ", " + this.index + " ]";
     }
 
     public boolean isPrinted() {
-        return printed;
+        return this.printed;
     }
 
-    public void setPrinted(boolean printed) {
+    public void setPrinted(final boolean printed) {
         this.printed = printed;
     }
-    
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Order.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Order.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Order.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -16,7 +16,6 @@
 
 package org.drools;
 
-
 /**
  * @author etirelli
  *
@@ -24,12 +23,12 @@
 public class Order {
 
     private int number;
-    
+
     public Order() {
         this( 0 );
     }
-    
-    public Order( int number ) {
+
+    public Order(final int number) {
         this.number = number;
     }
 
@@ -37,13 +36,13 @@
      * @return the number
      */
     public int getNumber() {
-        return number;
+        return this.number;
     }
 
     /**
      * @param number the number to set
      */
-    public void setNumber(int number) {
+    public void setNumber(final int number) {
         this.number = number;
     }
 
@@ -53,19 +52,27 @@
     public int hashCode() {
         final int PRIME = 31;
         int result = 1;
-        result = PRIME * result + number;
+        result = PRIME * result + this.number;
         return result;
     }
 
     /* (non-Javadoc)
      * @see java.lang.Object#equals(java.lang.Object)
      */
-    public boolean equals(Object obj) {
-        if ( this == obj ) return true;
-        if ( obj == null ) return false;
-        if ( getClass() != obj.getClass() ) return false;
+    public boolean equals(final Object obj) {
+        if ( this == obj ) {
+            return true;
+        }
+        if ( obj == null ) {
+            return false;
+        }
+        if ( getClass() != obj.getClass() ) {
+            return false;
+        }
         final Order other = (Order) obj;
-        if ( number != other.number ) return false;
+        if ( this.number != other.number ) {
+            return false;
+        }
         return true;
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/OrderItem.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/OrderItem.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/OrderItem.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -21,66 +21,84 @@
  *
  */
 public class OrderItem {
-    private int seq;
+    private int   seq;
     private Order order;
-    
+
     public OrderItem() {
-        this( null, 0 );
+        this( null,
+              0 );
     }
-    
-    public OrderItem( Order order, int seq ) {
+
+    public OrderItem(final Order order,
+                     final int seq) {
         this.order = order;
         this.seq = seq;
     }
+
     /**
      * @return the order
      */
     public Order getOrder() {
-        return order;
+        return this.order;
     }
+
     /**
      * @param order the order to set
      */
-    public void setOrder(Order order) {
+    public void setOrder(final Order order) {
         this.order = order;
     }
+
     /**
      * @return the seq
      */
     public int getSeq() {
-        return seq;
+        return this.seq;
     }
+
     /**
      * @param seq the seq to set
      */
-    public void setSeq(int seq) {
+    public void setSeq(final int seq) {
         this.seq = seq;
     }
+
     /* (non-Javadoc)
      * @see java.lang.Object#hashCode()
      */
     public int hashCode() {
         final int PRIME = 31;
         int result = 1;
-        result = PRIME * result + ((order == null) ? 0 : order.hashCode());
-        result = PRIME * result + seq;
+        result = PRIME * result + ((this.order == null) ? 0 : this.order.hashCode());
+        result = PRIME * result + this.seq;
         return result;
     }
+
     /* (non-Javadoc)
      * @see java.lang.Object#equals(java.lang.Object)
      */
-    public boolean equals(Object obj) {
-        if ( this == obj ) return true;
-        if ( obj == null ) return false;
-        if ( getClass() != obj.getClass() ) return false;
+    public boolean equals(final Object obj) {
+        if ( this == obj ) {
+            return true;
+        }
+        if ( obj == null ) {
+            return false;
+        }
+        if ( getClass() != obj.getClass() ) {
+            return false;
+        }
         final OrderItem other = (OrderItem) obj;
-        if ( order == null ) {
-            if ( other.order != null ) return false;
-        } else if ( !order.equals( other.order ) ) return false;
-        if ( seq != other.seq ) return false;
+        if ( this.order == null ) {
+            if ( other.order != null ) {
+                return false;
+            }
+        } else if ( !this.order.equals( other.order ) ) {
+            return false;
+        }
+        if ( this.seq != other.seq ) {
+            return false;
+        }
         return true;
     }
-    
-    
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Parent.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Parent.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Parent.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -21,13 +21,12 @@
  *
  */
 public class Parent extends GrandParent {
-    
+
     public Parent() {
     }
-    
-    public Parent( String name ) {
+
+    public Parent(final String name) {
         super( name );
     }
-    
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Person.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Person.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Person.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -12,7 +12,7 @@
      * 
      */
     private static final long serialVersionUID = 2640286967578736742L;
-    private String      name;
+    private String            name;
     private String            likes;
     private int               age;
     private BigDecimal        bigDecimal;
@@ -24,13 +24,13 @@
     private boolean           alive;
 
     private String            status;
-    
-    private Cheese			  cheese;
 
+    private Cheese            cheese;
+
     public Person() {
-    	
+
     }
-    
+
     public Person(final String name) {
         this( name,
               "",
@@ -80,10 +80,10 @@
         return this.name;
     }
 
-    public void setName(String name) {
+    public void setName(final String name) {
         this.name = name;
     }
-    
+
     /* (non-Javadoc)
      * @see org.drools.PersonInterface#getAge()
      */
@@ -91,7 +91,7 @@
         return this.age;
     }
 
-    public void setAge(int age) {
+    public void setAge(final int age) {
         this.age = age;
     }
 
@@ -127,7 +127,7 @@
         return this.hair;
     }
 
-    public void setHair(String hair) {
+    public void setHair(final String hair) {
         this.hair = hair;
     }
 
@@ -209,17 +209,16 @@
         this.bigInteger = bigInteger;
     }
 
-    public void setLikes(String likes) {
+    public void setLikes(final String likes) {
         this.likes = likes;
     }
 
-	public Cheese getCheese() {
-		return cheese;
-	}
+    public Cheese getCheese() {
+        return this.cheese;
+    }
 
-	public void setCheese(Cheese cheese) {
-		this.cheese = cheese;
-	}
-    
-    
+    public void setCheese(final Cheese cheese) {
+        this.cheese = cheese;
+    }
+
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Precondition.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Precondition.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Precondition.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -3,31 +3,32 @@
 public class Precondition {
     private String code;
     private String value;
-    
+
     public Precondition() {
-        
+
     }
-    
-    public Precondition(String code, String value) {
+
+    public Precondition(final String code,
+                        final String value) {
         super();
         this.code = code;
         this.value = value;
     }
 
     public String getValue() {
-        return value;
+        return this.value;
     }
 
-    public void setValue(String value) {
+    public void setValue(final String value) {
         this.value = value;
     }
 
     public String getCode() {
-        return code;
+        return this.code;
     }
 
-    public void setCode(String code) {
+    public void setCode(final String code) {
         this.code = code;
     }
-    
-} 
\ No newline at end of file
+
+}
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Primitives.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Primitives.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Primitives.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -17,17 +17,17 @@
  */
 
 public class Primitives {
-    private boolean booleanPrimitive;
+    private boolean  booleanPrimitive;
 
-    private char    charPrimitive;
+    private char     charPrimitive;
 
-    private byte    bytePrimitive;
-    private short   shortPrimitive;
-    private int     intPrimitive;
-    private long    longPrimitive;
+    private byte     bytePrimitive;
+    private short    shortPrimitive;
+    private int      intPrimitive;
+    private long     longPrimitive;
 
-    private float   floatPrimitive;
-    private float   doublePrimitive;
+    private float    floatPrimitive;
+    private float    doublePrimitive;
     private Object[] arrayAttribute;
     private int[]    primitiveArrayAttribute;
 
@@ -96,10 +96,10 @@
     }
 
     public Object[] getArrayAttribute() {
-        return arrayAttribute;
+        return this.arrayAttribute;
     }
 
-    public void setArrayAttribute(Object[] arrayAttribute) {
+    public void setArrayAttribute(final Object[] arrayAttribute) {
         this.arrayAttribute = arrayAttribute;
     }
 
@@ -107,13 +107,13 @@
      * @return the primitiveArrayAttribute
      */
     public int[] getPrimitiveArrayAttribute() {
-        return primitiveArrayAttribute;
+        return this.primitiveArrayAttribute;
     }
 
     /**
      * @param primitiveArrayAttribute the primitiveArrayAttribute to set
      */
-    public void setPrimitiveArrayAttribute(int[] primitiveArrayAttribute) {
+    public void setPrimitiveArrayAttribute(final int[] primitiveArrayAttribute) {
         this.primitiveArrayAttribute = primitiveArrayAttribute;
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Process.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Process.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Process.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -22,11 +22,11 @@
  */
 public class Process {
     private String name;
-    
+
     public Process() {
     }
-    
-    public Process( String name ) {
+
+    public Process(final String name) {
         this.name = name;
     }
 
@@ -34,16 +34,14 @@
      * @return the name
      */
     public String getName() {
-        return name;
+        return this.name;
     }
 
     /**
      * @param name the name to set
      */
-    public void setName(String name) {
+    public void setName(final String name) {
         this.name = name;
     }
-    
-    
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/RandomNumber.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/RandomNumber.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/RandomNumber.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -2,22 +2,19 @@
 
 import java.util.Random;
 
-public class RandomNumber
-{
-   private int randomNumber;
-   
-   public void begin()
-   {
-      randomNumber = new Random().nextInt(100);
-   }
-   
-   public void setValue( int value ) {
-       this.randomNumber = value;
-   }
-   
-   public int getValue() 
-   {
-      return randomNumber;
-   }
-   
+public class RandomNumber {
+    private int randomNumber;
+
+    public void begin() {
+        this.randomNumber = new Random().nextInt( 100 );
+    }
+
+    public void setValue(final int value) {
+        this.randomNumber = value;
+    }
+
+    public int getValue() {
+        return this.randomNumber;
+    }
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Sensor.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Sensor.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Sensor.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -5,9 +5,9 @@
     private int pressure;
 
     public Sensor() {
-        
+
     }
-    
+
     public Sensor(final int temp,
                   final int press) {
         this.temperature = temp;

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -6,13 +6,13 @@
 public class State {
     private final PropertyChangeSupport changes = new PropertyChangeSupport( this );
 
-    private String                state;
-    private boolean               flag;
+    private String                      state;
+    private boolean                     flag;
 
     public State() {
-    	
+
     }
-    
+
     public State(final String state) {
         this.state = state;
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/StaticMethods.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/StaticMethods.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/StaticMethods.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,13 +1,13 @@
 package org.drools;
 
 public class StaticMethods {
-    
-    public static String getString1(String string) {
+
+    public static String getString1(final String string) {
         return string;
     }
-    
-    public static String getString2(String string) {
+
+    public static String getString2(final String string) {
         return string;
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/StaticMethods2.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/StaticMethods2.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/StaticMethods2.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,7 +1,8 @@
 package org.drools;
 
-public class StaticMethods2 {    
-    public static String getString3(String string, Integer integer) {
+public class StaticMethods2 {
+    public static String getString3(final String string,
+                                    final Integer integer) {
         return string + integer;
-    }    
+    }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Target.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Target.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Target.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -2,50 +2,62 @@
 
 public class Target {
 
-	public String label;
-	public Float lat;
-	public Float lon;
-	public Float course;
-	public Float speed;
-	public Float time;
-	
-	public Float getCourse() {
-		return course;
-	}
-	public void setCourse(Float course) {
-		this.course = course;
-	}
-	public String getLabel() {
-		return label;
-	}
-	public void setLabel(String label) {
-		this.label = label;
-	}
-	public Float getLat() {
-		return lat;
-	}
-	public void setLat(Float lat) {
-		this.lat = lat;
-	}
-	public Float getLon() {
-		return lon;
-	}
-	public void setLon(Float lon) {
-		this.lon = lon;
-	}
-	public Float getSpeed() {
-		return speed;
-	}
-	public void setSpeed(Float speed) {
-		this.speed = speed;
-	}
-	public Float getTime() {
-		return time;
-	}
-	public void setTime(Float time) {
-		this.time = time;
-	}
-	public String toString(){
-		return "Target< label: "+label+" lat: "+lat+" lon: "+lon+" course: "+course+" speed: "+speed+" time: "+time+">";
-	}
+    public String label;
+    public Float  lat;
+    public Float  lon;
+    public Float  course;
+    public Float  speed;
+    public Float  time;
+
+    public Float getCourse() {
+        return this.course;
+    }
+
+    public void setCourse(final Float course) {
+        this.course = course;
+    }
+
+    public String getLabel() {
+        return this.label;
+    }
+
+    public void setLabel(final String label) {
+        this.label = label;
+    }
+
+    public Float getLat() {
+        return this.lat;
+    }
+
+    public void setLat(final Float lat) {
+        this.lat = lat;
+    }
+
+    public Float getLon() {
+        return this.lon;
+    }
+
+    public void setLon(final Float lon) {
+        this.lon = lon;
+    }
+
+    public Float getSpeed() {
+        return this.speed;
+    }
+
+    public void setSpeed(final Float speed) {
+        this.speed = speed;
+    }
+
+    public Float getTime() {
+        return this.time;
+    }
+
+    public void setTime(final Float time) {
+        this.time = time;
+    }
+
+    public String toString() {
+        return "Target< label: " + this.label + " lat: " + this.lat + " lon: " + this.lon + " course: " + this.course + " speed: " + this.speed + " time: " + this.time + ">";
+    }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/TestParam.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/TestParam.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/TestParam.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -4,18 +4,21 @@
 
     private String value1;
     private String value2;
+
     public String getValue1() {
-        return value1;
+        return this.value1;
     }
-    public void setValue1(String value1) {
+
+    public void setValue1(final String value1) {
         this.value1 = value1;
     }
+
     public String getValue2() {
-        return value2;
+        return this.value2;
     }
-    public void setValue2(String value2) {
+
+    public void setValue2(final String value2) {
         this.value2 = value2;
     }
-    
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/client/modeldriven/SuggestionCompletionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/client/modeldriven/SuggestionCompletionTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/client/modeldriven/SuggestionCompletionTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -7,141 +7,197 @@
 public class SuggestionCompletionTest extends TestCase {
 
     public void testCompletions() {
-        
-        
-        SuggestionCompletionEngine com = new SuggestionCompletionEngine();
 
-        com.factTypes = new String[] {"Person", "Vehicle"};
-        com.fieldsForType = new HashMap() {{
-            put("Person", new String[] {"age", "name", "rank"});
-            put("Vehicle", new String[] {"type", "make"});
-        }};
-        com.fieldTypes = new HashMap() {{
-           put("Person.age", "Numeric");
-           put("Person.rank", "Comparable");
-           put("Person.name", "String");
-           put("Vehicle.make", "String");
-           put("Vehicle.type", "String");
-        }};
-        com.globalTypes = new HashMap() {{
-           put("bar", "Person");
-           put("baz", "Vehicle");
-        }};
-        
+        final SuggestionCompletionEngine com = new SuggestionCompletionEngine();
 
-        
-        String[] c =com.getConditionalElements();
-        assertEquals("not", c[0]);
-        assertEquals("exists", c[1]);
-        assertEquals("or", c[2]);
-        
+        com.factTypes = new String[]{"Person", "Vehicle"};
+        com.fieldsForType = new HashMap() {
+            {
+                put( "Person",
+                     new String[]{"age", "name", "rank"} );
+                put( "Vehicle",
+                     new String[]{"type", "make"} );
+            }
+        };
+        com.fieldTypes = new HashMap() {
+            {
+                put( "Person.age",
+                     "Numeric" );
+                put( "Person.rank",
+                     "Comparable" );
+                put( "Person.name",
+                     "String" );
+                put( "Vehicle.make",
+                     "String" );
+                put( "Vehicle.type",
+                     "String" );
+            }
+        };
+        com.globalTypes = new HashMap() {
+            {
+                put( "bar",
+                     "Person" );
+                put( "baz",
+                     "Vehicle" );
+            }
+        };
+
+        String[] c = com.getConditionalElements();
+        assertEquals( "not",
+                      c[0] );
+        assertEquals( "exists",
+                      c[1] );
+        assertEquals( "or",
+                      c[2] );
+
         c = com.getFactTypes();
-        assertEquals(2, c.length);
-        assertContains("Person", c);
-        assertContains("Vehicle", c);
+        assertEquals( 2,
+                      c.length );
+        assertContains( "Person",
+                        c );
+        assertContains( "Vehicle",
+                        c );
 
-        
         c = com.getFieldCompletions( "Person" );
-        assertEquals("age", c[0]);
-        assertEquals("name", c[1]);
-        
+        assertEquals( "age",
+                      c[0] );
+        assertEquals( "name",
+                      c[1] );
+
         c = com.getFieldCompletions( "Vehicle" );
-        assertEquals("type", c[0]);
-        assertEquals( "make", c[1] );
-        
-        c = com.getOperatorCompletions( "Person", "name" );
-        assertEquals(3, c.length);
-        assertEquals("==", c[0]);
-        assertEquals( "!=", c[1] );
-        assertEquals( "matches", c[2] );
-        
-        
-        c = com.getOperatorCompletions( "Person", "age" );
-        assertEquals(6, c.length);
-        assertEquals(c[0], "==");
-        assertEquals(c[1], "!=");
-        assertEquals(c[2], "<" );
-        assertEquals(c[3], ">" );
-        
-        c = com.getOperatorCompletions( "Person", "rank" );        
-        assertEquals(6, c.length);
-        assertEquals(c[0], "==");
-        assertEquals(c[1], "!=");
-        assertEquals(c[2], "<" );
-        assertEquals(c[3], ">" );
+        assertEquals( "type",
+                      c[0] );
+        assertEquals( "make",
+                      c[1] );
 
-        c = com.getConnectiveOperatorCompletions( "Vehicle", "make" );
-        assertEquals(5, c.length);
-        assertEquals("| ==", c[0]);
-        
+        c = com.getOperatorCompletions( "Person",
+                                        "name" );
+        assertEquals( 3,
+                      c.length );
+        assertEquals( "==",
+                      c[0] );
+        assertEquals( "!=",
+                      c[1] );
+        assertEquals( "matches",
+                      c[2] );
+
+        c = com.getOperatorCompletions( "Person",
+                                        "age" );
+        assertEquals( 6,
+                      c.length );
+        assertEquals( c[0],
+                      "==" );
+        assertEquals( c[1],
+                      "!=" );
+        assertEquals( c[2],
+                      "<" );
+        assertEquals( c[3],
+                      ">" );
+
+        c = com.getOperatorCompletions( "Person",
+                                        "rank" );
+        assertEquals( 6,
+                      c.length );
+        assertEquals( c[0],
+                      "==" );
+        assertEquals( c[1],
+                      "!=" );
+        assertEquals( c[2],
+                      "<" );
+        assertEquals( c[3],
+                      ">" );
+
+        c = com.getConnectiveOperatorCompletions( "Vehicle",
+                                                  "make" );
+        assertEquals( 5,
+                      c.length );
+        assertEquals( "| ==",
+                      c[0] );
+
         c = com.getGlobalVariables();
-        assertEquals(2, c.length);
-        assertEquals("baz", c[0]);
-        assertEquals("bar", c[1]);
-        
+        assertEquals( 2,
+                      c.length );
+        assertEquals( "baz",
+                      c[0] );
+        assertEquals( "bar",
+                      c[1] );
+
         c = com.getFieldCompletionsForGlobalVariable( "bar" );
-        assertEquals(3, c.length);
-        assertEquals("age", c[0]);
-        assertEquals("name", c[1]);
+        assertEquals( 3,
+                      c.length );
+        assertEquals( "age",
+                      c[0] );
+        assertEquals( "name",
+                      c[1] );
 
         c = com.getFieldCompletionsForGlobalVariable( "baz" );
-        assertEquals(2, c.length);
-        assertEquals("type", c[0]);
-        assertEquals("make", c[1]);
+        assertEquals( 2,
+                      c.length );
+        assertEquals( "type",
+                      c[0] );
+        assertEquals( "make",
+                      c[1] );
 
+        //check that it has default operators for general objects
+        c = com.getOperatorCompletions( "Person",
+                                        "wankle" );
+        assertEquals( 2,
+                      c.length );
 
-        //check that it has default operators for general objects
-        c = com.getOperatorCompletions( "Person", "wankle" );
-        assertEquals(2, c.length);        
-        
     }
-    
+
     public void testAdd() {
-        SuggestionCompletionEngine com = new SuggestionCompletionEngine();
-        com.factTypes = new String[] {"Foo"};
-        com.fieldsForType = new HashMap() {{
-           put("Foo", new String[] {"a"}); 
-        }};
-        
-        assertEquals(1, com.getFactTypes().length);
-        assertEquals("Foo", com.getFactTypes()[0]);
-        
-        assertEquals(1, com.getFieldCompletions( "Foo" ).length);
-        assertEquals("a", com.getFieldCompletions( "Foo" )[0]);
-        
+        final SuggestionCompletionEngine com = new SuggestionCompletionEngine();
+        com.factTypes = new String[]{"Foo"};
+        com.fieldsForType = new HashMap() {
+            {
+                put( "Foo",
+                     new String[]{"a"} );
+            }
+        };
+
+        assertEquals( 1,
+                      com.getFactTypes().length );
+        assertEquals( "Foo",
+                      com.getFactTypes()[0] );
+
+        assertEquals( 1,
+                      com.getFieldCompletions( "Foo" ).length );
+        assertEquals( "a",
+                      com.getFieldCompletions( "Foo" )[0] );
+
     }
-    
-    private void assertContains(String string,
-                                String[] c) {
-        
+
+    private void assertContains(final String string,
+                                final String[] c) {
+
         for ( int i = 0; i < c.length; i++ ) {
-            if (string.equals( c[i] )) {
+            if ( string.equals( c[i] ) ) {
                 return;
             }
-        } 
+        }
         fail( "String array did not contain: " + string );
-        
+
     }
-    
-    
+
     public void testGlobalAndFacts() {
-        SuggestionCompletionEngine com = new SuggestionCompletionEngine();
+        final SuggestionCompletionEngine com = new SuggestionCompletionEngine();
 
-        com.globalTypes = new HashMap() {{
-            put("y", "Foo");
-        }};
-        com.fieldsForType = new HashMap() {{
-           put("Foo", new String[] {"a"}); 
-        }};
-        
-        
-        
-        assertFalse(com.isGlobalVariable( "x" ));        
-        assertTrue(com.isGlobalVariable( "y" ));
+        com.globalTypes = new HashMap() {
+            {
+                put( "y",
+                     "Foo" );
+            }
+        };
+        com.fieldsForType = new HashMap() {
+            {
+                put( "Foo",
+                     new String[]{"a"} );
+            }
+        };
+
+        assertFalse( com.isGlobalVariable( "x" ) );
+        assertTrue( com.isGlobalVariable( "y" ) );
     }
-    
-    
-    
-    
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionFieldValueTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionFieldValueTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionFieldValueTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -7,10 +7,12 @@
 public class ActionFieldValueTest extends TestCase {
 
     public void testFormula() {
-        ActionFieldValue val = new ActionFieldValue("x", "y");
-        assertFalse(val.isFormula());
-        val = new ActionFieldValue("x", "=y * 20");
-        assertTrue(val.isFormula());
+        ActionFieldValue val = new ActionFieldValue( "x",
+                                                     "y" );
+        assertFalse( val.isFormula() );
+        val = new ActionFieldValue( "x",
+                                    "=y * 20" );
+        assertTrue( val.isFormula() );
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionSetFieldTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionSetFieldTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionSetFieldTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -8,35 +8,45 @@
 public class ActionSetFieldTest extends TestCase {
 
     public void testRemove() {
-        ActionSetField set = new ActionSetField();
+        final ActionSetField set = new ActionSetField();
         set.fieldValues = new ActionFieldValue[2];
-        ActionFieldValue v0 = new ActionFieldValue("x", "42");
-        ActionFieldValue v1 = new ActionFieldValue("y", "43");
+        final ActionFieldValue v0 = new ActionFieldValue( "x",
+                                                    "42" );
+        final ActionFieldValue v1 = new ActionFieldValue( "y",
+                                                    "43" );
         set.fieldValues[0] = v0;
         set.fieldValues[1] = v1;
-        
+
         set.removeField( 1 );
-        
-        assertEquals(1, set.fieldValues.length);
-        assertEquals(v0, set.fieldValues[0]);
-        
+
+        assertEquals( 1,
+                      set.fieldValues.length );
+        assertEquals( v0,
+                      set.fieldValues[0] );
+
     }
-    
+
     public void testAdd() {
-        ActionSetField set = new ActionSetField();
+        final ActionSetField set = new ActionSetField();
         set.fieldValues = new ActionFieldValue[2];
-        ActionFieldValue v0 = new ActionFieldValue("x", "42");
-        ActionFieldValue v1 = new ActionFieldValue("y", "43");
+        final ActionFieldValue v0 = new ActionFieldValue( "x",
+                                                    "42" );
+        final ActionFieldValue v1 = new ActionFieldValue( "y",
+                                                    "43" );
         set.fieldValues[0] = v0;
         set.fieldValues[1] = v1;
 
-        ActionFieldValue q = new ActionFieldValue("q", "q");
-        set.addFieldValue( q);
-        
-        assertEquals(3, set.fieldValues.length);
-        assertEquals(q, set.fieldValues[2]);
-        assertEquals(v0, set.fieldValues[0]);
-        
+        final ActionFieldValue q = new ActionFieldValue( "q",
+                                                   "q" );
+        set.addFieldValue( q );
+
+        assertEquals( 3,
+                      set.fieldValues.length );
+        assertEquals( q,
+                      set.fieldValues[2] );
+        assertEquals( v0,
+                      set.fieldValues[0] );
+
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/CompositeFactPatternTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/CompositeFactPatternTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/CompositeFactPatternTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -8,17 +8,20 @@
 public class CompositeFactPatternTest extends TestCase {
 
     public void testAddPattern() {
-        CompositeFactPattern pat = new CompositeFactPattern();
-        FactPattern x = new FactPattern();
-        pat.addFactPattern( x  );
-        assertEquals(1, pat.patterns.length);
-        
-        FactPattern y = new FactPattern();
-        pat.addFactPattern( y  );
-        assertEquals(2, pat.patterns.length);
-        assertEquals(x, pat.patterns[0]);
-        assertEquals(y, pat.patterns[1]);
+        final CompositeFactPattern pat = new CompositeFactPattern();
+        final FactPattern x = new FactPattern();
+        pat.addFactPattern( x );
+        assertEquals( 1,
+                      pat.patterns.length );
+
+        final FactPattern y = new FactPattern();
+        pat.addFactPattern( y );
+        assertEquals( 2,
+                      pat.patterns.length );
+        assertEquals( x,
+                      pat.patterns[0] );
+        assertEquals( y,
+                      pat.patterns[1] );
     }
-    
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ConnectiveConstraintTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ConnectiveConstraintTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ConnectiveConstraintTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,6 +1,5 @@
 package org.drools.brms.modeldriven;
 
-import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.brms.client.modeldriven.brxml.ConnectiveConstraint;
 
 import junit.framework.TestCase;
@@ -8,26 +7,31 @@
 public class ConnectiveConstraintTest extends TestCase {
 
     public void testConnectiveType() {
-        ConnectiveConstraint con = new ConnectiveConstraint("| =", "x");
-        assertTrue(con.isORConnective());
-        assertFalse(con.isANDConnective());
+        ConnectiveConstraint con = new ConnectiveConstraint( "| =",
+                                                             "x" );
+        assertTrue( con.isORConnective() );
+        assertFalse( con.isANDConnective() );
 
-        con = new ConnectiveConstraint("||<", "x");
-        assertTrue(con.isORConnective());
-        assertFalse(con.isANDConnective());
+        con = new ConnectiveConstraint( "||<",
+                                        "x" );
+        assertTrue( con.isORConnective() );
+        assertFalse( con.isANDConnective() );
 
-        con = new ConnectiveConstraint("||<", "x");
-        assertTrue(con.isORConnective());
-        assertFalse(con.isANDConnective());
+        con = new ConnectiveConstraint( "||<",
+                                        "x" );
+        assertTrue( con.isORConnective() );
+        assertFalse( con.isANDConnective() );
 
-        con = new ConnectiveConstraint("& !=", "x");
-        assertFalse(con.isORConnective());
-        assertTrue(con.isANDConnective());
+        con = new ConnectiveConstraint( "& !=",
+                                        "x" );
+        assertFalse( con.isORConnective() );
+        assertTrue( con.isANDConnective() );
 
-        con = new ConnectiveConstraint("&& !=", "x");
-        assertFalse(con.isORConnective());
-        assertTrue(con.isANDConnective());
-        
+        con = new ConnectiveConstraint( "&& !=",
+                                        "x" );
+        assertFalse( con.isORConnective() );
+        assertTrue( con.isANDConnective() );
+
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ConstraintTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ConstraintTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ConstraintTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -7,18 +7,19 @@
 public class ConstraintTest extends TestCase {
 
     public void testAdd() {
-        Constraint con = new Constraint();
+        final Constraint con = new Constraint();
         con.addNewConnective();
-        
-        assertEquals(1, con.connectives.length);
-        assertNotNull(con.connectives[0]);
 
+        assertEquals( 1,
+                      con.connectives.length );
+        assertNotNull( con.connectives[0] );
+
         con.addNewConnective();
-        
-        assertEquals(2, con.connectives.length);
-        assertNotNull(con.connectives[1]);
 
-        
+        assertEquals( 2,
+                      con.connectives.length );
+        assertNotNull( con.connectives[1] );
+
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/DSLSentenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/DSLSentenceTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/DSLSentenceTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -6,19 +6,21 @@
 
 public class DSLSentenceTest extends TestCase {
 
-    
     public void testSentence() {
-        
-        DSLSentence sen = new DSLSentence();
+
+        final DSLSentence sen = new DSLSentence();
         sen.sentence = "this is {something} here and {here}";
-        assertEquals("this is something here and here", sen.toString());
-        
+        assertEquals( "this is something here and here",
+                      sen.toString() );
+
         sen.sentence = "foo bar";
-        assertEquals("foo bar", sen.toString());
-        
-        DSLSentence newOne = sen.copy();
-        assertFalse(newOne == sen);
-        assertEquals(newOne.sentence, sen.sentence);
+        assertEquals( "foo bar",
+                      sen.toString() );
+
+        final DSLSentence newOne = sen.copy();
+        assertFalse( newOne == sen );
+        assertEquals( newOne.sentence,
+                      sen.sentence );
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/FactPatternTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/FactPatternTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/FactPatternTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -8,39 +8,45 @@
 public class FactPatternTest extends TestCase {
 
     public void testAddConstraint() {
-        FactPattern p = new FactPattern();
-        Constraint x = new Constraint("x");
-        p.addConstraint(x);
-        
-        assertEquals(1, p.constraints.length);
-        assertEquals(x, p.constraints[0]);
-        
-        Constraint y = new Constraint("y");
-        
+        final FactPattern p = new FactPattern();
+        final Constraint x = new Constraint( "x" );
+        p.addConstraint( x );
+
+        assertEquals( 1,
+                      p.constraints.length );
+        assertEquals( x,
+                      p.constraints[0] );
+
+        final Constraint y = new Constraint( "y" );
+
         p.addConstraint( y );
-        assertEquals(2, p.constraints.length);
-        assertEquals(x, p.constraints[0]);
-        assertEquals(y, p.constraints[1]);
-        
+        assertEquals( 2,
+                      p.constraints.length );
+        assertEquals( x,
+                      p.constraints[0] );
+        assertEquals( y,
+                      p.constraints[1] );
+
     }
-    
+
     public void testRemoveConstraint() {
-        FactPattern p = new FactPattern();
-        Constraint x = new Constraint("x");
-        p.addConstraint(x);
-        Constraint y = new Constraint("y");        
+        final FactPattern p = new FactPattern();
+        final Constraint x = new Constraint( "x" );
+        p.addConstraint( x );
+        final Constraint y = new Constraint( "y" );
         p.addConstraint( y );
 
-        assertEquals(2, p.constraints.length);
-        
-        p.removeConstraint(1);
-        
-        assertEquals(1, p.constraints.length);
-        
-        assertEquals(x, p.constraints[0]);
-        
+        assertEquals( 2,
+                      p.constraints.length );
+
+        p.removeConstraint( 1 );
+
+        assertEquals( 1,
+                      p.constraints.length );
+
+        assertEquals( x,
+                      p.constraints[0] );
+
     }
-    
-    
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/RuleModelTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/RuleModelTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/RuleModelTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -10,6 +10,7 @@
 import org.drools.brms.client.modeldriven.brxml.Constraint;
 import org.drools.brms.client.modeldriven.brxml.FactPattern;
 import org.drools.brms.client.modeldriven.brxml.IAction;
+import org.drools.brms.client.modeldriven.brxml.IConstraint;
 import org.drools.brms.client.modeldriven.brxml.IPattern;
 import org.drools.brms.client.modeldriven.brxml.RuleAttribute;
 import org.drools.brms.client.modeldriven.brxml.RuleModel;
@@ -19,228 +20,269 @@
 public class RuleModelTest extends TestCase {
 
     public void testBoundFactFinder() {
-        RuleModel model = new RuleModel();
-        
-        assertNull(model.getBoundFact( "x" ));
+        final RuleModel model = new RuleModel();
+
+        assertNull( model.getBoundFact( "x" ) );
         model.lhs = new IPattern[3];
-        
-        FactPattern x = new FactPattern("Car");
+
+        final FactPattern x = new FactPattern( "Car" );
         model.lhs[0] = x;
         x.boundName = "x";
-        
-        assertNotNull(model.getBoundFact( "x" ));
-        assertEquals(x, model.getBoundFact( "x" ));
-        
-        FactPattern y = new FactPattern("Car");
+
+        assertNotNull( model.getBoundFact( "x" ) );
+        assertEquals( x,
+                      model.getBoundFact( "x" ) );
+
+        final FactPattern y = new FactPattern( "Car" );
         model.lhs[1] = y;
         y.boundName = "y";
-        
-        FactPattern other = new FactPattern("House");
+
+        final FactPattern other = new FactPattern( "House" );
         model.lhs[2] = other;
-        
-        assertEquals(y, model.getBoundFact( "y" ));
-        assertEquals(x, model.getBoundFact( "x" ));
-        
-        
+
+        assertEquals( y,
+                      model.getBoundFact( "y" ) );
+        assertEquals( x,
+                      model.getBoundFact( "x" ) );
+
         model.rhs = new IAction[1];
-        ActionSetField set = new ActionSetField();
+        final ActionSetField set = new ActionSetField();
         set.variable = "x";
         model.rhs[0] = set;
-        
-        assertTrue(model.isBoundFactUsed( "x" ));
-        assertFalse(model.isBoundFactUsed( "y" ));
-        
-        assertEquals(3, model.lhs.length);
-        assertFalse(model.removeLhsItem( 0 ));
-        assertEquals(3, model.lhs.length);
-        
-        ActionRetractFact fact = new ActionRetractFact("q");
+
+        assertTrue( model.isBoundFactUsed( "x" ) );
+        assertFalse( model.isBoundFactUsed( "y" ) );
+
+        assertEquals( 3,
+                      model.lhs.length );
+        assertFalse( model.removeLhsItem( 0 ) );
+        assertEquals( 3,
+                      model.lhs.length );
+
+        final ActionRetractFact fact = new ActionRetractFact( "q" );
         model.rhs[0] = fact;
-        assertTrue(model.isBoundFactUsed( "q" ));
-        assertFalse(model.isBoundFactUsed( "x" ));
-        
-        XStream xt = new XStream();
-        xt.alias( "rule", RuleModel.class );
-        xt.alias( "fact", FactPattern.class );
-        xt.alias( "retract", ActionRetractFact.class );
-        
-        
-        String brl = xt.toXML( model );
-        
-        System.out.println(brl);
+        assertTrue( model.isBoundFactUsed( "q" ) );
+        assertFalse( model.isBoundFactUsed( "x" ) );
+
+        final XStream xt = new XStream();
+        xt.alias( "rule",
+                  RuleModel.class );
+        xt.alias( "fact",
+                  FactPattern.class );
+        xt.alias( "retract",
+                  ActionRetractFact.class );
+
+        final String brl = xt.toXML( model );
+
+        System.out.println( brl );
     }
-    
+
     public void testScopedVariables() {
-        
+
         //setup the data...
-        
-        RuleModel model = new RuleModel();
+
+        final RuleModel model = new RuleModel();
         model.lhs = new IPattern[3];
-        FactPattern x = new FactPattern("Car");
+        final FactPattern x = new FactPattern( "Car" );
         model.lhs[0] = x;
         x.boundName = "x";
-        
-        FactPattern y = new FactPattern("Car");
+
+        final FactPattern y = new FactPattern( "Car" );
         model.lhs[1] = y;
         y.boundName = "y";
-        Constraint[] cons = new Constraint[2];
+        final Constraint[] cons = new Constraint[2];
         y.constraints = cons;
-        cons[0] = new Constraint("age");
-        cons[1] = new Constraint("make");
+        cons[0] = new Constraint( "age" );
+        cons[1] = new Constraint( "make" );
         cons[0].fieldBinding = "qbc";
         cons[0].connectives = new ConnectiveConstraint[1];
-        cons[0].connectives[0] = new ConnectiveConstraint("&", "x");
-        cons[0].connectives[0].constraintValueType = ConnectiveConstraint.TYPE_LITERAL;
-        
-        FactPattern other = new FactPattern("House");
+        cons[0].connectives[0] = new ConnectiveConstraint( "&",
+                                                           "x" );
+        cons[0].connectives[0].constraintValueType = IConstraint.TYPE_LITERAL;
+
+        final FactPattern other = new FactPattern( "House" );
         model.lhs[2] = other;
         other.boundName = "q";
-        Constraint[] cons2 = new Constraint[1];
+        final Constraint[] cons2 = new Constraint[1];
         cons2[0] = new Constraint();
         other.constraints = cons2;
-        
-        
+
         //check the results for correct scope
-        List vars = model.getBoundVariablesInScope(cons[0]);
-        assertEquals(1, vars.size());
-        assertEquals("x", vars.get( 0 ));
-        
-        
-        vars = model.getBoundVariablesInScope(cons[0].connectives[0]);
-        assertEquals(1, vars.size());
-        assertEquals("x", vars.get( 0 ));        
-        
-        vars = model.getBoundVariablesInScope(cons[1]);
-        assertEquals(2, vars.size());
-        assertEquals("x", vars.get( 0 ));
-        assertEquals("qbc", vars.get( 1 ));   
-        
-        vars = model.getBoundVariablesInScope(cons[0]);
-        assertEquals(1, vars.size());
-        assertEquals("x", vars.get( 0 ));
-        
-        
-        vars = model.getBoundVariablesInScope(cons2[0]);
-        assertEquals(3, vars.size());
-        assertEquals("x", vars.get( 0 ));        
-        assertEquals("qbc", vars.get( 1 ));
-        assertEquals("y", vars.get( 2 ));
+        List vars = model.getBoundVariablesInScope( cons[0] );
+        assertEquals( 1,
+                      vars.size() );
+        assertEquals( "x",
+                      vars.get( 0 ) );
+
+        vars = model.getBoundVariablesInScope( cons[0].connectives[0] );
+        assertEquals( 1,
+                      vars.size() );
+        assertEquals( "x",
+                      vars.get( 0 ) );
+
+        vars = model.getBoundVariablesInScope( cons[1] );
+        assertEquals( 2,
+                      vars.size() );
+        assertEquals( "x",
+                      vars.get( 0 ) );
+        assertEquals( "qbc",
+                      vars.get( 1 ) );
+
+        vars = model.getBoundVariablesInScope( cons[0] );
+        assertEquals( 1,
+                      vars.size() );
+        assertEquals( "x",
+                      vars.get( 0 ) );
+
+        vars = model.getBoundVariablesInScope( cons2[0] );
+        assertEquals( 3,
+                      vars.size() );
+        assertEquals( "x",
+                      vars.get( 0 ) );
+        assertEquals( "qbc",
+                      vars.get( 1 ) );
+        assertEquals( "y",
+                      vars.get( 2 ) );
     }
-    
+
     public void testBindingList() {
-        RuleModel model = new RuleModel();
-        
+        final RuleModel model = new RuleModel();
+
         model.lhs = new IPattern[3];
-        FactPattern x = new FactPattern("Car");
+        final FactPattern x = new FactPattern( "Car" );
         model.lhs[0] = x;
         x.boundName = "x";
-        
-        FactPattern y = new FactPattern("Car");
+
+        final FactPattern y = new FactPattern( "Car" );
         model.lhs[1] = y;
         y.boundName = "y";
-        
-        FactPattern other = new FactPattern("House");
+
+        final FactPattern other = new FactPattern( "House" );
         model.lhs[2] = other;
-        
-        
-        List b = model.getBoundFacts();
-        assertEquals(2, b.size());
-        
-        assertEquals("x", b.get( 0 ));
-        assertEquals("y", b.get( 1 ));
-        
+
+        final List b = model.getBoundFacts();
+        assertEquals( 2,
+                      b.size() );
+
+        assertEquals( "x",
+                      b.get( 0 ) );
+        assertEquals( "y",
+                      b.get( 1 ) );
+
     }
-    
+
     public void testRemoveItemLhs() {
-        RuleModel model = new RuleModel();
-        
+        final RuleModel model = new RuleModel();
+
         model.lhs = new IPattern[3];
-        FactPattern x = new FactPattern("Car");
+        final FactPattern x = new FactPattern( "Car" );
         model.lhs[0] = x;
         x.boundName = "x";
-        
-        FactPattern y = new FactPattern("Car");
+
+        final FactPattern y = new FactPattern( "Car" );
         model.lhs[1] = y;
         y.boundName = "y";
-        
-        FactPattern other = new FactPattern("House");
+
+        final FactPattern other = new FactPattern( "House" );
         model.lhs[2] = other;
-        
-        assertEquals(3, model.lhs.length);
-        assertEquals(x, model.lhs[0]);
-        
+
+        assertEquals( 3,
+                      model.lhs.length );
+        assertEquals( x,
+                      model.lhs[0] );
+
         model.removeLhsItem( 0 );
-        
-        assertEquals(2, model.lhs.length);
-        assertEquals(y, model.lhs[0]);        
+
+        assertEquals( 2,
+                      model.lhs.length );
+        assertEquals( y,
+                      model.lhs[0] );
     }
-    
+
     public void testRemoveItemRhs() {
-        RuleModel model = new RuleModel();
-        
+        final RuleModel model = new RuleModel();
+
         model.rhs = new IAction[3];
-        ActionRetractFact r0 = new ActionRetractFact("x");
-        ActionRetractFact r1 = new ActionRetractFact("y");
-        ActionRetractFact r2 = new ActionRetractFact("z");
-        
+        final ActionRetractFact r0 = new ActionRetractFact( "x" );
+        final ActionRetractFact r1 = new ActionRetractFact( "y" );
+        final ActionRetractFact r2 = new ActionRetractFact( "z" );
+
         model.rhs[0] = r0;
         model.rhs[1] = r1;
         model.rhs[2] = r2;
-        
-        model.removeRhsItem(1);
-        
-        assertEquals(2, model.rhs.length);
-        assertEquals(r0, model.rhs[0]);
-        assertEquals(r2, model.rhs[1]);        
+
+        model.removeRhsItem( 1 );
+
+        assertEquals( 2,
+                      model.rhs.length );
+        assertEquals( r0,
+                      model.rhs[0] );
+        assertEquals( r2,
+                      model.rhs[1] );
     }
-    
+
     public void testAddItemLhs() {
-        RuleModel model = new RuleModel();
-        FactPattern x = new FactPattern();
+        final RuleModel model = new RuleModel();
+        final FactPattern x = new FactPattern();
         model.addLhsItem( x );
-        assertEquals(1, model.lhs.length);
-        
-        FactPattern y = new FactPattern();
+        assertEquals( 1,
+                      model.lhs.length );
+
+        final FactPattern y = new FactPattern();
         model.addLhsItem( y );
-        
-        assertEquals(2, model.lhs.length);
-        assertEquals(x, model.lhs[0]);
-        assertEquals(y, model.lhs[1]);
-        
+
+        assertEquals( 2,
+                      model.lhs.length );
+        assertEquals( x,
+                      model.lhs[0] );
+        assertEquals( y,
+                      model.lhs[1] );
+
     }
-    
+
     public void testAddItemRhs() {
-        RuleModel model = new RuleModel();
-        IAction a0 = new ActionSetField();
-        IAction a1 = new ActionSetField();
-        
+        final RuleModel model = new RuleModel();
+        final IAction a0 = new ActionSetField();
+        final IAction a1 = new ActionSetField();
+
         model.addRhsItem( a0 );
-        
-        assertEquals(1, model.rhs.length);
+
+        assertEquals( 1,
+                      model.rhs.length );
         model.addRhsItem( a1 );
-        
-        assertEquals(2, model.rhs.length);
-        
-        assertEquals(a0, model.rhs[0]);
-        assertEquals(a1, model.rhs[1]);
+
+        assertEquals( 2,
+                      model.rhs.length );
+
+        assertEquals( a0,
+                      model.rhs[0] );
+        assertEquals( a1,
+                      model.rhs[1] );
     }
-    
+
     public void testAttributes() {
-        RuleModel m = new RuleModel();
-        RuleAttribute at = new RuleAttribute("salience", "42");
-        m.addAttribute(at);
-        assertEquals(1, m.attributes.length);
-        assertEquals(at, m.attributes[0]);
-        
-        RuleAttribute at2 = new RuleAttribute("agenda-group", "x");
+        final RuleModel m = new RuleModel();
+        final RuleAttribute at = new RuleAttribute( "salience",
+                                              "42" );
+        m.addAttribute( at );
+        assertEquals( 1,
+                      m.attributes.length );
+        assertEquals( at,
+                      m.attributes[0] );
+
+        final RuleAttribute at2 = new RuleAttribute( "agenda-group",
+                                               "x" );
         m.addAttribute( at2 );
-        assertEquals(2, m.attributes.length);
-        assertEquals(at2, m.attributes[1]);
-        
+        assertEquals( 2,
+                      m.attributes.length );
+        assertEquals( at2,
+                      m.attributes[1] );
+
         m.removeAttribute( 0 );
-        assertEquals(1, m.attributes.length);
-        assertEquals(at2, m.attributes[0]);
+        assertEquals( 1,
+                      m.attributes.length );
+        assertEquals( at2,
+                      m.attributes[0] );
     }
-    
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/converter/BRXMLToDescrConverterTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/converter/BRXMLToDescrConverterTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/converter/BRXMLToDescrConverterTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -7,16 +7,15 @@
 import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
 import org.drools.brms.client.modeldriven.brxml.Constraint;
 import org.drools.brms.client.modeldriven.brxml.FactPattern;
+import org.drools.brms.client.modeldriven.brxml.IConstraint;
 import org.drools.brms.client.modeldriven.brxml.RuleAttribute;
 import org.drools.brms.client.modeldriven.brxml.RuleModel;
 import org.drools.lang.descr.AttributeDescr;
 import org.drools.lang.descr.ColumnDescr;
-import org.drools.lang.descr.ConditionalElementDescr;
 import org.drools.lang.descr.FieldConstraintDescr;
 import org.drools.lang.descr.LiteralRestrictionDescr;
 import org.drools.lang.descr.OrDescr;
 import org.drools.lang.descr.RuleDescr;
-import org.drools.rule.LiteralConstraint;
 
 public class BRXMLToDescrConverterTest extends TestCase {
 
@@ -29,65 +28,80 @@
     }
 
     public void testToDescr() {
-        BRXMLToDescrConverter converter = new BRXMLToDescrConverter();
-        
-        RuleModel model = new RuleModel();
-        
+        final BRXMLToDescrConverter converter = new BRXMLToDescrConverter();
+
+        final RuleModel model = new RuleModel();
+
         // adding rule's attributes
-        RuleAttribute salience = new RuleAttribute( "salience", "10" );
-        RuleAttribute noloop = new RuleAttribute( "no-loop", null );
-        model.addAttribute( salience ); 
-        model.addAttribute( noloop ); 
-        
+        final RuleAttribute salience = new RuleAttribute( "salience",
+                                                    "10" );
+        final RuleAttribute noloop = new RuleAttribute( "no-loop",
+                                                  null );
+        model.addAttribute( salience );
+        model.addAttribute( noloop );
+
         // adding simple pattern
-        FactPattern pat1 = new FactPattern("Cheese");
+        final FactPattern pat1 = new FactPattern( "Cheese" );
         pat1.boundName = "cheese";
-        Constraint constr = new Constraint( "type" );
+        final Constraint constr = new Constraint( "type" );
         constr.operator = "==";
         constr.value = "stilton";
-        constr.constraintValueType = Constraint.TYPE_LITERAL;
+        constr.constraintValueType = IConstraint.TYPE_LITERAL;
         pat1.addConstraint( constr );
         model.addLhsItem( pat1 );
-        
-        CompositeFactPattern comp1 = new CompositeFactPattern();
+
+        final CompositeFactPattern comp1 = new CompositeFactPattern();
         comp1.type = CompositeFactPattern.OR;
-        
-        FactPattern pat2 = new FactPattern("Person");
-        FactPattern pat3 = new FactPattern("People");
+
+        final FactPattern pat2 = new FactPattern( "Person" );
+        final FactPattern pat3 = new FactPattern( "People" );
         comp1.addFactPattern( pat2 );
         comp1.addFactPattern( pat3 );
-        
+
         model.addLhsItem( comp1 );
-        
+
         // converting into descr
-        RuleDescr rule = converter.toDescr( model, "" );
+        final RuleDescr rule = converter.toDescr( model,
+                                            "" );
         // checking Attributes
-        List attributes = rule.getAttributes(); 
-        assertEquals( 2, attributes.size() );
-        AttributeDescr salienceDescr = (AttributeDescr) attributes.get( 0 );
-        assertEquals( salience.attributeName, salienceDescr.getName() );
-        assertEquals( salience.value, salienceDescr.getValue() );
-        AttributeDescr noloopDescr = (AttributeDescr) attributes.get( 1 );
-        assertEquals( noloop.attributeName, noloopDescr.getName() );
-        assertEquals( "true", noloopDescr.getValue() );
-        
+        final List attributes = rule.getAttributes();
+        assertEquals( 2,
+                      attributes.size() );
+        final AttributeDescr salienceDescr = (AttributeDescr) attributes.get( 0 );
+        assertEquals( salience.attributeName,
+                      salienceDescr.getName() );
+        assertEquals( salience.value,
+                      salienceDescr.getValue() );
+        final AttributeDescr noloopDescr = (AttributeDescr) attributes.get( 1 );
+        assertEquals( noloop.attributeName,
+                      noloopDescr.getName() );
+        assertEquals( "true",
+                      noloopDescr.getValue() );
+
         // checking LHS patterns
-        ColumnDescr col1 = (ColumnDescr) rule.getLhs().getDescrs().get( 0 );
-        assertEquals( pat1.boundName, col1.getIdentifier() );
-        assertEquals( pat1.factType, col1.getObjectType() );
-        FieldConstraintDescr field = (FieldConstraintDescr) col1.getDescrs().get( 0 );
-        assertEquals( pat1.constraints[0].fieldName, field.getFieldName());
-        LiteralRestrictionDescr lit = (LiteralRestrictionDescr) field.getRestrictions().get( 0 );
-        assertEquals( pat1.constraints[0].operator, lit.getEvaluator());
-        assertEquals( pat1.constraints[0].value, lit.getText());
-        
-        OrDescr or1 = (OrDescr) rule.getLhs().getDescrs().get( 1 );
-        ColumnDescr col2 = (ColumnDescr) or1.getDescrs().get( 0 );
-        assertEquals( pat2.factType, col2.getObjectType() );
-        
-        ColumnDescr col3 = (ColumnDescr) or1.getDescrs().get( 1 );
-        assertEquals( pat3.factType, col3.getObjectType() );
-        
+        final ColumnDescr col1 = (ColumnDescr) rule.getLhs().getDescrs().get( 0 );
+        assertEquals( pat1.boundName,
+                      col1.getIdentifier() );
+        assertEquals( pat1.factType,
+                      col1.getObjectType() );
+        final FieldConstraintDescr field = (FieldConstraintDescr) col1.getDescrs().get( 0 );
+        assertEquals( pat1.constraints[0].fieldName,
+                      field.getFieldName() );
+        final LiteralRestrictionDescr lit = (LiteralRestrictionDescr) field.getRestrictions().get( 0 );
+        assertEquals( pat1.constraints[0].operator,
+                      lit.getEvaluator() );
+        assertEquals( pat1.constraints[0].value,
+                      lit.getText() );
+
+        final OrDescr or1 = (OrDescr) rule.getLhs().getDescrs().get( 1 );
+        final ColumnDescr col2 = (ColumnDescr) or1.getDescrs().get( 0 );
+        assertEquals( pat2.factType,
+                      col2.getObjectType() );
+
+        final ColumnDescr col3 = (ColumnDescr) or1.getDescrs().get( 1 );
+        assertEquals( pat3.factType,
+                      col3.getObjectType() );
+
     }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -16,111 +16,116 @@
 public class BRLPersitenceTest extends TestCase {
 
     public void testGenerateEmptyXML() {
-        BRLPersistence p = BRLPersistence.getInstance();
-        String xml = p.toXML( new RuleModel() );
-        assertNotNull(xml);
-        assertFalse(xml.equals( "" ));
-        
-        assertTrue(xml.startsWith( "<rule>" ));
-        assertTrue(xml.endsWith( "</rule>" ));
+        final BRLPersistence p = BRLPersistence.getInstance();
+        final String xml = p.toXML( new RuleModel() );
+        assertNotNull( xml );
+        assertFalse( xml.equals( "" ) );
+
+        assertTrue( xml.startsWith( "<rule>" ) );
+        assertTrue( xml.endsWith( "</rule>" ) );
     }
-    
+
     public void testBasics() {
-        BRLPersistence p = BRLPersistence.getInstance();
-        RuleModel m = new RuleModel();
-        m.addLhsItem( new FactPattern("Person") );
-        m.addLhsItem( new FactPattern("Accident") );
-        m.addAttribute( new RuleAttribute("no-loop", "true") );
-        
-        
-        
-        m.addRhsItem( new ActionAssertFact("Report") );
+        final BRLPersistence p = BRLPersistence.getInstance();
+        final RuleModel m = new RuleModel();
+        m.addLhsItem( new FactPattern( "Person" ) );
+        m.addLhsItem( new FactPattern( "Accident" ) );
+        m.addAttribute( new RuleAttribute( "no-loop",
+                                           "true" ) );
+
+        m.addRhsItem( new ActionAssertFact( "Report" ) );
         m.name = "my rule";
-        String xml = p.toXML( m );
-        assertTrue(xml.indexOf( "Person" ) > -1);
-        assertTrue(xml.indexOf( "Accident" ) > -1);
-        assertTrue(xml.indexOf( "no-loop" ) > -1);
-        assertTrue(xml.indexOf( "org.drools" ) == -1);
-        
+        final String xml = p.toXML( m );
+        assertTrue( xml.indexOf( "Person" ) > -1 );
+        assertTrue( xml.indexOf( "Accident" ) > -1 );
+        assertTrue( xml.indexOf( "no-loop" ) > -1 );
+        assertTrue( xml.indexOf( "org.drools" ) == -1 );
+
     }
-    
+
     public void testMoreComplexRendering() {
-        BRLPersistence p = BRLPersistence.getInstance();
-        RuleModel m = getComplexModel();
-        
-        String xml = p.toXML( m );
-        System.out.println(xml);
-        
-        assertTrue(xml.indexOf( "org.drools" ) == -1);
-        
+        final BRLPersistence p = BRLPersistence.getInstance();
+        final RuleModel m = getComplexModel();
+
+        final String xml = p.toXML( m );
+        System.out.println( xml );
+
+        assertTrue( xml.indexOf( "org.drools" ) == -1 );
+
     }
-    
+
     public void testRoundTrip() {
-        RuleModel m = getComplexModel();
-        
-        String xml = BRLPersistence.getInstance().toXML( m );
-        
-        RuleModel m2 = BRLPersistence.getInstance().toModel( xml );
-        assertNotNull(m2);
-        assertEquals(m.name, m2.name);
-        assertEquals(m.lhs.length, m2.lhs.length);
-        assertEquals(m.rhs.length, m2.rhs.length);
-        assertEquals(1, m.attributes.length);
-        
-        RuleAttribute at = m.attributes[0];
-        assertEquals("no-loop", at.attributeName);
-        assertEquals("true", at.value);
-        
-        String newXML = BRLPersistence.getInstance().toXML( m2 );
-        assertEquals(xml, newXML);
-        
+        final RuleModel m = getComplexModel();
+
+        final String xml = BRLPersistence.getInstance().toXML( m );
+
+        final RuleModel m2 = BRLPersistence.getInstance().toModel( xml );
+        assertNotNull( m2 );
+        assertEquals( m.name,
+                      m2.name );
+        assertEquals( m.lhs.length,
+                      m2.lhs.length );
+        assertEquals( m.rhs.length,
+                      m2.rhs.length );
+        assertEquals( 1,
+                      m.attributes.length );
+
+        final RuleAttribute at = m.attributes[0];
+        assertEquals( "no-loop",
+                      at.attributeName );
+        assertEquals( "true",
+                      at.value );
+
+        final String newXML = BRLPersistence.getInstance().toXML( m2 );
+        assertEquals( xml,
+                      newXML );
+
     }
 
     private RuleModel getComplexModel() {
-        RuleModel m = new RuleModel();
-        
-        m.addAttribute( new RuleAttribute("no-loop", "true") );
-        
-        FactPattern pat = new FactPattern();
+        final RuleModel m = new RuleModel();
+
+        m.addAttribute( new RuleAttribute( "no-loop",
+                                           "true" ) );
+
+        final FactPattern pat = new FactPattern();
         pat.boundName = "p1";
         pat.factType = "Person";
-        Constraint con = new Constraint();
+        final Constraint con = new Constraint();
         con.fieldBinding = "f1";
         con.fieldName = "age";
         con.operator = "<";
         con.value = "42";
         pat.addConstraint( con );
-        
+
         m.addLhsItem( pat );
 
-        CompositeFactPattern comp = new CompositeFactPattern("not");
-        comp.addFactPattern( new FactPattern("Cancel") );
+        final CompositeFactPattern comp = new CompositeFactPattern( "not" );
+        comp.addFactPattern( new FactPattern( "Cancel" ) );
         m.addLhsItem( comp );
-        
-        ActionModifyField set = new ActionModifyField();
-        set.variable = "p1";        
-        set.addFieldValue( new ActionFieldValue("status", "rejected") );
+
+        final ActionModifyField set = new ActionModifyField();
+        set.variable = "p1";
+        set.addFieldValue( new ActionFieldValue( "status",
+                                                 "rejected" ) );
         m.addRhsItem( set );
-        
-        
-        ActionRetractFact ret = new ActionRetractFact("p1");
+
+        final ActionRetractFact ret = new ActionRetractFact( "p1" );
         m.addRhsItem( ret );
-        
-        DSLSentence sen = new DSLSentence();
+
+        final DSLSentence sen = new DSLSentence();
         sen.sentence = "Send an email to {administrator}";
 
-        
-        
         m.addRhsItem( sen );
         return m;
     }
-    
+
     public void testLoadEmpty() {
         RuleModel m = BRLPersistence.getInstance().toModel( null );
-        assertNotNull(m);
-        
+        assertNotNull( m );
+
         m = BRLPersistence.getInstance().toModel( "" );
-        assertNotNull(m);
+        assertNotNull( m );
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/SuggestionCompletionEngineBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/SuggestionCompletionEngineBuilderTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/SuggestionCompletionEngineBuilderTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -1,8 +1,5 @@
 package org.drools.brms.server.util;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import junit.framework.TestCase;
 
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
@@ -12,7 +9,7 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-        builder.newCompletionEngine();
+        this.builder.newCompletionEngine();
     }
 
     protected void tearDown() throws Exception {
@@ -20,18 +17,16 @@
     }
 
     public void testAddDSLSentence() {
-        String input = "{This} is a {pattern} considered pretty \\{{easy}\\} by most \\{people\\}. What do you {say}?";
-        builder.addDSLActionSentence(  input );
-        builder.addDSLConditionSentence( "foo bar" );
-        SuggestionCompletionEngine engine = builder.getInstance();
+        final String input = "{This} is a {pattern} considered pretty \\{{easy}\\} by most \\{people\\}. What do you {say}?";
+        this.builder.addDSLActionSentence( input );
+        this.builder.addDSLConditionSentence( "foo bar" );
+        final SuggestionCompletionEngine engine = this.builder.getInstance();
 
         assertEquals( 1,
                       engine.actionDSLSentences.length );
         assertEquals( 1,
                       engine.conditionDSLSentences.length );
-        
 
-
     }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/Java5Test.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/Java5Test.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/Java5Test.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -7,27 +7,27 @@
 public class Java5Test extends DroolsTestCase {
 
     public void testJava5Rule() throws Exception {
-        String javaVersion = System.getProperty( "java.specification.version" );
+        final String javaVersion = System.getProperty( "java.specification.version" );
         //do not execute tests under JDK 1.4
         //otherwise the compiled version cannot be interpreted
-        if (javaVersion.equals( "1.4" )) {
-            System.out.println("Skipping Java 1.5 tests - current JDK not compatible");
+        if ( javaVersion.equals( "1.4" ) ) {
+            System.out.println( "Skipping Java 1.5 tests - current JDK not compatible" );
             return;
         }
-        PackageBuilderConfiguration conf = new PackageBuilderConfiguration();
+        final PackageBuilderConfiguration conf = new PackageBuilderConfiguration();
         conf.setCompiler( PackageBuilderConfiguration.ECLIPSE );
         conf.setJavaLanguageLevel( "1.5" );
-        final PackageBuilder builder = new PackageBuilder(conf);
+        final PackageBuilder builder = new PackageBuilder( conf );
         builder.addPackageFromDrl( new InputStreamReader( this.getClass().getResourceAsStream( "java5_rule.drl" ) ) );
         assertFalse( builder.hasErrors() );
     }
-    
+
     public void testJava14Defaults() throws Exception {
-        PackageBuilderConfiguration conf = new PackageBuilderConfiguration();
+        final PackageBuilderConfiguration conf = new PackageBuilderConfiguration();
         conf.setCompiler( PackageBuilderConfiguration.JANINO );
-        final PackageBuilder builder = new PackageBuilder(conf);
+        final PackageBuilder builder = new PackageBuilder( conf );
         builder.addPackageFromDrl( new InputStreamReader( this.getClass().getResourceAsStream( "java5_rule.drl" ) ) );
         assertTrue( builder.hasErrors() );
-    } 
-    
+    }
+
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -25,13 +25,11 @@
 import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
 import java.lang.reflect.Field;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.jci.compilers.EclipseJavaCompiler;
-import org.apache.commons.jci.compilers.EclipseJavaCompilerSettings;
 import org.apache.commons.jci.compilers.JaninoJavaCompiler;
 import org.apache.commons.jci.compilers.JavaCompiler;
 import org.drools.Cheese;
@@ -105,11 +103,10 @@
                                                    "y" );
         column.addDescr( fieldBindingDescr );
 
-        
-        
-        packageDescr.addGlobal( new GlobalDescr("map", "java.util.Map") );
+        packageDescr.addGlobal( new GlobalDescr( "map",
+                                                 "java.util.Map" ) );
 
-        FieldConstraintDescr returnValue = new FieldConstraintDescr( "price" );
+        final FieldConstraintDescr returnValue = new FieldConstraintDescr( "price" );
         returnValue.addRestriction( new ReturnValueRestrictionDescr( "==",
                                                                      "x" ) );
 
@@ -140,7 +137,8 @@
         final AndDescr lhs = new AndDescr();
         ruleDescr.setLhs( lhs );
 
-        packageDescr.addGlobal( new GlobalDescr("map", "java.util.Map") );
+        packageDescr.addGlobal( new GlobalDescr( "map",
+                                                 "java.util.Map" ) );
 
         ruleDescr.setConsequence( "map.put(\"value\", new Integer(1) );" );
 
@@ -203,7 +201,8 @@
         final AndDescr lhs = new AndDescr();
         ruleDescr.setLhs( lhs );
 
-        packageDescr.addGlobal( new GlobalDescr("map", "java.util.Map") );
+        packageDescr.addGlobal( new GlobalDescr( "map",
+                                                 "java.util.Map" ) );
 
         ruleDescr.setConsequence( "map.put(\"value\", new Integer(1) );" );
         //check that packageDescr is serializable
@@ -297,7 +296,7 @@
         final AndDescr lhs = new AndDescr();
         ruleDescr.setLhs( lhs );
 
-        FactTemplateDescr cheese = new FactTemplateDescr( "Cheese" );
+        final FactTemplateDescr cheese = new FactTemplateDescr( "Cheese" );
         cheese.addFieldTemplate( new FieldTemplateDescr( "name",
                                                          "String" ) );
         cheese.addFieldTemplate( new FieldTemplateDescr( "price",
@@ -309,7 +308,7 @@
                                                     "stilton" );
         lhs.addDescr( column );
 
-        FieldConstraintDescr literalDescr = new FieldConstraintDescr( "name" );
+        final FieldConstraintDescr literalDescr = new FieldConstraintDescr( "name" );
         literalDescr.addRestriction( new LiteralRestrictionDescr( "==",
                                                                   "stilton" ) );
 
@@ -319,18 +318,18 @@
 
         builder.addPackage( packageDescr );
 
-//        assertFalse( Arrays.toString( builder.getErrors() ),
-//                     builder.hasErrors() );
+        //        assertFalse( Arrays.toString( builder.getErrors() ),
+        //                     builder.hasErrors() );
 
-        RuleBase ruleBase = RuleBaseFactory.newRuleBase();
-        Package pkg = builder.getPackage();
+        final RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+        final Package pkg = builder.getPackage();
         try {
             ruleBase.addPackage( pkg );
-        } catch ( Exception e ) {
+        } catch ( final Exception e ) {
             e.printStackTrace();
         }
-        WorkingMemory workingMemory = ruleBase.newWorkingMemory();
-        Fact stilton = pkg.getFactTemplate( "Cheese" ).createFact( 1 );
+        final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
+        final Fact stilton = pkg.getFactTemplate( "Cheese" ).createFact( 1 );
         stilton.setFieldValue( "name",
                                "stilton" );
         stilton.setFieldValue( "price",
@@ -354,7 +353,7 @@
                                                     "stilton" );
         lhs.addDescr( column );
 
-        FieldConstraintDescr literalDescr = new FieldConstraintDescr( "type" );
+        final FieldConstraintDescr literalDescr = new FieldConstraintDescr( "type" );
         literalDescr.addRestriction( new LiteralRestrictionDescr( "==",
                                                                   "stilton" ) );
 
@@ -389,9 +388,10 @@
                                                    "y" );
         column.addDescr( fieldBindingDescr );
 
-        packageDescr.addGlobal( new GlobalDescr("map", "java.util.Map") );
+        packageDescr.addGlobal( new GlobalDescr( "map",
+                                                 "java.util.Map" ) );
 
-        FieldConstraintDescr returnValue = new FieldConstraintDescr( "price" );
+        final FieldConstraintDescr returnValue = new FieldConstraintDescr( "price" );
         returnValue.addRestriction( new ReturnValueRestrictionDescr( "==",
                                                                      "(( (Integer) map.get( new Integer( x )) ).intValue() * y)" ) );
 
@@ -401,8 +401,8 @@
 
         builder.addPackage( packageDescr );
 
-//        assertFalse( Arrays.toString( builder.getErrors() ),
-//                     builder.hasErrors() );
+        //        assertFalse( Arrays.toString( builder.getErrors() ),
+        //                     builder.hasErrors() );
     }
 
     public void testReturnValueMethodCompare() {
@@ -458,7 +458,8 @@
                                                                             "y" );
         column.addDescr( fieldBindingDescr2 );
 
-        packageDescr.addGlobal( new GlobalDescr("map", "java.util.Map") );
+        packageDescr.addGlobal( new GlobalDescr( "map",
+                                                 "java.util.Map" ) );
 
         final PredicateDescr predicate = new PredicateDescr( "( ( Integer )map.get( new Integer(x) ) ).intValue() == y" );
         column.addDescr( predicate );
@@ -523,7 +524,8 @@
                                                    "y" );
         column.addDescr( fieldBindingDescr );
 
-        packageDescr.addGlobal( new GlobalDescr("map", "java.util.Map") );
+        packageDescr.addGlobal( new GlobalDescr( "map",
+                                                 "java.util.Map" ) );
 
         final EvalDescr evalDescr = new EvalDescr( "( ( Integer )map.get( new Integer(x) ) ).intValue() == y" );
         lhs.addDescr( evalDescr );
@@ -797,7 +799,7 @@
         final ColumnDescr columnDescr = new ColumnDescr( Cheese.class.getName(),
                                                          "stilton" );
 
-        FieldConstraintDescr literalDescr = new FieldConstraintDescr( "type" );
+        final FieldConstraintDescr literalDescr = new FieldConstraintDescr( "type" );
         literalDescr.addRestriction( new LiteralRestrictionDescr( "==",
                                                                   null ) );
 
@@ -866,7 +868,7 @@
 
         assertLength( 1,
                       builder.getErrors() );
-        ParserError err = (ParserError) builder.getErrors()[0];
+        final ParserError err = (ParserError) builder.getErrors()[0];
         assertEquals( 42,
                       err.getRow() );
         assertEquals( 43,
@@ -890,7 +892,7 @@
         final FieldBindingDescr fieldBindingDescr = new FieldBindingDescr( "type",
                                                                            "$type" );
 
-        FieldConstraintDescr literalDescr = new FieldConstraintDescr( "type" );
+        final FieldConstraintDescr literalDescr = new FieldConstraintDescr( "type" );
         literalDescr.addRestriction( new LiteralRestrictionDescr( "==",
                                                                   "stilton" ) );
 
@@ -912,7 +914,7 @@
     public void FIXME_testCompilerConfiguration() throws Exception {
         // test default is eclipse jdt core
         PackageBuilder builder = new PackageBuilder();;
-        Field compilerField = builder.getClass().getDeclaredField( "compiler" );
+        final Field compilerField = builder.getClass().getDeclaredField( "compiler" );
         compilerField.setAccessible( true );
         JavaCompiler compiler = (JavaCompiler) compilerField.get( builder );
         assertSame( EclipseJavaCompiler.class,
@@ -935,7 +937,7 @@
                     compiler.getClass() );
 
         EclipseJavaCompiler eclipseCompiler = (EclipseJavaCompiler) compiler;
-        Field settingsField = eclipseCompiler.getClass().getDeclaredField( "settings" );
+        final Field settingsField = eclipseCompiler.getClass().getDeclaredField( "settings" );
         settingsField.setAccessible( true );
         Map map = (Map) settingsField.get( eclipseCompiler );
         assertEquals( "1.4",
@@ -980,9 +982,10 @@
                                                    "y" );
         column.addDescr( fieldBindingDescr );
 
-        packageDescr.addGlobal( new GlobalDescr("map", "java.util.Map") );
+        packageDescr.addGlobal( new GlobalDescr( "map",
+                                                 "java.util.Map" ) );
 
-        FieldConstraintDescr returnValue = new FieldConstraintDescr( "price" );
+        final FieldConstraintDescr returnValue = new FieldConstraintDescr( "price" );
         returnValue.addRestriction( new ReturnValueRestrictionDescr( "==",
                                                                      expression ) );
 
@@ -1011,7 +1014,8 @@
                                                                             "y" );
         column.addDescr( fieldBindingDescr2 );
 
-        packageDescr.addGlobal( new GlobalDescr("map", "java.util.Map") );
+        packageDescr.addGlobal( new GlobalDescr( "map",
+                                                 "java.util.Map" ) );
 
         final PredicateDescr predicate = new PredicateDescr( expression );
         column.addDescr( predicate );
@@ -1027,7 +1031,8 @@
         final AndDescr lhs = new AndDescr();
         ruleDescr.setLhs( lhs );
 
-        packageDescr.addGlobal( new GlobalDescr("map", "java.util.Map") );
+        packageDescr.addGlobal( new GlobalDescr( "map",
+                                                 "java.util.Map" ) );
 
         final EvalDescr evalDescr = new EvalDescr( expression );
         lhs.addDescr( evalDescr );
@@ -1073,7 +1078,7 @@
         final ColumnDescr columnDescr = new ColumnDescr( Cheese.class.getName(),
                                                          "stilton" );
 
-        FieldConstraintDescr literalDescr = new FieldConstraintDescr( "type" );
+        final FieldConstraintDescr literalDescr = new FieldConstraintDescr( "type" );
         literalDescr.addRestriction( new LiteralRestrictionDescr( "==",
                                                                   "stilton" ) );
 
@@ -1098,7 +1103,7 @@
         implements
         Activation {
         private Rule         rule;
-        private GroupElement subrule;
+        private final GroupElement subrule;
         private Tuple        tuple;
 
         public MockActivation(final Rule rule,
@@ -1106,6 +1111,7 @@
                               final Tuple tuple) {
             this.rule = rule;
             this.tuple = tuple;
+            this.subrule = subrule;
         }
 
         public Rule getRule() {
@@ -1165,9 +1171,9 @@
             return null;
         }
 
-        public void setRuleFlowGroupNode(RuleFlowGroupNode ruleFlowGroupNode) {
+        public void setRuleFlowGroupNode(final RuleFlowGroupNode ruleFlowGroupNode) {
             // TODO Auto-generated method stub
-            
+
         }
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/RuleBaseLoaderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/RuleBaseLoaderTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/RuleBaseLoaderTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -20,19 +20,19 @@
         final InputStream in = IntegrationCases.class.getResourceAsStream( "rule_with_expander_dsl.drl" );
         final InputStream inDSL = IntegrationCases.class.getResourceAsStream( "test_expander.dsl" );
         final RuleBase rb = RuleBaseLoader.getInstance().loadFromReader( new InputStreamReader( in ),
-                                                                   new InputStreamReader( inDSL ) );
+                                                                         new InputStreamReader( inDSL ) );
         assertNotNull( rb );
     }
 
     // todo: fix for LEAPS
-//    public void testEngineType() throws Exception {
-//        final InputStream in = IntegrationCases.class.getResourceAsStream( "HelloWorld.drl" );
-//        final RuleBaseLoader loader = RuleBaseLoader.getInstance();
-//        loader.setDefaultEngineType( RuleBase.LEAPS );
-//        final RuleBase rb = loader.loadFromReader( new InputStreamReader( in ) );
-//        assertNotNull( rb );
-//        assertTrue( rb instanceof LeapsRuleBase );
-//
-//    }
+    //    public void testEngineType() throws Exception {
+    //        final InputStream in = IntegrationCases.class.getResourceAsStream( "HelloWorld.drl" );
+    //        final RuleBaseLoader loader = RuleBaseLoader.getInstance();
+    //        loader.setDefaultEngineType( RuleBase.LEAPS );
+    //        final RuleBase rb = loader.loadFromReader( new InputStreamReader( in ) );
+    //        assertNotNull( rb );
+    //        assertTrue( rb instanceof LeapsRuleBase );
+    //
+    //    }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -68,9 +68,7 @@
 import org.drools.WorkingMemory;
 import org.drools.Cheesery.Maturity;
 import org.drools.common.DefaultAgenda;
-import org.drools.common.InternalWorkingMemory;
 import org.drools.common.InternalWorkingMemoryActions;
-import org.drools.common.PropagationContextImpl;
 import org.drools.common.RuleFlowGroupImpl;
 import org.drools.compiler.DrlParser;
 import org.drools.compiler.DroolsError;
@@ -105,7 +103,6 @@
 import org.drools.spi.Activation;
 import org.drools.spi.ActivationGroup;
 import org.drools.spi.AgendaGroup;
-import org.drools.spi.PropagationContext;
 import org.drools.xml.XmlDumper;
 
 /**
@@ -148,16 +145,16 @@
     }
 
     public void testFieldBiningsAndEvalSharing() throws Exception {
-        String drl = "test_FieldBindingsAndEvalSharing.drl";
+        final String drl = "test_FieldBindingsAndEvalSharing.drl";
         evalSharingTest( drl );
     }
 
     public void testFieldBiningsAndPredicateSharing() throws Exception {
-        String drl = "test_FieldBindingsAndPredicateSharing.drl";
+        final String drl = "test_FieldBindingsAndPredicateSharing.drl";
         evalSharingTest( drl );
     }
 
-    private void evalSharingTest(String drl) throws DroolsParserException,
+    private void evalSharingTest(final String drl) throws DroolsParserException,
                                             IOException,
                                             Exception {
         final PackageBuilder builder = new PackageBuilder();
@@ -166,13 +163,13 @@
 
         final RuleBase ruleBase = getRuleBase();
         ruleBase.addPackage( pkg );
-        WorkingMemory wm = ruleBase.newWorkingMemory();
+        final WorkingMemory wm = ruleBase.newWorkingMemory();
 
-        List list = new ArrayList();
+        final List list = new ArrayList();
         wm.setGlobal( "list",
                       list );
 
-        TestParam tp1 = new TestParam();
+        final TestParam tp1 = new TestParam();
         tp1.setValue2( "boo" );
         wm.assertObject( tp1 );
 
@@ -194,7 +191,7 @@
         final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
 
         final List events = new ArrayList();
-        WorkingMemoryEventListener listener = new DefaultWorkingMemoryEventListener() {
+        final WorkingMemoryEventListener listener = new DefaultWorkingMemoryEventListener() {
             public void objectModified(ObjectModifiedEvent event) {
                 events.add( event );
             }
@@ -202,13 +199,13 @@
 
         workingMemory.addEventListener( listener );
 
-        Person bigCheese = new Person( "big cheese" );
-        Cheese cheddar = new Cheese( "cheddar",
+        final Person bigCheese = new Person( "big cheese" );
+        final Cheese cheddar = new Cheese( "cheddar",
                                      15 );
         bigCheese.setCheese( cheddar );
 
-        FactHandle bigCheeseHandle = workingMemory.assertObject( bigCheese );
-        FactHandle cheddarHandle = workingMemory.assertObject( cheddar );
+        final FactHandle bigCheeseHandle = workingMemory.assertObject( bigCheese );
+        final FactHandle cheddarHandle = workingMemory.assertObject( cheddar );
         workingMemory.fireAllRules();
 
         ObjectModifiedEvent event = (ObjectModifiedEvent) events.get( 0 );
@@ -242,16 +239,16 @@
         final List list = new ArrayList();
         workingMemory.setGlobal( "list",
                                  list );
-        Cheese nullCheese = new Cheese( null,
+        final Cheese nullCheese = new Cheese( null,
                                         2 );
         workingMemory.assertObject( nullCheese );
 
-        Person notNullPerson = new Person( "shoes butt back" );
+        final Person notNullPerson = new Person( "shoes butt back" );
         notNullPerson.setBigDecimal( new BigDecimal( "42.42" ) );
 
         workingMemory.assertObject( notNullPerson );
 
-        Person nullPerson = new Person( "whee" );
+        final Person nullPerson = new Person( "whee" );
         nullPerson.setBigDecimal( null );
 
         workingMemory.assertObject( nullPerson );
@@ -314,7 +311,7 @@
         final RuleBase ruleBase = loadRuleBase( reader );
 
         final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
-        List list = new ArrayList();
+        final List list = new ArrayList();
         workingMemory.setGlobal( "list",
                                  list );
         workingMemory.assertObject( new Message( "hola" ) );
@@ -436,8 +433,8 @@
         workingMemory.setGlobal( "list",
                                  list );
 
-        FactTemplate cheese = pkg.getFactTemplate( "Cheese" );
-        Fact stilton = cheese.createFact( 0 );
+        final FactTemplate cheese = pkg.getFactTemplate( "Cheese" );
+        final Fact stilton = cheese.createFact( 0 );
         stilton.setFieldValue( "name",
                                "stilton" );
         stilton.setFieldValue( "price",
@@ -449,7 +446,7 @@
                       list.size() );
         assertEquals( stilton,
                       list.get( 0 ) );
-        Fact fact = (Fact) list.get( 0 );
+        final Fact fact = (Fact) list.get( 0 );
         assertSame( stilton,
                     fact );
         assertEquals( new Integer( 200 ),
@@ -627,7 +624,7 @@
     }
 
     public void testJaninoEval() throws Exception {
-        PackageBuilderConfiguration config = new PackageBuilderConfiguration();
+        final PackageBuilderConfiguration config = new PackageBuilderConfiguration();
         config.setCompiler( PackageBuilderConfiguration.JANINO );
         final PackageBuilder builder = new PackageBuilder( config );
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "eval_rule_test.drl" ) ) );
@@ -666,7 +663,7 @@
         workingMemory.setGlobal( "list",
                                  list );
 
-        Person foo = new Person( "foo" );
+        final Person foo = new Person( "foo" );
         workingMemory.assertObject( foo );
         workingMemory.fireAllRules();
 
@@ -955,10 +952,10 @@
         final RuleBase ruleBase = getRuleBase();
         ruleBase.addPackage( pkg );
         final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
-        Cheese cheese = new Cheese( "stilton",
+        final Cheese cheese = new Cheese( "stilton",
                                     15 );
         workingMemory.assertObject( cheese );
-        List list = new ArrayList();
+        final List list = new ArrayList();
         workingMemory.setGlobal( "list",
                                  list );
         workingMemory.fireAllRules();
@@ -984,21 +981,21 @@
         final RuleBase ruleBase = getRuleBase();
         ruleBase.addPackage( pkg );
 
-        WorkingMemory workingMemory = ruleBase.newWorkingMemory();
-        List list1 = new ArrayList();
+        final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
+        final List list1 = new ArrayList();
         workingMemory.setGlobal( "list1",
                                  list1 );
-        List list2 = new ArrayList();
+        final List list2 = new ArrayList();
         workingMemory.setGlobal( "list2",
                                  list2 );
-        List list3 = new ArrayList();
+        final List list3 = new ArrayList();
         workingMemory.setGlobal( "list3",
                                  list3 );
 
-        Cheesery cheesery = new Cheesery();
-        Cheese stilton = new Cheese( "stilton",
+        final Cheesery cheesery = new Cheesery();
+        final Cheese stilton = new Cheese( "stilton",
                                      12 );
-        Cheese cheddar = new Cheese( "cheddar",
+        final Cheese cheddar = new Cheese( "cheddar",
                                      15 );
         cheesery.addCheese( stilton );
         cheesery.addCheese( cheddar );
@@ -1039,9 +1036,9 @@
         final RuleBase ruleBase = getRuleBase();
         ruleBase.addPackage( pkg );
 
-        WorkingMemory workingMemory = ruleBase.newWorkingMemory();
-        List list = new ArrayList();
-        Object globalObject = new Object();
+        final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
+        final List list = new ArrayList();
+        final Object globalObject = new Object();
         workingMemory.setGlobal( "list",
                                  list );
         workingMemory.setGlobal( "testObject",
@@ -1049,7 +1046,7 @@
         workingMemory.setGlobal( "globalObject",
                                  globalObject );
 
-        Person bob = new Person( "bob" );
+        final Person bob = new Person( "bob" );
         workingMemory.assertObject( bob );
 
         workingMemory.fireAllRules();
@@ -1057,23 +1054,23 @@
         assertEquals( 6,
                       list.size() );
 
-        List array = (List) list.get( 0 );
+        final List array = (List) list.get( 0 );
         assertEquals( 3,
                       array.size() );
-        Person p = (Person) array.get( 0 );
+        final Person p = (Person) array.get( 0 );
         assertSame( p,
                     bob );
 
         assertEquals( new Integer( 42 ),
                       array.get( 1 ) );
 
-        List nested = (List) array.get( 2 );
+        final List nested = (List) array.get( 2 );
         assertEquals( "x",
                       nested.get( 0 ) );
         assertEquals( "y",
                       nested.get( 1 ) );
 
-        Map map = (Map) list.get( 1 );
+        final Map map = (Map) list.get( 1 );
         assertEquals( 2,
                       map.keySet().size() );
 
@@ -1082,7 +1079,7 @@
                     map.get( bob ) );
 
         assertTrue( map.keySet().contains( "key1" ) );
-        Map nestedMap = (Map) map.get( "key1" );
+        final Map nestedMap = (Map) map.get( "key1" );
         assertEquals( 1,
                       nestedMap.keySet().size() );
         assertTrue( nestedMap.keySet().contains( "key2" ) );
@@ -1138,7 +1135,7 @@
         assertNotNull( ruleErr.getDescr() );
         assertTrue( ruleErr.getLine() != -1 );
 
-        DroolsError errs[] = builder.getErrors();
+        final DroolsError errs[] = builder.getErrors();
 
         assertEquals( 3,
                       builder.getErrors().length );
@@ -1599,26 +1596,26 @@
         workingMemory.setGlobal( "list4",
                                  list4 );
 
-        Person youngChili1 = new Person( "young chili1" );
+        final Person youngChili1 = new Person( "young chili1" );
         youngChili1.setAge( 12 );
         youngChili1.setHair( "blue" );
-        Person youngChili2 = new Person( "young chili2" );
+        final Person youngChili2 = new Person( "young chili2" );
         youngChili2.setAge( 25 );
         youngChili2.setHair( "purple" );
 
-        Person chili1 = new Person( "chili1" );
+        final Person chili1 = new Person( "chili1" );
         chili1.setAge( 35 );
         chili1.setHair( "red" );
 
-        Person chili2 = new Person( "chili2" );
+        final Person chili2 = new Person( "chili2" );
         chili2.setAge( 38 );
         chili2.setHair( "indigigo" );
 
-        Person oldChili1 = new Person( "old chili2" );
+        final Person oldChili1 = new Person( "old chili2" );
         oldChili1.setAge( 45 );
         oldChili1.setHair( "green" );
 
-        Person oldChili2 = new Person( "old chili2" );
+        final Person oldChili2 = new Person( "old chili2" );
         oldChili2.setAge( 48 );
         oldChili2.setHair( "blue" );
 
@@ -1705,39 +1702,43 @@
         final RuleBase ruleBase = getRuleBase();
         ruleBase.addPackage( pkg );
         final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
-              
+
         final List list = new ArrayList();
         workingMemory.setGlobal( "list",
                                  list );
-        
+
         // AgendaGroup "group1" is not active, so should receive activation
         final Cheese brie12 = new Cheese( "brie",
-                                        12 );
-        workingMemory.assertObject( brie12 );        
-        AgendaGroup group1 = workingMemory.getAgenda().getAgendaGroup( "group1" );  
-        assertEquals( 1, group1.size() );          
-        
-        workingMemory.setFocus( "group1" );        
+                                          12 );
+        workingMemory.assertObject( brie12 );
+        final AgendaGroup group1 = workingMemory.getAgenda().getAgendaGroup( "group1" );
+        assertEquals( 1,
+                      group1.size() );
+
+        workingMemory.setFocus( "group1" );
         // AgendaqGroup "group1" is now active, so should not receive activations
         final Cheese brie10 = new Cheese( "brie",
-                                        10 );
-        workingMemory.assertObject( brie10 );                
-        assertEquals( 1, group1.size() );    
-        
+                                          10 );
+        workingMemory.assertObject( brie10 );
+        assertEquals( 1,
+                      group1.size() );
+
         final Cheese cheddar20 = new Cheese( "cheddar",
-                                          20 );
-        workingMemory.assertObject( cheddar20 ); 
-        AgendaGroup group2 = workingMemory.getAgenda().getAgendaGroup( "group1" );
-        assertEquals( 1, group2.size() );        
-        
-        RuleFlowGroupImpl rfg = ( RuleFlowGroupImpl )workingMemory.getAgenda().getRuleFlowGroup( "ruleflow2" );
+                                             20 );
+        workingMemory.assertObject( cheddar20 );
+        final AgendaGroup group2 = workingMemory.getAgenda().getAgendaGroup( "group1" );
+        assertEquals( 1,
+                      group2.size() );
+
+        final RuleFlowGroupImpl rfg = (RuleFlowGroupImpl) workingMemory.getAgenda().getRuleFlowGroup( "ruleflow2" );
         rfg.setActive( true );
         final Cheese cheddar17 = new Cheese( "cheddar",
-                                             17 );        
-        workingMemory.assertObject( cheddar17 );         
-        assertEquals( 1, group2.size() );        
-    }    
-    
+                                             17 );
+        workingMemory.assertObject( cheddar17 );
+        assertEquals( 1,
+                      group2.size() );
+    }
+
     public void testLockOnActiveWithModify() throws Exception {
         final PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LockOnActiveWithModify.drl" ) ) );
@@ -1746,50 +1747,54 @@
         final RuleBase ruleBase = getRuleBase();
         ruleBase.addPackage( pkg );
         final WorkingMemory wm = ruleBase.newWorkingMemory();
-              
+
         final List list = new ArrayList();
         wm.setGlobal( "list",
-                                 list );        
-        
-        Cheese brie = new Cheese("brie", 13);
-        
-        Person bob = new Person( "bob" );
+                      list );
+
+        final Cheese brie = new Cheese( "brie",
+                                  13 );
+
+        final Person bob = new Person( "bob" );
         bob.setCheese( brie );
 
-        Person mic = new Person( "mic" );
+        final Person mic = new Person( "mic" );
         mic.setCheese( brie );
-        
-        Person mark = new Person( "mark" );
-        mark.setCheese( brie );     
-        
-        FactHandle brieHandle = wm.assertObject( brie );
+
+        final Person mark = new Person( "mark" );
+        mark.setCheese( brie );
+
+        final FactHandle brieHandle = wm.assertObject( brie );
         wm.assertObject( bob );
         wm.assertObject( mic );
         wm.assertObject( mark );
-        
-        DefaultAgenda agenda = (DefaultAgenda) wm.getAgenda();
-        AgendaGroup group1 = agenda.getAgendaGroup( "group1" );
+
+        final DefaultAgenda agenda = (DefaultAgenda) wm.getAgenda();
+        final AgendaGroup group1 = agenda.getAgendaGroup( "group1" );
         agenda.setFocus( group1 );
-        assertEquals( 3, group1.size() );          
-        agenda.fireNextItem( null );        
-        assertEquals( 2, group1.size() );        
-        wm.modifyObject( brieHandle, brie );
-        assertEquals( 2, group1.size() );
-        
-        
-//        AgendaGroup group2 = agenda.getAgendaGroup( "group2" );
-//        agenda.setFocus( group2 );
-//        
-//        RuleFlowGroupImpl rfg = ( RuleFlowGroupImpl )wm.getAgenda().getRuleFlowGroup( "ruleflow2" );                
-//        assertEquals( 3, rfg.size() );          
-//        
-//        agenda.activateRuleFlowGroup( "ruleflow2" );
-//        agenda.fireNextItem( null );        
-//        assertEquals( 2, rfg.size() );                
-//        wm.modifyObject( brieHandle, brie );
-//        assertEquals( 2, group2.size() );        
+        assertEquals( 3,
+                      group1.size() );
+        agenda.fireNextItem( null );
+        assertEquals( 2,
+                      group1.size() );
+        wm.modifyObject( brieHandle,
+                         brie );
+        assertEquals( 2,
+                      group1.size() );
+
+        //        AgendaGroup group2 = agenda.getAgendaGroup( "group2" );
+        //        agenda.setFocus( group2 );
+        //        
+        //        RuleFlowGroupImpl rfg = ( RuleFlowGroupImpl )wm.getAgenda().getRuleFlowGroup( "ruleflow2" );                
+        //        assertEquals( 3, rfg.size() );          
+        //        
+        //        agenda.activateRuleFlowGroup( "ruleflow2" );
+        //        agenda.fireNextItem( null );        
+        //        assertEquals( 2, rfg.size() );                
+        //        wm.modifyObject( brieHandle, brie );
+        //        assertEquals( 2, group2.size() );        
     }
-    
+
     public void testDumpers() throws Exception {
         final DrlParser parser = new DrlParser();
         final PackageDescr pkg = parser.parse( new InputStreamReader( getClass().getResourceAsStream( "test_Dumpers.drl" ) ) );
@@ -2206,7 +2211,7 @@
             // leapsRuleBase = (org.drools.leaps.LeapsRuleBase) ruleBase;
         }
         ruleBase.addPackage( pkg );
-        PackageBuilder builder2 = new PackageBuilder();
+        final PackageBuilder builder2 = new PackageBuilder();
         builder2.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_Dynamic2.drl" ) ) );
         ruleBase.addPackage( builder2.getPackage() );
 
@@ -2436,7 +2441,7 @@
         workingMemory.setGlobal( "list",
                                  new ArrayList() );
 
-        Person bob = new Person( "bob" );
+        final Person bob = new Person( "bob" );
         workingMemory.assertObject( bob );
 
         final byte[] wm = serializeOut( workingMemory );
@@ -2453,7 +2458,7 @@
 
         workingMemory.fireAllRules();
 
-        List list = (List) workingMemory.getGlobal( "list" );
+        final List list = (List) workingMemory.getGlobal( "list" );
 
         assertEquals( 3,
                       list.size() );
@@ -2668,7 +2673,7 @@
         ruleBase.addPackage( pkg );
         final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
 
-        AgendaEventListener listener = new DefaultAgendaEventListener() {
+        final AgendaEventListener listener = new DefaultAgendaEventListener() {
             public void activationCreated(ActivationCreatedEvent event,
                                           WorkingMemory workingMemory) {
                 super.activationCreated( event,
@@ -2960,7 +2965,7 @@
         final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
 
         List l;
-        Person p = new Person( "person" );
+        final Person p = new Person( "person" );
         p.setAge( 2 );
         final FactHandle h = workingMemory.assertObject( p );
         assertEquals( 1,
@@ -3001,21 +3006,21 @@
         ruleBase.addPackage( pkg );
         final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
 
-        Person p1 = new Person( "p1",
+        final Person p1 = new Person( "p1",
                                 "stilton",
                                 20 );
         p1.setStatus( "europe" );
-        FactHandle c1FactHandle = workingMemory.assertObject( p1 );
-        Person p2 = new Person( "p2",
+        final FactHandle c1FactHandle = workingMemory.assertObject( p1 );
+        final Person p2 = new Person( "p2",
                                 "stilton",
                                 30 );
         p2.setStatus( "europe" );
-        FactHandle c2FactHandle = workingMemory.assertObject( p2 );
-        Person p3 = new Person( "p3",
+        final FactHandle c2FactHandle = workingMemory.assertObject( p2 );
+        final Person p3 = new Person( "p3",
                                 "stilton",
                                 40 );
         p3.setStatus( "europe" );
-        FactHandle c3FactHandle = workingMemory.assertObject( p3 );
+        final FactHandle c3FactHandle = workingMemory.assertObject( p3 );
         workingMemory.fireAllRules();
 
         // all 3 in europe, so, 2 cheese
@@ -3130,7 +3135,7 @@
         workingMemory.setGlobal( "results",
                                  list );
 
-        Person hola = new Person( "hola" );
+        final Person hola = new Person( "hola" );
         workingMemory.assertObject( hola );
 
         workingMemory.fireAllRules();
@@ -3188,7 +3193,7 @@
 
         final int MAX = 5;
         for ( int i = 1; i <= MAX; i++ ) {
-            IndexedNumber n = new IndexedNumber( i,
+            final IndexedNumber n = new IndexedNumber( i,
                                                  MAX - i + 1 );
             workingMemory.assertObject( n );
         }
@@ -3198,7 +3203,7 @@
                            errors.isEmpty() );
 
         for ( int i = 1; i <= MAX; i++ ) {
-            IndexedNumber n = (IndexedNumber) orderedFacts.get( i - 1 );
+            final IndexedNumber n = (IndexedNumber) orderedFacts.get( i - 1 );
             Assert.assertEquals( "Fact is out of order",
                                  i,
                                  n.getIndex() );
@@ -3211,7 +3216,7 @@
             builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_RemovePackage.drl" ) ) );
 
             final RuleBase ruleBase = getRuleBase();
-            String packageName = builder.getPackage().getName();
+            final String packageName = builder.getPackage().getName();
             ruleBase.addPackage( builder.getPackage() );
 
             final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
@@ -3220,7 +3225,7 @@
                                                           "genericvalue" ) );
             workingMemory.fireAllRules();
 
-            RuleBase ruleBaseWM = workingMemory.getRuleBase();
+            final RuleBase ruleBaseWM = workingMemory.getRuleBase();
             ruleBaseWM.removePackage( packageName );
             final PackageBuilder builder1 = new PackageBuilder();
             builder1.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_RemovePackage.drl" ) ) );
@@ -3232,7 +3237,7 @@
 
             ruleBaseWM.removePackage( packageName );
             ruleBaseWM.addPackage( builder1.getPackage() );
-        } catch ( Exception e ) {
+        } catch ( final Exception e ) {
             e.printStackTrace();
             Assert.fail( "Removing packages should not throw any exception: " + e.getMessage() );
         }
@@ -3249,15 +3254,15 @@
             final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
             workingMemory.fireAllRules();
 
-            QueryResults results = workingMemory.getQueryResults( "assertedobjquery" );
+            final QueryResults results = workingMemory.getQueryResults( "assertedobjquery" );
 
             if ( results == null || !results.iterator().hasNext() ) {
                 Assert.fail( "The stated query should return a result" );
             } else {
                 int counter = 0;
-                for ( Iterator it = results.iterator(); it.hasNext(); ) {
-                    QueryResult result = (QueryResult) it.next();;
-                    AssertedObject assertedObject = (AssertedObject) result.get( "assertedobj" );
+                for ( final Iterator it = results.iterator(); it.hasNext(); ) {
+                    final QueryResult result = (QueryResult) it.next();;
+                    final AssertedObject assertedObject = (AssertedObject) result.get( "assertedobj" );
                     Assert.assertNotNull( "Query result is not expected to be null",
                                           assertedObject );
                     counter++;
@@ -3267,7 +3272,7 @@
                                      counter );
             }
 
-        } catch ( Exception e ) {
+        } catch ( final Exception e ) {
             Assert.fail( "Retrieving query results should not throw any exception: " + e.getMessage() );
         }
     }
@@ -3319,9 +3324,9 @@
         workingMemory.setGlobal( "results",
                                  list );
 
-        Cheese c = new Cheese( "stilton",
+        final Cheese c = new Cheese( "stilton",
                                10 );
-        Person p = new Person( "Mark",
+        final Person p = new Person( "Mark",
                                "stilton" );
         workingMemory.assertObject( c );
         workingMemory.assertObject( p );
@@ -3338,8 +3343,8 @@
         final WorkingMemory wm = ruleBase.newWorkingMemory();
 
         // now create some test data
-        Driver driver = new Driver();
-        Policy policy = new Policy();
+        final Driver driver = new Driver();
+        final Policy policy = new Policy();
 
         wm.assertObject( driver );
         wm.assertObject( policy );
@@ -3442,7 +3447,7 @@
             wm.assertObject( tgt );
 
             wm.fireAllRules();
-        } catch ( RuntimeException e ) {
+        } catch ( final RuntimeException e ) {
             Assert.fail( "Test is not supposed to throw any exception" );
         }
 
@@ -3455,7 +3460,7 @@
         final RuleBase ruleBase = loadRuleBase( reader );
 
         final WorkingMemory wm = ruleBase.newWorkingMemory();
-        List results = new ArrayList();
+        final List results = new ArrayList();
 
         wm.setGlobal( "results",
                       results );
@@ -3492,26 +3497,26 @@
         final RuleBase ruleBase = loadRuleBase( reader );
 
         final WorkingMemory wm = ruleBase.newWorkingMemory();
-        List results = new ArrayList();
+        final List results = new ArrayList();
 
         wm.setGlobal( "results",
                       results );
 
-        Cheese[] cheese = new Cheese[]{new Cheese( "stilton",
+        final Cheese[] cheese = new Cheese[]{new Cheese( "stilton",
                                                    10 ), new Cheese( "stilton",
                                                                      2 ), new Cheese( "stilton",
                                                                                       5 ), new Cheese( "brie",
                                                                                                        15 ), new Cheese( "brie",
                                                                                                                          16 ), new Cheese( "provolone",
                                                                                                                                            8 )};
-        Person bob = new Person( "Bob",
+        final Person bob = new Person( "Bob",
                                  "stilton" );
 
-        FactHandle[] cheeseHandles = new FactHandle[cheese.length];
+        final FactHandle[] cheeseHandles = new FactHandle[cheese.length];
         for ( int i = 0; i < cheese.length; i++ ) {
             cheeseHandles[i] = wm.assertObject( cheese[i] );
         }
-        FactHandle bobHandle = wm.assertObject( bob );
+        final FactHandle bobHandle = wm.assertObject( bob );
 
         // ---------------- 1st scenario
         wm.fireAllRules();
@@ -3520,7 +3525,7 @@
                              results.size() );
 
         // ---------------- 2nd scenario
-        int index = 1;
+        final int index = 1;
         cheese[index].setPrice( 9 );
         wm.modifyObject( cheeseHandles[index],
                          cheese[index] );
@@ -3561,7 +3566,7 @@
         final RuleBase ruleBase = loadRuleBase( reader );
 
         final WorkingMemory wm = ruleBase.newWorkingMemory();
-        List results = new ArrayList();
+        final List results = new ArrayList();
 
         wm.setGlobal( "results",
                       results );
@@ -3599,26 +3604,26 @@
         final RuleBase ruleBase = loadRuleBase( reader );
 
         final WorkingMemory wm = ruleBase.newWorkingMemory();
-        List results = new ArrayList();
+        final List results = new ArrayList();
 
         wm.setGlobal( "results",
                       results );
 
-        Cheese[] cheese = new Cheese[]{new Cheese( "stilton",
+        final Cheese[] cheese = new Cheese[]{new Cheese( "stilton",
                                                    10 ), new Cheese( "stilton",
                                                                      2 ), new Cheese( "stilton",
                                                                                       5 ), new Cheese( "brie",
                                                                                                        15 ), new Cheese( "brie",
                                                                                                                          16 ), new Cheese( "provolone",
                                                                                                                                            8 )};
-        Person bob = new Person( "Bob",
+        final Person bob = new Person( "Bob",
                                  "stilton" );
 
-        FactHandle[] cheeseHandles = new FactHandle[cheese.length];
+        final FactHandle[] cheeseHandles = new FactHandle[cheese.length];
         for ( int i = 0; i < cheese.length; i++ ) {
             cheeseHandles[i] = wm.assertObject( cheese[i] );
         }
-        FactHandle bobHandle = wm.assertObject( bob );
+        final FactHandle bobHandle = wm.assertObject( bob );
 
         // ---------------- 1st scenario
         int fireCount = 0;
@@ -3631,7 +3636,7 @@
                              results.get( fireCount - 1 ).getClass().getName() );
 
         // ---------------- 2nd scenario
-        int index = 1;
+        final int index = 1;
         cheese[index].setPrice( 9 );
         wm.modifyObject( cheeseHandles[index],
                          cheese[index] );
@@ -3685,58 +3690,65 @@
 
         wm.fireAllRules();
     }
-    
+
     public void testModifyActivationCreationNoLoop() throws Exception {
         // JBRULES-787, no-loop blocks all dependant tuples for modify 
         final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_ModifyActivationCreationNoLoop.drl" ) );
         final RuleBase ruleBase = loadRuleBase( reader );
 
-        final InternalWorkingMemoryActions wm = ( InternalWorkingMemoryActions ) ruleBase.newWorkingMemory();        
+        final InternalWorkingMemoryActions wm = (InternalWorkingMemoryActions) ruleBase.newWorkingMemory();
         final List created = new ArrayList();
-        final List cancelled = new ArrayList();        
-        AgendaEventListener l = new DefaultAgendaEventListener() {
+        final List cancelled = new ArrayList();
+        final AgendaEventListener l = new DefaultAgendaEventListener() {
             public void activationCreated(ActivationCreatedEvent event,
                                           WorkingMemory workingMemory) {
-                created.add(  event  );
-            }            
-            
-          public void activationCancelled(ActivationCancelledEvent event,
+                created.add( event );
+            }
+
+            public void activationCancelled(ActivationCancelledEvent event,
                                             WorkingMemory workingMemory) {
-              cancelled.add(  event  );
+                cancelled.add( event );
             }
-          
+
         };
-        
-        wm.addEventListener( l );        
-        
-        Cheese stilton = new Cheese( "stilton",
+
+        wm.addEventListener( l );
+
+        final Cheese stilton = new Cheese( "stilton",
                                      15 );
-        FactHandle stiltonHandle = wm.assertObject( stilton );
-        
-        Person p1 = new Person( "p1");
+        final FactHandle stiltonHandle = wm.assertObject( stilton );
+
+        final Person p1 = new Person( "p1" );
         p1.setCheese( stilton );
         wm.assertObject( p1 );
 
-        Person p2 = new Person( "p2");
+        final Person p2 = new Person( "p2" );
         p2.setCheese( stilton );
         wm.assertObject( p2 );
-        
-        Person p3 = new Person( "p3");
+
+        final Person p3 = new Person( "p3" );
         p3.setCheese( stilton );
-        wm.assertObject( p3 );                
+        wm.assertObject( p3 );
 
-        assertEquals( 3, created.size() );
-        assertEquals( 0, cancelled.size() );        
+        assertEquals( 3,
+                      created.size() );
+        assertEquals( 0,
+                      cancelled.size() );
 
-        Activation item = ((ActivationCreatedEvent) created.get( 2 )).getActivation();
-        
+        final Activation item = ((ActivationCreatedEvent) created.get( 2 )).getActivation();
+
         // simulate a modify inside a consequence
-        wm.modifyObject( stiltonHandle, stilton, item.getRule(), item );
-        
+        wm.modifyObject( stiltonHandle,
+                         stilton,
+                         item.getRule(),
+                         item );
+
         // the two of the three tuples should re-activate
-        assertEquals( 5, created.size() );
-        assertEquals( 3, cancelled.size() );
-    }    
+        assertEquals( 5,
+                      created.size() );
+        assertEquals( 3,
+                      cancelled.size() );
+    }
 
     public void testDoubleQueryWithExists() throws Exception {
         final PackageBuilder builder = new PackageBuilder();
@@ -3747,21 +3759,21 @@
         ruleBase.addPackage( pkg );
         final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
 
-        Person p1 = new Person( "p1",
+        final Person p1 = new Person( "p1",
                                 "stilton",
                                 20 );
         p1.setStatus( "europe" );
-        FactHandle c1FactHandle = workingMemory.assertObject( p1 );
-        Person p2 = new Person( "p2",
+        final FactHandle c1FactHandle = workingMemory.assertObject( p1 );
+        final Person p2 = new Person( "p2",
                                 "stilton",
                                 30 );
         p2.setStatus( "europe" );
-        FactHandle c2FactHandle = workingMemory.assertObject( p2 );
-        Person p3 = new Person( "p3",
+        final FactHandle c2FactHandle = workingMemory.assertObject( p2 );
+        final Person p3 = new Person( "p3",
                                 "stilton",
                                 40 );
         p3.setStatus( "europe" );
-        FactHandle c3FactHandle = workingMemory.assertObject( p3 );
+        final FactHandle c3FactHandle = workingMemory.assertObject( p3 );
         workingMemory.fireAllRules();
 
         QueryResults queryResults = workingMemory.getQueryResults( "2 persons with the same status" );
@@ -3898,26 +3910,26 @@
         final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
 
         try {
-            List sensors = new ArrayList();
+            final List sensors = new ArrayList();
 
             workingMemory.setGlobal( "sensors",
                                      sensors );
 
-            Sensor sensor1 = new Sensor( 100,
+            final Sensor sensor1 = new Sensor( 100,
                                          150 );
             workingMemory.assertObject( sensor1 );
             workingMemory.fireAllRules();
             assertEquals( 0,
                           sensors.size() );
 
-            Sensor sensor2 = new Sensor( 200,
+            final Sensor sensor2 = new Sensor( 200,
                                          150 );
             workingMemory.assertObject( sensor2 );
             workingMemory.fireAllRules();
             assertEquals( 3,
                           sensors.size() );
 
-        } catch ( RuntimeException e ) {
+        } catch ( final RuntimeException e ) {
             e.printStackTrace();
             fail( "Should not throw any exception" );
         }
@@ -3934,9 +3946,9 @@
             ruleBase.addPackage( pkg );
 
             Assert.fail( "Should have thrown an InvalidRulePackage" );
-        } catch ( InvalidRulePackage e ) {
+        } catch ( final InvalidRulePackage e ) {
             // everything fine
-        } catch ( Exception e ) {
+        } catch ( final Exception e ) {
             e.printStackTrace();
             Assert.fail( "Should have thrown an InvalidRulePackage Exception instead of " + e.getMessage() );
         }
@@ -3956,10 +3968,10 @@
         workingMemory.setGlobal( "results",
                                  list );
 
-        State state = new State( "SP" );
+        final State state = new State( "SP" );
         workingMemory.assertObject( state );
 
-        Person bob = new Person( "Bob" );
+        final Person bob = new Person( "Bob" );
         bob.setStatus( state.getState() );
         bob.setLikes( "stilton" );
         workingMemory.assertObject( bob );
@@ -3990,10 +4002,10 @@
         workingMemory.setGlobal( "results",
                                  list );
 
-        State state = new State( "SP" );
+        final State state = new State( "SP" );
         workingMemory.assertObject( state );
 
-        Person bob = new Person( "Bob" );
+        final Person bob = new Person( "Bob" );
         bob.setStatus( state.getState() );
         bob.setLikes( "stilton" );
         workingMemory.assertObject( bob );
@@ -4022,9 +4034,9 @@
             ruleBase.addPackage( pkg );
 
             fail( "Should have trown an exception" );
-        } catch ( InvalidRulePackage e ) {
+        } catch ( final InvalidRulePackage e ) {
             // success ... correct exception thrown
-        } catch ( Exception e ) {
+        } catch ( final Exception e ) {
             e.printStackTrace();
             fail( "Wrong exception raised: " + e.getMessage() );
         }
@@ -4040,7 +4052,7 @@
             final RuleBase ruleBase = getRuleBase();
             ruleBase.addPackage( pkg );
 
-            WorkingMemory wm = ruleBase.newWorkingMemory();
+            final WorkingMemory wm = ruleBase.newWorkingMemory();
 
             wm.assertObject( new Cheese( "a",
                                          10 ) );
@@ -4050,7 +4062,7 @@
                                          10 ) );
             wm.assertObject( new Cheese( "d",
                                          10 ) );
-            Cheese e = new Cheese( "e",
+            final Cheese e = new Cheese( "e",
                                    10 );
             wm.assertObject( e );
 
@@ -4061,7 +4073,7 @@
                                  e.getPrice() );
             // success
 
-        } catch ( RuntimeException e ) {
+        } catch ( final RuntimeException e ) {
             e.printStackTrace();
             fail( "Should not throw any exception" );
         }
@@ -4070,11 +4082,11 @@
     public void testDynamicRules() throws Exception {
         final RuleBase ruleBase = getRuleBase();
         final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
-        Cheese a = new Cheese( "stilton",
+        final Cheese a = new Cheese( "stilton",
                                10 );
-        Cheese b = new Cheese( "stilton",
+        final Cheese b = new Cheese( "stilton",
                                15 );
-        Cheese c = new Cheese( "stilton",
+        final Cheese c = new Cheese( "stilton",
                                20 );
         workingMemory.assertObject( a );
         workingMemory.assertObject( b );
@@ -4093,10 +4105,10 @@
         final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
 
         // Assert some simple facts
-        FactA a = new FactA( "hello",
+        final FactA a = new FactA( "hello",
                              new Integer( 1 ),
                              new Float( 3.14 ) );
-        FactB b = new FactB( "hello",
+        final FactB b = new FactB( "hello",
                              new Integer( 2 ),
                              new Float( 6.28 ) );
         workingMemory.assertObject( a );
@@ -4117,7 +4129,7 @@
             builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_ImportConflict.drl" ) ) );
             final Package pkg = builder.getPackage();
             ruleBase.addPackage( pkg );
-        } catch ( RuntimeException e ) {
+        } catch ( final RuntimeException e ) {
             e.printStackTrace();
             fail( "No exeception should be raised." );
         }
@@ -4178,7 +4190,7 @@
             assertEquals( 4,
                           result.size() );
 
-        } catch ( Exception e ) {
+        } catch ( final Exception e ) {
             e.printStackTrace();
             fail( "Should not raise any exception" );
         }
@@ -4240,7 +4252,7 @@
         final PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "ruleflow.drl" ) ) );
         final Package pkg = builder.getPackage();
-        ProcessBuilder processBuilder = new ProcessBuilder();
+        final ProcessBuilder processBuilder = new ProcessBuilder();
         processBuilder.addProcessFromFile( new InputStreamReader( getClass().getResourceAsStream( "ruleflow.rf" ) ) );
 
         final RuleBase ruleBase = getRuleBase();
@@ -4256,7 +4268,7 @@
         assertEquals( 0,
                       list.size() );
 
-        IProcessInstance processInstance = workingMemory.startProcess( "0" );
+        final IProcessInstance processInstance = workingMemory.startProcess( "0" );
         assertEquals( IProcessInstance.STATE_ACTIVE,
                       processInstance.getState() );
         workingMemory.fireAllRules();
@@ -4345,7 +4357,7 @@
             assertEquals( brie.getPrice(),
                           ((Integer) result.get( "test3" + brie.getType() )).intValue() );
 
-        } catch ( Exception e ) {
+        } catch ( final Exception e ) {
             e.printStackTrace();
             fail( "Should not raise any exception" );
         }
@@ -4361,7 +4373,7 @@
             assertEquals( 6,
                           pkg.getErrorSummary().split( "\n" ).length );
 
-        } catch ( Exception e ) {
+        } catch ( final Exception e ) {
             e.printStackTrace();
             fail( "Should not raise any exception" );
         }
@@ -4381,7 +4393,7 @@
 
             workingMemory.fireAllRules();
 
-        } catch ( Exception e ) {
+        } catch ( final Exception e ) {
             e.printStackTrace();
             fail( "Should not raise any exception" );
         }
@@ -4397,18 +4409,18 @@
             ruleBase.addPackage( pkg );
             final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
 
-            List results = new ArrayList();
+            final List results = new ArrayList();
             workingMemory.setGlobal( "results",
                                      results );
 
-            Order order = new Order( 10 );
-            OrderItem item1 = new OrderItem( order,
+            final Order order = new Order( 10 );
+            final OrderItem item1 = new OrderItem( order,
                                              1 );
-            OrderItem item2 = new OrderItem( order,
+            final OrderItem item2 = new OrderItem( order,
                                              2 );
-            OrderItem anotherItem1 = new OrderItem( null,
+            final OrderItem anotherItem1 = new OrderItem( null,
                                                     3 );
-            OrderItem anotherItem2 = new OrderItem( null,
+            final OrderItem anotherItem2 = new OrderItem( null,
                                                     4 );
             workingMemory.assertObject( order );
             workingMemory.assertObject( item1 );
@@ -4423,7 +4435,7 @@
             assertTrue( results.contains( item1 ) );
             assertTrue( results.contains( item2 ) );
 
-        } catch ( Exception e ) {
+        } catch ( final Exception e ) {
             e.printStackTrace();
             fail( "Should not raise any exception" );
         }
@@ -4443,14 +4455,14 @@
                                  list );
 
         // asserting the sensor object
-        RandomNumber rn = new RandomNumber();
+        final RandomNumber rn = new RandomNumber();
         rn.setValue( 10 );
         workingMemory.assertObject( rn );
 
-        Guess guess = new Guess();
+        final Guess guess = new Guess();
         guess.setValue( new Integer( 5 ) );
 
-        FactHandle handle = workingMemory.assertObject( guess );
+        final FactHandle handle = workingMemory.assertObject( guess );
 
         workingMemory.fireAllRules();
 
@@ -4499,11 +4511,11 @@
         workingMemory.setGlobal( "results",
                                  results );
 
-        Cheese cheese = new Cheese( "brie",
+        final Cheese cheese = new Cheese( "brie",
                                     10 );
-        FactHandle handle = workingMemory.assertObject( cheese );
+        final FactHandle handle = workingMemory.assertObject( cheese );
 
-        Person bob = new Person( "bob",
+        final Person bob = new Person( "bob",
                                  "stilton" );
         workingMemory.assertObject( bob );
 
@@ -4525,7 +4537,7 @@
         final WorkingMemory wm = ruleBase.newWorkingMemory();
 
         final List agendaList = new ArrayList();
-        AgendaEventListener agendaEventListener = new AgendaEventListener() {
+        final AgendaEventListener agendaEventListener = new AgendaEventListener() {
 
             public void activationCancelled(ActivationCancelledEvent event,
                                             WorkingMemory workingMemory) {
@@ -4561,7 +4573,7 @@
         };
 
         final List wmList = new ArrayList();
-        WorkingMemoryEventListener workingMemoryListener = new WorkingMemoryEventListener() {
+        final WorkingMemoryEventListener workingMemoryListener = new WorkingMemoryEventListener() {
 
             public void objectAsserted(ObjectAssertedEvent event) {
                 wmList.add( event );
@@ -4579,25 +4591,25 @@
 
         wm.addEventListener( workingMemoryListener );
 
-        Cheese stilton = new Cheese( "stilton",
+        final Cheese stilton = new Cheese( "stilton",
                                      15 );
-        Cheese cheddar = new Cheese( "cheddar",
+        final Cheese cheddar = new Cheese( "cheddar",
                                      17 );
 
-        FactHandle stiltonHandle = wm.assertObject( stilton );
+        final FactHandle stiltonHandle = wm.assertObject( stilton );
 
-        ObjectAssertedEvent oae = (ObjectAssertedEvent) wmList.get( 0 );
+        final ObjectAssertedEvent oae = (ObjectAssertedEvent) wmList.get( 0 );
         assertSame( stiltonHandle,
                     oae.getFactHandle() );
 
         wm.modifyObject( stiltonHandle,
                          stilton );
-        ObjectModifiedEvent ome = (ObjectModifiedEvent) wmList.get( 1 );
+        final ObjectModifiedEvent ome = (ObjectModifiedEvent) wmList.get( 1 );
         assertSame( stiltonHandle,
                     ome.getFactHandle() );
 
         wm.retractObject( stiltonHandle );
-        ObjectRetractedEvent ore = (ObjectRetractedEvent) wmList.get( 2 );
+        final ObjectRetractedEvent ore = (ObjectRetractedEvent) wmList.get( 2 );
         assertSame( stiltonHandle,
                     ore.getFactHandle() );
 
@@ -4619,7 +4631,7 @@
         workingMemory.setGlobal( "factor",
                                  new Double( 1.2 ) );
 
-        Cheese cheese = new Cheese( "stilton",
+        final Cheese cheese = new Cheese( "stilton",
                                     10 );
         workingMemory.assertObject( cheese );
 
@@ -4646,8 +4658,8 @@
     public void testEmptyDSL() throws Exception {
         final String DSL = "# This is an empty dsl file.";
         final PackageBuilder builder = new PackageBuilder();
-        Reader drlReader = new InputStreamReader( getClass().getResourceAsStream( "literal_rule.drl" ) );
-        Reader dslReader = new StringReader( DSL );
+        final Reader drlReader = new InputStreamReader( getClass().getResourceAsStream( "literal_rule.drl" ) );
+        final Reader dslReader = new StringReader( DSL );
 
         builder.addPackageFromDrl( drlReader,
                                    dslReader );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ReteTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ReteTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ReteTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -25,12 +25,14 @@
 
     protected RuleBase getRuleBase() throws Exception {
 
-        return RuleBaseFactory.newRuleBase( RuleBase.RETEOO, null );
+        return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,
+                                            null );
     }
 
-    protected RuleBase getRuleBase(final RuleBaseConfiguration config ) throws Exception {
+    protected RuleBase getRuleBase(final RuleBaseConfiguration config) throws Exception {
 
-        return RuleBaseFactory.newRuleBase( RuleBase.RETEOO, config );
+        return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,
+                                            config );
     }
 
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/helloworld/Message.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/helloworld/Message.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/helloworld/Message.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -27,9 +27,9 @@
     private int     number   = 0;
     private Date    birthday = new Date();
     private boolean fired    = false;
-    
+
     public Message() {
-    	
+
     }
 
     public boolean isFired() {

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Edge.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Edge.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Edge.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -40,9 +40,9 @@
     final public static String MINUS = "-";
 
     public Edge() {
-        
+
     }
-    
+
     public Edge(final int p1,
                 final int p2,
                 final boolean joined,

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Junction.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Junction.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Junction.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -39,11 +39,11 @@
     private int          basePoint;
 
     private String       type;
-    
+
     public Junction() {
-        
+
     }
-    
+
     public Junction(final int p1,
                     final int p2,
                     final int p3,

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Line.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Line.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Line.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -27,9 +27,9 @@
     private int p2;
 
     public Line() {
-        
+
     }
-    
+
     public Line(final int p1,
                 final int p2) {
         this.p1 = p1;

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Stage.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Stage.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Stage.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -52,9 +52,9 @@
     private int               value;
 
     public Stage() {
-        
+
     }
-    
+
     public Stage(final int value) {
         this.value = value;
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -49,9 +49,10 @@
             //load up the rulebase
             final RuleBase ruleBase = readRule();
             final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
-            
-            workingMemory.setGlobal( "sysout", System.out );
 
+            workingMemory.setGlobal( "sysout",
+                                     System.out );
+
             //            DebugWorkingMemoryEventListener wmListener = new DebugWorkingMemoryEventListener();
             //            DebugAgendaEventListener agendaListener = new DebugAgendaEventListener();
             //            workingMemory.addEventListener( wmListener );
@@ -63,15 +64,15 @@
 
             //final Stage stage = new Stage( Stage.START );
             //workingMemory.assertObject( stage );
-            
-            long start = System.currentTimeMillis();
-            
-            Stage stage = new Stage(Stage.DUPLICATE);
-            workingMemory.assertObject( stage );                
+
+            final long start = System.currentTimeMillis();
+
+            final Stage stage = new Stage( Stage.DUPLICATE );
+            workingMemory.assertObject( stage );
             workingMemory.fireAllRules();
-            
-            long end = System.currentTimeMillis();
-            System.out.println( end  - start );
+
+            final long end = System.currentTimeMillis();
+            System.out.println( end - start );
         } catch ( final Throwable t ) {
             t.printStackTrace();
             fail( t.getMessage() );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/WaltzUtil.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/WaltzUtil.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/WaltzUtil.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -21,9 +21,9 @@
  * 
  */
 public class WaltzUtil {
-    private static double PI      = 3.1415927;
+    private static double    PI      = 3.1415927;
 
-    private static final int    MOD_NUM = 10000;
+    private static final int MOD_NUM = 10000;
 
     private static int get_y(final int val) {
         return val % WaltzUtil.MOD_NUM;

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/MockExpander.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/MockExpander.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/MockExpander.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -44,17 +44,17 @@
         return this.patterns.contains( pat );
     }
 
-    public void addDSLMapping(DSLMapping mapping) {
+    public void addDSLMapping(final DSLMapping mapping) {
         // TODO Auto-generated method stub
-        
+
     }
 
-    public String expand(Reader drl) throws IOException {
+    public String expand(final Reader drl) throws IOException {
         // TODO Auto-generated method stub
         return null;
     }
 
-    public String expand(String source) {
+    public String expand(final String source) {
         // TODO Auto-generated method stub
         return null;
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/MockExpanderResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/MockExpanderResolver.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/MockExpanderResolver.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -29,7 +29,7 @@
     public Expander get(final String name,
                         final String config) {
         this.resolveCalls.put( name,
-                          config );
+                               config );
         return this.expander;
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -91,7 +91,7 @@
     }
 
     public void testCompilationUnit() throws Exception {
-        String source = "package foo; import com.foo.Bar; import com.foo.Baz;";
+        final String source = "package foo; import com.foo.Bar; import com.foo.Baz;";
         parse( source ).compilation_unit();
         assertEquals( "foo",
                       this.parser.getPackageDescr().getName() );
@@ -147,18 +147,18 @@
     public void testPartialAST() throws Exception {
         parseResource( "column_partial.drl" );
 
-        parser.compilation_unit();
+        this.parser.compilation_unit();
 
-        assertTrue( parser.hasErrors() );
+        assertTrue( this.parser.hasErrors() );
 
-        PackageDescr pkg = parser.getPackageDescr();
+        final PackageDescr pkg = this.parser.getPackageDescr();
         assertEquals( 1,
                       pkg.getRules().size() );
-        RuleDescr rule = (RuleDescr) pkg.getRules().get( 0 );
+        final RuleDescr rule = (RuleDescr) pkg.getRules().get( 0 );
 
         assertEquals( 1,
                       rule.getLhs().getDescrs().size() );
-        ColumnDescr col = (ColumnDescr) rule.getLhs().getDescrs().get( 0 );
+        final ColumnDescr col = (ColumnDescr) rule.getLhs().getDescrs().get( 0 );
 
         assertNotNull( col );
         assertEquals( "Bar",
@@ -203,7 +203,7 @@
 
         fact1 = null;
 
-        FactTemplateDescr fact2 = (FactTemplateDescr) pkg.getFactTemplates().get( 1 );
+        final FactTemplateDescr fact2 = (FactTemplateDescr) pkg.getFactTemplates().get( 1 );
         assertEquals( "Wine",
                       fact2.getName() );
         assertEquals( 3,
@@ -231,13 +231,13 @@
 
         parser.compilation_unit();
         final PackageDescr pkg = parser.getPackageDescr();
-        RuleDescr rule = (RuleDescr) pkg.getRules().get( 0 );
+        final RuleDescr rule = (RuleDescr) pkg.getRules().get( 0 );
         assertEquals( 1,
                       pkg.getRules().size() );
 
         assertFalse( parser.hasErrors() );
         assertEqualsIgnoreWhitespace( "if (speed > speedLimit ? true : false;) pullEmOver();",
-                                      ( String ) rule.getConsequence() );
+                                      (String) rule.getConsequence() );
     }
 
     public void FIX_ME_testLatinChars() throws Exception {
@@ -261,10 +261,10 @@
     }
 
     public void testFunctionWithArrays() throws Exception {
-        DRLParser parser = parseResource( "function_arrays.drl" );
+        final DRLParser parser = parseResource( "function_arrays.drl" );
 
         parser.compilation_unit();
-        PackageDescr pkg = parser.getPackageDescr();
+        final PackageDescr pkg = parser.getPackageDescr();
 
         if ( parser.hasErrors() ) {
             System.err.println( parser.getErrorMessages() );
@@ -278,7 +278,7 @@
         final RuleDescr rule = (RuleDescr) pkg.getRules().get( 0 );
 
         assertEqualsIgnoreWhitespace( "yourFunction(new String[3] {\"a\",\"b\",\"c\"});",
-                                      ( String ) rule.getConsequence() );
+                                      (String) rule.getConsequence() );
         final FunctionDescr func = (FunctionDescr) pkg.getFunctions().get( 0 );
 
         assertEquals( "String[]",
@@ -298,7 +298,7 @@
                       rule.getName() );
         assertNotNull( rule.getLhs() );
         assertEquals( "",
-                      (( String ) rule.getConsequence()).trim() );
+                      ((String) rule.getConsequence()).trim() );
         assertFalse( this.parser.hasErrors() );
     }
 
@@ -311,7 +311,7 @@
                       rule.getName() );
         assertNotNull( rule.getLhs() );
         assertEquals( "",
-                      (( String ) rule.getConsequence()).trim() );
+                      ((String) rule.getConsequence()).trim() );
         assertFalse( this.parser.hasErrors() );
     }
 
@@ -376,11 +376,11 @@
                                 + "Object o = new String(\"Hello\");" + "String s = (String) o;";
 
         assertEqualsIgnoreWhitespace( expected,
-                                      ( String ) rule.getConsequence() );
-        assertTrue( (( String ) rule.getConsequence()).indexOf( "++" ) > 0 );
-        assertTrue( (( String ) rule.getConsequence()).indexOf( "--" ) > 0 );
-        assertTrue( (( String ) rule.getConsequence()).indexOf( "+=" ) > 0 );
-        assertTrue( (( String ) rule.getConsequence()).indexOf( "==" ) > 0 );
+                                      (String) rule.getConsequence() );
+        assertTrue( ((String) rule.getConsequence()).indexOf( "++" ) > 0 );
+        assertTrue( ((String) rule.getConsequence()).indexOf( "--" ) > 0 );
+        assertTrue( ((String) rule.getConsequence()).indexOf( "+=" ) > 0 );
+        assertTrue( ((String) rule.getConsequence()).indexOf( "==" ) > 0 );
 
         //System.out.println(( String ) rule.getConsequence());
         //note, need to assert that "i++" is preserved as is, no extra spaces.
@@ -389,12 +389,12 @@
     }
 
     public void testRuleParseLhs() throws Exception {
-        String text = "Person(age < 42, location==\"atlanta\") \nor\nPerson(name==\"bob\") \n";
-        AndDescr descrs = new AndDescr();
-        CharStream charStream = new ANTLRStringStream( text );
-        DRLLexer lexer = new DRLLexer( charStream );
-        TokenStream tokenStream = new SwitchingCommonTokenStream( lexer );
-        DRLParser parser = new DRLParser( tokenStream );
+        final String text = "Person(age < 42, location==\"atlanta\") \nor\nPerson(name==\"bob\") \n";
+        final AndDescr descrs = new AndDescr();
+        final CharStream charStream = new ANTLRStringStream( text );
+        final DRLLexer lexer = new DRLLexer( charStream );
+        final TokenStream tokenStream = new SwitchingCommonTokenStream( lexer );
+        final DRLParser parser = new DRLParser( tokenStream );
         parser.setLineOffset( descrs.getLine() );
         parser.normal_lhs_block( descrs );
         if ( parser.hasErrors() ) {
@@ -415,7 +415,7 @@
                       rule.getName() );
         assertNotNull( rule.getLhs() );
         assertEqualsIgnoreWhitespace( "cons();",
-                                      ( String ) rule.getConsequence() );
+                                      (String) rule.getConsequence() );
 
         final AndDescr lhs = rule.getLhs();
         assertEquals( 3,
@@ -527,11 +527,11 @@
     public void testSimpleMethodCallWithFrom() throws Exception {
 
         final RuleDescr rule = parseResource( "test_SimpleMethodCallWithFrom.drl" ).rule();
-        FromDescr from = (FromDescr) rule.getLhs().getDescrs().get( 0 );
-        AccessorDescr method = (AccessorDescr) from.getDataSource();
+        final FromDescr from = (FromDescr) rule.getLhs().getDescrs().get( 0 );
+        final AccessorDescr method = (AccessorDescr) from.getDataSource();
 
-        assertFalse( parser.getErrorMessages().toString(),
-                     parser.hasErrors() );
+        assertFalse( this.parser.getErrorMessages().toString(),
+                     this.parser.hasErrors() );
 
         assertEquals( "something.doIt( foo,bar,42,\"hello\",{ a => \"b\", \"something\" => 42, \"a\" => foo, x => {x=>y}},\"end\", [a, \"b\", 42] )",
                       method.toString() );
@@ -540,11 +540,11 @@
     public void testSimpleFunctionCallWithFrom() throws Exception {
 
         final RuleDescr rule = parseResource( "test_SimpleFunctionCallWithFrom.drl" ).rule();
-        FromDescr from = (FromDescr) rule.getLhs().getDescrs().get( 0 );
-        AccessorDescr func = (AccessorDescr) from.getDataSource();
+        final FromDescr from = (FromDescr) rule.getLhs().getDescrs().get( 0 );
+        final AccessorDescr func = (AccessorDescr) from.getDataSource();
 
-        assertFalse( parser.getErrorMessages().toString(),
-                     parser.hasErrors() );
+        assertFalse( this.parser.getErrorMessages().toString(),
+                     this.parser.hasErrors() );
 
         assertEquals( "doIt( foo,bar,42,\"hello\",{ a => \"b\", \"something\" => 42, \"a\" => foo, x => {x=>y}},\"end\", [a, \"b\", 42] )",
                       func.toString() );
@@ -553,11 +553,11 @@
     public void testSimpleAccessorWithFrom() throws Exception {
 
         final RuleDescr rule = parseResource( "test_SimpleAccessorWithFrom.drl" ).rule();
-        FromDescr from = (FromDescr) rule.getLhs().getDescrs().get( 0 );
-        AccessorDescr accessor = (AccessorDescr) from.getDataSource();
+        final FromDescr from = (FromDescr) rule.getLhs().getDescrs().get( 0 );
+        final AccessorDescr accessor = (AccessorDescr) from.getDataSource();
 
-        assertFalse( parser.getErrorMessages().toString(),
-                     parser.hasErrors() );
+        assertFalse( this.parser.getErrorMessages().toString(),
+                     this.parser.hasErrors() );
 
         assertNull( ((FieldAccessDescr) accessor.getInvokers().get( 0 )).getArgument() );
 
@@ -568,11 +568,11 @@
     public void testSimpleAccessorAndArgWithFrom() throws Exception {
 
         final RuleDescr rule = parseResource( "test_SimpleAccessorArgWithFrom.drl" ).rule();
-        FromDescr from = (FromDescr) rule.getLhs().getDescrs().get( 0 );
-        AccessorDescr accessor = (AccessorDescr) from.getDataSource();
+        final FromDescr from = (FromDescr) rule.getLhs().getDescrs().get( 0 );
+        final AccessorDescr accessor = (AccessorDescr) from.getDataSource();
 
-        assertFalse( parser.getErrorMessages().toString(),
-                     parser.hasErrors() );
+        assertFalse( this.parser.getErrorMessages().toString(),
+                     this.parser.hasErrors() );
 
         assertNotNull( ((FieldAccessDescr) accessor.getInvokers().get( 0 )).getArgument() );
 
@@ -582,11 +582,11 @@
 
     public void testComplexChainedAcessor() throws Exception {
         final RuleDescr rule = parseResource( "test_ComplexChainedCallWithFrom.drl" ).rule();
-        FromDescr from = (FromDescr) rule.getLhs().getDescrs().get( 0 );
-        AccessorDescr accessor = (AccessorDescr) from.getDataSource();
+        final FromDescr from = (FromDescr) rule.getLhs().getDescrs().get( 0 );
+        final AccessorDescr accessor = (AccessorDescr) from.getDataSource();
 
-        assertFalse( parser.getErrorMessages().toString(),
-                     parser.hasErrors() );
+        assertFalse( this.parser.getErrorMessages().toString(),
+                     this.parser.hasErrors() );
 
         assertEquals( "doIt1( foo,bar,42,\"hello\",{ a => \"b\"}, [a, \"b\", 42] ).doIt2(bar, [a, \"b\", 42]).field[\"key\"]",
                       accessor.toString() );
@@ -775,7 +775,7 @@
                       third.getObjectType() );
 
         assertEqualsIgnoreWhitespace( "if ( a == b ) { " + "  assert( foo3 );" + "} else {" + "  retract( foo4 );" + "}" + "  System.out.println( a4 );",
-                                      ( String ) rule.getConsequence() );
+                                      (String) rule.getConsequence() );
 
         assertFalse( this.parser.hasErrors() );
     }
@@ -788,7 +788,7 @@
         assertNotNull( rule );
 
         assertEqualsIgnoreWhitespace( "consequence();",
-                                      ( String ) rule.getConsequence() );
+                                      (String) rule.getConsequence() );
         assertEquals( "simple_rule",
                       rule.getName() );
         assertEquals( 2,
@@ -916,8 +916,8 @@
     public void FIXME_testLineNumberIncludingCommentsInRHS() throws Exception {
         parseResource( "test_CommentLineNumbersInConsequence.drl" ).compilation_unit();
 
-        assertFalse( parser.hasErrors() );
-        String rhs = (String)  ((RuleDescr) parser.getPackageDescr().getRules().get( 0 )).getConsequence();
+        assertFalse( this.parser.hasErrors() );
+        final String rhs = (String) ((RuleDescr) this.parser.getPackageDescr().getRules().get( 0 )).getConsequence();
         //System.out.println(rhs);
         assertEquals( "\n first\n\n\n\n\n\n\n second",
                       rhs );
@@ -1002,7 +1002,7 @@
                       third.getObjectType() );
 
         assertEqualsIgnoreWhitespace( "if ( a == b ) { " + "  assert( foo3 );" + "} else {" + "  retract( foo4 );" + "}" + "  System.out.println( a4 );",
-                                      ( String ) rule.getConsequence() );
+                                      (String) rule.getConsequence() );
 
         assertFalse( this.parser.hasErrors() );
     }
@@ -1027,7 +1027,7 @@
         assertEquals( 1,
                       col.getDescrs().size() );
 
-        FieldConstraintDescr fld = (FieldConstraintDescr) col.getDescrs().get( 0 );
+        final FieldConstraintDescr fld = (FieldConstraintDescr) col.getDescrs().get( 0 );
         final LiteralRestrictionDescr lit = (LiteralRestrictionDescr) fld.getRestrictions().get( 0 );
 
         assertEquals( "==",
@@ -1045,7 +1045,7 @@
         parser.compilation_unit();
         assertFalse( parser.hasErrors() );
 
-        PackageDescr pkg = parser.getPackageDescr();
+        final PackageDescr pkg = parser.getPackageDescr();
         assertEquals( 2,
                       pkg.getFunctionImports().size() );
 
@@ -1244,16 +1244,16 @@
 
     public void testExpanderErrorsAfterExpansion() throws Exception {
 
-        String name = "expander_post_errors.drl";
-        Expander expander = new DefaultExpander();
-        String expanded = expander.expand( this.getReader( name ) );
+        final String name = "expander_post_errors.drl";
+        final Expander expander = new DefaultExpander();
+        final String expanded = expander.expand( this.getReader( name ) );
 
         final DRLParser parser = parse( name,
                                         expanded );
         parser.compilation_unit();
         assertTrue( parser.hasErrors() );
 
-        RecognitionException err = (RecognitionException) parser.getErrors().get( 0 );
+        final RecognitionException err = (RecognitionException) parser.getErrors().get( 0 );
         assertEquals( 1,
                       parser.getErrors().size() );
 
@@ -1276,7 +1276,7 @@
         final OrDescr or = (OrDescr) rule.getLhs().getDescrs().get( 0 );
         assertEquals( 2,
                       or.getDescrs().size() );
-        assertNotNull( ( String ) rule.getConsequence() );
+        assertNotNull( (String) rule.getConsequence() );
 
     }
 
@@ -1285,7 +1285,8 @@
         final PackageDescr pkg = parser.parse( this.getReader( "expander_multiple_constraints.drl" ),
                                                this.getReader( "multiple_constraints.dsl" ) );
 
-        assertFalse( parser.getErrors().toString(), parser.hasErrors() );
+        assertFalse( parser.getErrors().toString(),
+                     parser.hasErrors() );
 
         final RuleDescr rule = (RuleDescr) pkg.getRules().get( 0 );
         assertEquals( 2,
@@ -1306,7 +1307,7 @@
         assertEquals( "Bar",
                       col.getObjectType() );
 
-        assertNotNull( ( String ) rule.getConsequence() );
+        assertNotNull( (String) rule.getConsequence() );
 
     }
 
@@ -1316,13 +1317,14 @@
         final PackageDescr pkg = parser.parse( this.getReader( "expander_multiple_constraints_flush.drl" ),
                                                this.getReader( "multiple_constraints.dsl" ) );
 
-        assertFalse( parser.getErrors().toString(), parser.hasErrors() );
+        assertFalse( parser.getErrors().toString(),
+                     parser.hasErrors() );
 
         final RuleDescr rule = (RuleDescr) pkg.getRules().get( 0 );
         assertEquals( 1,
                       rule.getLhs().getDescrs().size() );
 
-        ColumnDescr col = (ColumnDescr) rule.getLhs().getDescrs().get( 0 );
+        final ColumnDescr col = (ColumnDescr) rule.getLhs().getDescrs().get( 0 );
         assertEquals( "Person",
                       col.getObjectType() );
 
@@ -1333,59 +1335,59 @@
         assertEquals( "location",
                       ((FieldConstraintDescr) col.getDescrs().get( 1 )).getFieldName() );
 
-        assertNotNull( ( String ) rule.getConsequence() );
+        assertNotNull( (String) rule.getConsequence() );
 
     }
 
-//    public void testExpanderUnExpandableErrorLines() throws Exception {
-//
-//        //stubb expander
-//        final ExpanderResolver res = new ExpanderResolver() {
-//            public Expander get(String name,
-//                                String config) {
-//                return new Expander() {
-//                    public String expand(String scope,
-//                                         String pattern) {
-//                        if ( pattern.startsWith( "Good" ) ) {
-//                            return pattern;
-//                        } else {
-//                            throw new IllegalArgumentException( "whoops" );
-//                        }
-//
-//                    }
-//                };
-//            }
-//        };
-//
-//        final DRLParser parser = parseResource( "expander_line_errors.drl" );
-//        parser.setExpanderResolver( res );
-//        parser.compilation_unit();
-//        assertTrue( parser.hasErrors() );
-//
-//        final List messages = parser.getErrorMessages();
-//        assertEquals( messages.size(),
-//                      parser.getErrors().size() );
-//
-//        assertEquals( 4,
-//                      parser.getErrors().size() );
-//        assertEquals( ExpanderException.class,
-//                      parser.getErrors().get( 0 ).getClass() );
-//        assertEquals( 8,
-//                      ((RecognitionException) parser.getErrors().get( 0 )).line );
-//        assertEquals( 10,
-//                      ((RecognitionException) parser.getErrors().get( 1 )).line );
-//        assertEquals( 12,
-//                      ((RecognitionException) parser.getErrors().get( 2 )).line );
-//        assertEquals( 13,
-//                      ((RecognitionException) parser.getErrors().get( 3 )).line );
-//
-//        final PackageDescr pack = parser.getPackageDescr();
-//        assertNotNull( pack );
-//
-//        final ExpanderException ex = (ExpanderException) parser.getErrors().get( 0 );
-//        assertTrue( ex.getMessage().indexOf( "whoops" ) > -1 );
-//
-//    }
+    //    public void testExpanderUnExpandableErrorLines() throws Exception {
+    //
+    //        //stubb expander
+    //        final ExpanderResolver res = new ExpanderResolver() {
+    //            public Expander get(String name,
+    //                                String config) {
+    //                return new Expander() {
+    //                    public String expand(String scope,
+    //                                         String pattern) {
+    //                        if ( pattern.startsWith( "Good" ) ) {
+    //                            return pattern;
+    //                        } else {
+    //                            throw new IllegalArgumentException( "whoops" );
+    //                        }
+    //
+    //                    }
+    //                };
+    //            }
+    //        };
+    //
+    //        final DRLParser parser = parseResource( "expander_line_errors.drl" );
+    //        parser.setExpanderResolver( res );
+    //        parser.compilation_unit();
+    //        assertTrue( parser.hasErrors() );
+    //
+    //        final List messages = parser.getErrorMessages();
+    //        assertEquals( messages.size(),
+    //                      parser.getErrors().size() );
+    //
+    //        assertEquals( 4,
+    //                      parser.getErrors().size() );
+    //        assertEquals( ExpanderException.class,
+    //                      parser.getErrors().get( 0 ).getClass() );
+    //        assertEquals( 8,
+    //                      ((RecognitionException) parser.getErrors().get( 0 )).line );
+    //        assertEquals( 10,
+    //                      ((RecognitionException) parser.getErrors().get( 1 )).line );
+    //        assertEquals( 12,
+    //                      ((RecognitionException) parser.getErrors().get( 2 )).line );
+    //        assertEquals( 13,
+    //                      ((RecognitionException) parser.getErrors().get( 3 )).line );
+    //
+    //        final PackageDescr pack = parser.getPackageDescr();
+    //        assertNotNull( pack );
+    //
+    //        final ExpanderException ex = (ExpanderException) parser.getErrors().get( 0 );
+    //        assertTrue( ex.getMessage().indexOf( "whoops" ) > -1 );
+    //
+    //    }
 
     public void testBasicBinding() throws Exception {
         final DRLParser parser = parseResource( "basic_binding.drl" );
@@ -1483,23 +1485,23 @@
         assertEquals( 1,
                       rule.getLhs().getDescrs().size() );
 
-        OrDescr or = (OrDescr) rule.getLhs().getDescrs().get( 0 );
+        final OrDescr or = (OrDescr) rule.getLhs().getDescrs().get( 0 );
         assertEquals( 2,
                       or.getDescrs().size() );
 
-        ColumnDescr first = (ColumnDescr) or.getDescrs().get( 0 );
+        final ColumnDescr first = (ColumnDescr) or.getDescrs().get( 0 );
         assertEquals( "Person",
                       first.getObjectType() );
 
-        AndDescr and = (AndDescr) or.getDescrs().get( 1 );
+        final AndDescr and = (AndDescr) or.getDescrs().get( 1 );
         assertEquals( 2,
                       and.getDescrs().size() );
 
-        ColumnDescr left = (ColumnDescr) and.getDescrs().get( 0 );
+        final ColumnDescr left = (ColumnDescr) and.getDescrs().get( 0 );
         assertEquals( "Person",
                       left.getObjectType() );
 
-        ColumnDescr right = (ColumnDescr) and.getDescrs().get( 1 );
+        final ColumnDescr right = (ColumnDescr) and.getDescrs().get( 1 );
         assertEquals( "Cheese",
                       right.getObjectType() );
     }
@@ -1597,7 +1599,7 @@
                       literal.getText() );
 
         assertEqualsIgnoreWhitespace( "System.out.println( \"Mark and Michael\" );",
-                                      ( String ) rule.getConsequence() );
+                                      (String) rule.getConsequence() );
 
         assertFalse( parser.hasErrors() );
     }
@@ -1637,7 +1639,7 @@
                       cheeseDescr.getIdentifier() );
 
         assertEqualsIgnoreWhitespace( "System.out.println( \"Mark and Michael\" + bar );",
-                                      ( String ) rule.getConsequence() );
+                                      (String) rule.getConsequence() );
 
         assertFalse( parser.hasErrors() );
     }
@@ -1678,7 +1680,7 @@
                       secondFact.getIdentifier() );
 
         assertEqualsIgnoreWhitespace( "System.out.println( \"Mark and Michael\" + bar );",
-                                      ( String ) rule.getConsequence() );
+                                      (String) rule.getConsequence() );
 
         assertFalse( parser.hasErrors() );
     }
@@ -1716,7 +1718,7 @@
                       secondFact.getIdentifier() );
 
         assertEqualsIgnoreWhitespace( "System.out.println( \"Mark and Michael\" + bar );",
-                                      ( String ) rule.getConsequence() );
+                                      (String) rule.getConsequence() );
 
         assertFalse( parser.hasErrors() );
     }
@@ -1810,7 +1812,7 @@
         assertEqualsIgnoreWhitespace( "abc(\"foo\")",
                                       (String) eval.getContent() );
         assertEqualsIgnoreWhitespace( "Kapow",
-                                      ( String ) rule.getConsequence() );
+                                      (String) rule.getConsequence() );
 
         assertFalse( parser.hasErrors() );
     }
@@ -1831,8 +1833,8 @@
                       col.getDescrs().size() );
         assertEquals( "Foo",
                       col.getObjectType() );
-        FieldConstraintDescr fld = (FieldConstraintDescr) col.getDescrs().get( 0 );
-        ReturnValueRestrictionDescr retval = (ReturnValueRestrictionDescr) fld.getRestrictions().get( 0 );
+        final FieldConstraintDescr fld = (FieldConstraintDescr) col.getDescrs().get( 0 );
+        final ReturnValueRestrictionDescr retval = (ReturnValueRestrictionDescr) fld.getRestrictions().get( 0 );
 
         assertEquals( "a + b",
                       retval.getContent() );
@@ -1892,7 +1894,7 @@
         final NotDescr not = (NotDescr) rule.getLhs().getDescrs().get( 1 );
         column = (ColumnDescr) not.getDescrs().get( 0 );
 
-        FieldConstraintDescr fld = (FieldConstraintDescr) column.getDescrs().get( 0 );
+        final FieldConstraintDescr fld = (FieldConstraintDescr) column.getDescrs().get( 0 );
         final VariableRestrictionDescr boundVariable = (VariableRestrictionDescr) fld.getRestrictions().get( 0 );
 
         assertEquals( "type",
@@ -1922,12 +1924,12 @@
         assertEquals( 2,
                       pack.getGlobals().size() );
 
-        GlobalDescr foo = (GlobalDescr) pack.getGlobals().get( 0 );
+        final GlobalDescr foo = (GlobalDescr) pack.getGlobals().get( 0 );
         assertEquals( "java.lang.String",
                       foo.getType() );
         assertEquals( "foo",
                       foo.getIdentifier() );
-        GlobalDescr bar = (GlobalDescr) pack.getGlobals().get( 1 );
+        final GlobalDescr bar = (GlobalDescr) pack.getGlobals().get( 1 );
         assertEquals( "java.lang.Integer",
                       bar.getType() );
         assertEquals( "bar",
@@ -2003,7 +2005,7 @@
         assertEquals( "simple_rule",
                       rule.getName() );
         assertEqualsIgnoreWhitespace( "bar();",
-                                      ( String ) rule.getConsequence() );
+                                      (String) rule.getConsequence() );
 
         final List attrs = rule.getAttributes();
         assertEquals( 6,
@@ -2043,8 +2045,8 @@
         assertEquals( "lock-on-active",
                       at.getName() );
         assertEquals( "true",
-                      at.getValue() );        
-        
+                      at.getValue() );
+
         assertFalse( this.parser.hasErrors() );
     }
 
@@ -2053,7 +2055,7 @@
         assertEquals( "simple_rule",
                       rule.getName() );
         assertEqualsIgnoreWhitespace( "bar();",
-                                      ( String ) rule.getConsequence() );
+                                      (String) rule.getConsequence() );
 
         final List attrs = rule.getAttributes();
         assertEquals( 6,
@@ -2081,8 +2083,8 @@
         assertEquals( "lock-on-active",
                       at.getName() );
         assertEquals( "true",
-                      at.getValue() );        
-        
+                      at.getValue() );
+
         at = (AttributeDescr) attrs.get( 4 );
         assertEquals( "duration",
                       at.getName() );
@@ -2109,7 +2111,7 @@
                       col.getObjectType() );
         assertEquals( 1,
                       col.getDescrs().size() );
-        FieldConstraintDescr fld = (FieldConstraintDescr) col.getDescrs().get( 0 );
+        final FieldConstraintDescr fld = (FieldConstraintDescr) col.getDescrs().get( 0 );
         final LiteralRestrictionDescr lit = (LiteralRestrictionDescr) fld.getRestrictions().get( 0 );
 
         assertEquals( "bar",
@@ -2208,8 +2210,8 @@
     public void testEvalWithNewline() throws Exception {
         parseResource( "eval_with_newline.drl" ).compilation_unit();
 
-        if ( parser.hasErrors() ) {
-            System.err.println( parser.getErrorMessages() );
+        if ( this.parser.hasErrors() ) {
+            System.err.println( this.parser.getErrorMessages() );
         }
         assertFalse( this.parser.hasErrors() );
     }
@@ -2225,8 +2227,8 @@
 
     public void testEndPosition() throws Exception {
         parseResource( "test_EndPosition.drl" ).compilation_unit();
-        RuleDescr rule = (RuleDescr) parser.getPackageDescr().getRules().get( 0 );
-        ColumnDescr col = (ColumnDescr) rule.getLhs().getDescrs().get( 0 );
+        final RuleDescr rule = (RuleDescr) this.parser.getPackageDescr().getRules().get( 0 );
+        final ColumnDescr col = (ColumnDescr) rule.getLhs().getDescrs().get( 0 );
         assertEquals( 6,
                       col.getLine() );
 
@@ -2334,18 +2336,18 @@
     }
 
     public void testPredicate() throws Exception {
-        ColumnDescr column = new ColumnDescr();
+        final ColumnDescr column = new ColumnDescr();
         parse( "$var : attr -> ( $var.equals(\"xyz\") )" ).constraints( column );
 
         assertFalse( this.parser.getErrorMessages().toString(),
                      this.parser.hasErrors() );
 
-        List constraints = column.getDescrs();
+        final List constraints = column.getDescrs();
         assertEquals( 2,
                       constraints.size() );
 
-        FieldBindingDescr field = (FieldBindingDescr) constraints.get( 0 );
-        PredicateDescr predicate = (PredicateDescr) constraints.get( 1 );
+        final FieldBindingDescr field = (FieldBindingDescr) constraints.get( 0 );
+        final PredicateDescr predicate = (PredicateDescr) constraints.get( 1 );
         assertEquals( "$var",
                       field.getIdentifier() );
         assertEquals( "attr",
@@ -2355,17 +2357,17 @@
     }
 
     public void testPredicate2() throws Exception {
-        ColumnDescr column = new ColumnDescr();
+        final ColumnDescr column = new ColumnDescr();
         parse( "( $var.equals(\"xyz\") )" ).constraints( column );
 
         assertFalse( this.parser.getErrorMessages().toString(),
                      this.parser.hasErrors() );
 
-        List constraints = column.getDescrs();
+        final List constraints = column.getDescrs();
         assertEquals( 1,
                       constraints.size() );
 
-        PredicateDescr predicate = (PredicateDescr) constraints.get( 0 );
+        final PredicateDescr predicate = (PredicateDescr) constraints.get( 0 );
         assertEquals( " $var.equals(\"xyz\") ",
                       predicate.getContent() );
     }
@@ -2381,7 +2383,7 @@
         final String expected = "String s = \"\\\"\\n\\t\\\\\";";
 
         assertEqualsIgnoreWhitespace( expected,
-                                      ( String ) rule.getConsequence() );
+                                      (String) rule.getConsequence() );
 
         assertFalse( this.parser.getErrorMessages().toString(),
                      this.parser.hasErrors() );
@@ -2395,20 +2397,20 @@
 
         assertNotNull( rule );
 
-        AndDescr root = rule.getLhs();
-        NotDescr not1 = (NotDescr) root.getDescrs().get( 0 );
-        AndDescr and1 = (AndDescr) not1.getDescrs().get( 0 );
+        final AndDescr root = rule.getLhs();
+        final NotDescr not1 = (NotDescr) root.getDescrs().get( 0 );
+        final AndDescr and1 = (AndDescr) not1.getDescrs().get( 0 );
 
-        ColumnDescr state = (ColumnDescr) and1.getDescrs().get( 0 );
-        NotDescr not2 = (NotDescr) and1.getDescrs().get( 1 );
-        AndDescr and2 = (AndDescr) not2.getDescrs().get( 0 );
-        ColumnDescr person = (ColumnDescr) and2.getDescrs().get( 0 );
-        ColumnDescr cheese = (ColumnDescr) and2.getDescrs().get( 1 );
+        final ColumnDescr state = (ColumnDescr) and1.getDescrs().get( 0 );
+        final NotDescr not2 = (NotDescr) and1.getDescrs().get( 1 );
+        final AndDescr and2 = (AndDescr) not2.getDescrs().get( 0 );
+        final ColumnDescr person = (ColumnDescr) and2.getDescrs().get( 0 );
+        final ColumnDescr cheese = (ColumnDescr) and2.getDescrs().get( 1 );
 
-        ColumnDescr person2 = (ColumnDescr) root.getDescrs().get( 1 );
-        OrDescr or = (OrDescr) root.getDescrs().get( 2 );
-        ColumnDescr cheese2 = (ColumnDescr) or.getDescrs().get( 0 );
-        ColumnDescr cheese3 = (ColumnDescr) or.getDescrs().get( 1 );
+        final ColumnDescr person2 = (ColumnDescr) root.getDescrs().get( 1 );
+        final OrDescr or = (OrDescr) root.getDescrs().get( 2 );
+        final ColumnDescr cheese2 = (ColumnDescr) or.getDescrs().get( 0 );
+        final ColumnDescr cheese3 = (ColumnDescr) or.getDescrs().get( 1 );
 
         assertEquals( state.getObjectType(),
                       "State" );
@@ -2448,7 +2450,7 @@
         final List remaining = forall.getRemainingColumns();
         assertEquals( 1,
                       remaining.size() );
-        ColumnDescr cheese = (ColumnDescr) remaining.get( 0 );
+        final ColumnDescr cheese = (ColumnDescr) remaining.get( 0 );
         assertEquals( "Cheese",
                       cheese.getObjectType() );
     }
@@ -2474,7 +2476,7 @@
     private DRLParser parseResource(final String name) throws Exception {
 
         //        System.err.println( getClass().getResource( name ) );
-        Reader reader = getReader( name );
+        final Reader reader = getReader( name );
 
         final StringBuffer text = new StringBuffer();
 
@@ -2521,9 +2523,9 @@
     }
 
     private void prettyPrintErrors() {
-        List msgs = this.parser.getErrorMessages();
-        for ( Iterator iter = msgs.iterator(); iter.hasNext(); ) {
-            String err = (String) iter.next();
+        final List msgs = this.parser.getErrorMessages();
+        for ( final Iterator iter = msgs.iterator(); iter.hasNext(); ) {
+            final String err = (String) iter.next();
             System.out.println( err );
 
         }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DSLMappingFileTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DSLMappingFileTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DSLMappingFileTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -20,21 +20,23 @@
 
     public void testParseFile() {
         try {
-            Reader reader = new InputStreamReader( this.getClass().getResourceAsStream( filename ) );
-            file = new DSLMappingFile( );
+            final Reader reader = new InputStreamReader( this.getClass().getResourceAsStream( this.filename ) );
+            this.file = new DSLMappingFile();
 
-            boolean parsingResult = file.parseAndLoad( reader );
+            final boolean parsingResult = this.file.parseAndLoad( reader );
             reader.close();
-            
-            assertTrue( file.getErrors().toString(), parsingResult );
-            assertTrue( file.getErrors().isEmpty() );
-            
-            assertEquals( 31, file.getMapping().getEntries().size() );
-        } catch ( IOException e ) {
+
+            assertTrue( this.file.getErrors().toString(),
+                        parsingResult );
+            assertTrue( this.file.getErrors().isEmpty() );
+
+            assertEquals( 31,
+                          this.file.getMapping().getEntries().size() );
+        } catch ( final IOException e ) {
             e.printStackTrace();
-            fail( "Should not raise exception ");
+            fail( "Should not raise exception " );
         }
-        
+
     }
-    
+
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultDSLMappingEntryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultDSLMappingEntryTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultDSLMappingEntryTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -8,13 +8,13 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-        String inputKey = "String is \"{value}\"";
-        String inputValue = "SomeFact(value==\"{value}\")";
+        final String inputKey = "String is \"{value}\"";
+        final String inputValue = "SomeFact(value==\"{value}\")";
 
-        entry = new DefaultDSLMappingEntry( DSLMappingEntry.CONDITION,
-                                                                           null,
-                                                                           inputKey,
-                                                                           inputValue );
+        this.entry = new DefaultDSLMappingEntry( DSLMappingEntry.CONDITION,
+                                            null,
+                                            inputKey,
+                                            inputValue );
     }
 
     protected void tearDown() throws Exception {
@@ -22,16 +22,16 @@
     }
 
     public void testPatternCalculation() {
-        String inputKey = "The Customer name is {name} and surname is {surname} and it has US$ 50,00 on his {pocket}";
-        String inputValue = "Customer( name == \"{name}\", surname == \"{surname}\", money > $money )";
+        final String inputKey = "The Customer name is {name} and surname is {surname} and it has US$ 50,00 on his {pocket}";
+        final String inputValue = "Customer( name == \"{name}\", surname == \"{surname}\", money > $money )";
 
-        String expectedKeyP = "The\\s*Customer\\s*name\\s*is\\s*(.*?)\\s*and\\s*surname\\s*is\\s*(.*?)\\s*and\\s*it\\s*has\\s*US\\$\\s*50,00\\s*on\\s*his\\s*(.*?)$";
-        String expectedValP = "Customer( name == \"$1\", surname == \"$2\", money > \\$money )";
+        final String expectedKeyP = "The\\s*Customer\\s*name\\s*is\\s*(.*?)\\s*and\\s*surname\\s*is\\s*(.*?)\\s*and\\s*it\\s*has\\s*US\\$\\s*50,00\\s*on\\s*his\\s*(.*?)$";
+        final String expectedValP = "Customer( name == \"$1\", surname == \"$2\", money > \\$money )";
 
-        DSLMappingEntry entry = new DefaultDSLMappingEntry( DSLMappingEntry.CONDITION,
-                                                                   null,
-                                                                   inputKey,
-                                                                   inputValue );
+        final DSLMappingEntry entry = new DefaultDSLMappingEntry( DSLMappingEntry.CONDITION,
+                                                            null,
+                                                            inputKey,
+                                                            inputValue );
 
         assertEquals( inputKey,
                       entry.getMappingKey() );
@@ -45,16 +45,16 @@
     }
 
     public void testPatternCalculation2() {
-        String inputKey = "-name is {name}";
-        String inputValue = "name == \"{name}\"";
+        final String inputKey = "-name is {name}";
+        final String inputValue = "name == \"{name}\"";
 
-        String expectedKeyP = "-\\s*name\\s*is\\s*(.*?)$";
-        String expectedValP = "name == \"$1\"";
+        final String expectedKeyP = "-\\s*name\\s*is\\s*(.*?)$";
+        final String expectedValP = "name == \"$1\"";
 
-        DSLMappingEntry entry = new DefaultDSLMappingEntry( DSLMappingEntry.CONDITION,
-                                                                   null,
-                                                                   inputKey,
-                                                                   inputValue );
+        final DSLMappingEntry entry = new DefaultDSLMappingEntry( DSLMappingEntry.CONDITION,
+                                                            null,
+                                                            inputKey,
+                                                            inputValue );
 
         assertEquals( inputKey,
                       entry.getMappingKey() );
@@ -68,16 +68,16 @@
     }
 
     public void testPatternCalculation3() {
-        String inputKey = "- name is {name}";
-        String inputValue = "name == \"{name}\"";
+        final String inputKey = "- name is {name}";
+        final String inputValue = "name == \"{name}\"";
 
-        String expectedKeyP = "-\\s*name\\s*is\\s*(.*?)$";
-        String expectedValP = "name == \"$1\"";
+        final String expectedKeyP = "-\\s*name\\s*is\\s*(.*?)$";
+        final String expectedValP = "name == \"$1\"";
 
-        DSLMappingEntry entry = new DefaultDSLMappingEntry( DSLMappingEntry.CONDITION,
-                                                                   null,
-                                                                   inputKey,
-                                                                   inputValue );
+        final DSLMappingEntry entry = new DefaultDSLMappingEntry( DSLMappingEntry.CONDITION,
+                                                            null,
+                                                            inputKey,
+                                                            inputValue );
 
         assertEquals( inputKey,
                       entry.getMappingKey() );
@@ -90,45 +90,45 @@
     }
 
     public void testExpandNoSpaces() {
-        String result = entry.getKeyPattern().matcher( "String is \"blah\"" ).replaceAll( entry.getValuePattern() ); 
+        final String result = this.entry.getKeyPattern().matcher( "String is \"blah\"" ).replaceAll( this.entry.getValuePattern() );
 
         assertEquals( "SomeFact(value==\"blah\")",
                       result );
     }
 
     public void testExpandWithLeadingSpace() {
-        String result = entry.getKeyPattern().matcher( "String is \" blah\"" ).replaceAll( entry.getValuePattern() ); 
+        final String result = this.entry.getKeyPattern().matcher( "String is \" blah\"" ).replaceAll( this.entry.getValuePattern() );
 
         assertEquals( "SomeFact(value==\" blah\")",
                       result );
     }
 
     public void testExpandWithMultipleLeadingSpaces() {
-        String result = entry.getKeyPattern().matcher( "String is \"   blah\"" ).replaceAll( entry.getValuePattern() ); 
+        final String result = this.entry.getKeyPattern().matcher( "String is \"   blah\"" ).replaceAll( this.entry.getValuePattern() );
         assertEquals( "SomeFact(value==\"   blah\")",
                       result );
     }
 
     public void testExpandWithTrailingSpace() {
-        String result = entry.getKeyPattern().matcher( "String is \"blah \"" ).replaceAll( entry.getValuePattern() ); 
+        final String result = this.entry.getKeyPattern().matcher( "String is \"blah \"" ).replaceAll( this.entry.getValuePattern() );
         assertEquals( "SomeFact(value==\"blah \")",
                       result );
     }
 
     public void testExpandWithMultipleTrailingSpaces() {
-        String result = entry.getKeyPattern().matcher( "String is \"blah  \"" ).replaceAll( entry.getValuePattern() ); 
+        final String result = this.entry.getKeyPattern().matcher( "String is \"blah  \"" ).replaceAll( this.entry.getValuePattern() );
         assertEquals( "SomeFact(value==\"blah  \")",
                       result );
     }
 
     public void testExpandWithInternalSpace() {
-        String result = entry.getKeyPattern().matcher( "String is \"bl ah\"" ).replaceAll( entry.getValuePattern() ); 
+        final String result = this.entry.getKeyPattern().matcher( "String is \"bl ah\"" ).replaceAll( this.entry.getValuePattern() );
         assertEquals( "SomeFact(value==\"bl ah\")",
                       result );
     }
 
     public void testExpandWithMultipleSpaces() {
-        String result = entry.getKeyPattern().matcher( "String is \"  bl  ah  \"" ).replaceAll( entry.getValuePattern() ); 
+        final String result = this.entry.getKeyPattern().matcher( "String is \"  bl  ah  \"" ).replaceAll( this.entry.getValuePattern() );
         assertEquals( "SomeFact(value==\"  bl  ah  \")",
                       result );
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultExpanderResolverTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultExpanderResolverTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultExpanderResolverTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -16,71 +16,66 @@
  * limitations under the License.
  */
 
-import java.io.InputStreamReader;
-
 import junit.framework.TestCase;
 
-import org.drools.lang.Expander;
-import org.drools.lang.MockExpander;
-
 public class DefaultExpanderResolverTest extends TestCase {
 
-//    public void testResolve() throws Exception {
-//        final DefaultExpanderResolver res = new DefaultExpanderResolver();
-//        final Expander mock1 = new MockExpander();
-//        res.addExpander( "mock1.dsl",
-//                         mock1 );
-//        assertEquals( mock1,
-//                      res.get( "mock1.dsl",
-//                               null ) );
-//        res.addExpander( "mock2.dsl",
-//                         new MockExpander() );
-//        assertNotSame( mock1,
-//                       res.get( "mock2.dsl",
-//                                null ) );
-//
-//        final MockExpander def = new MockExpander();
-//        res.addExpander( "*",
-//                         def );
-//        assertEquals( def,
-//                      res.get( "nothing.here",
-//                               null ) );
-//
-//    }
-//
-//    public void testDefault() throws Exception {
-//
-//        final InputStreamReader reader = new InputStreamReader( this.getClass().getResourceAsStream( "test.dsl" ) );
-//
-//        final DefaultExpanderResolver res = new DefaultExpanderResolver( reader );
-//        final DefaultExpander exp = (DefaultExpander) res.get( "oooh",
-//                                                         null );
-//        assertNotNull( exp );
-//
-//        assertEquals( "Person(name==\"foo\")",
-//                      exp.expand( "when",
-//                                  "Person has name of foo" ) );
-//        assertEquals( "wild();",
-//                      exp.expand( "then",
-//                                  "Go wild" ) );
-//        assertEquals( "something",
-//                      exp.expand( "when",
-//                                  "nothing" ) );
-//        assertEquals( "something",
-//                      exp.expand( "then",
-//                                  "nothing" ) );
-//
-//    }
-//
+    //    public void testResolve() throws Exception {
+    //        final DefaultExpanderResolver res = new DefaultExpanderResolver();
+    //        final Expander mock1 = new MockExpander();
+    //        res.addExpander( "mock1.dsl",
+    //                         mock1 );
+    //        assertEquals( mock1,
+    //                      res.get( "mock1.dsl",
+    //                               null ) );
+    //        res.addExpander( "mock2.dsl",
+    //                         new MockExpander() );
+    //        assertNotSame( mock1,
+    //                       res.get( "mock2.dsl",
+    //                                null ) );
+    //
+    //        final MockExpander def = new MockExpander();
+    //        res.addExpander( "*",
+    //                         def );
+    //        assertEquals( def,
+    //                      res.get( "nothing.here",
+    //                               null ) );
+    //
+    //    }
+    //
+    //    public void testDefault() throws Exception {
+    //
+    //        final InputStreamReader reader = new InputStreamReader( this.getClass().getResourceAsStream( "test.dsl" ) );
+    //
+    //        final DefaultExpanderResolver res = new DefaultExpanderResolver( reader );
+    //        final DefaultExpander exp = (DefaultExpander) res.get( "oooh",
+    //                                                         null );
+    //        assertNotNull( exp );
+    //
+    //        assertEquals( "Person(name==\"foo\")",
+    //                      exp.expand( "when",
+    //                                  "Person has name of foo" ) );
+    //        assertEquals( "wild();",
+    //                      exp.expand( "then",
+    //                                  "Go wild" ) );
+    //        assertEquals( "something",
+    //                      exp.expand( "when",
+    //                                  "nothing" ) );
+    //        assertEquals( "something",
+    //                      exp.expand( "then",
+    //                                  "nothing" ) );
+    //
+    //    }
+    //
     public void testFindNone() {
-//        final DefaultExpanderResolver exp = new DefaultExpanderResolver();
-//        try {
-//            exp.get( "nothing.dsl",
-//                     "" );
-//            fail( "should have thrown an exception when it can't find an expander." );
-//        } catch ( final IllegalArgumentException e ) {
-//            assertNotNull( e.getMessage() );
-//        }
+        //        final DefaultExpanderResolver exp = new DefaultExpanderResolver();
+        //        try {
+        //            exp.get( "nothing.dsl",
+        //                     "" );
+        //            fail( "should have thrown an exception when it can't find an expander." );
+        //        } catch ( final IllegalArgumentException e ) {
+        //            assertNotNull( e.getMessage() );
+        //        }
     }
 
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultExpanderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultExpanderTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultExpanderTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -10,13 +10,13 @@
     private DefaultExpander expander = null;
 
     protected void setUp() throws Exception {
-        String filename = "test_metainfo.dsl";
-        Reader reader = new InputStreamReader( this.getClass().getResourceAsStream( filename ) );
-        file = new DSLMappingFile();
-        file.parseAndLoad( reader );
+        final String filename = "test_metainfo.dsl";
+        final Reader reader = new InputStreamReader( this.getClass().getResourceAsStream( filename ) );
+        this.file = new DSLMappingFile();
+        this.file.parseAndLoad( reader );
         reader.close();
 
-        expander = new DefaultExpander();
+        this.expander = new DefaultExpander();
 
         super.setUp();
     }
@@ -26,13 +26,13 @@
     }
 
     public void testAddDSLMapping() {
-        expander.addDSLMapping( file.getMapping() );
+        this.expander.addDSLMapping( this.file.getMapping() );
         // should not raise any exception
     }
 
     public void testRegexp() throws Exception {
-        expander.addDSLMapping( file.getMapping() );
-        Reader rules = new InputStreamReader( this.getClass().getResourceAsStream( "test_expansion.drl" ) );
-        String result = expander.expand( rules );
+        this.expander.addDSLMapping( this.file.getMapping() );
+        final Reader rules = new InputStreamReader( this.getClass().getResourceAsStream( "test_expansion.drl" ) );
+        final String result = this.expander.expand( rules );
     }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/ReteooBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/ReteooBuilderTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/ReteooBuilderTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -81,8 +81,8 @@
             final ObjectSource source1 = (ObjectSource) object1;
             final ObjectSource source2 = (ObjectSource) object2;
 
-            ObjectSink[] list1 = source1.sink.getSinks();
-            ObjectSink[] list2 = source2.sink.getSinks();
+            final ObjectSink[] list1 = source1.sink.getSinks();
+            final ObjectSink[] list2 = source2.sink.getSinks();
 
             assertEquals( object1.getClass() + " nodes have different number of sinks",
                           list1.length,
@@ -96,8 +96,8 @@
             final TupleSource source1 = (TupleSource) object1;
             final TupleSource source2 = (TupleSource) object2;
 
-            TupleSink[] list1 = source1.sink.getSinks();
-            TupleSink[] list2 = source2.sink.getSinks();
+            final TupleSink[] list1 = source1.sink.getSinks();
+            final TupleSink[] list2 = source2.sink.getSinks();
 
             assertEquals( object1.getClass() + " nodes have different number of sinks",
                           list1.length,

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/AccumulateTemplateTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/AccumulateTemplateTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/AccumulateTemplateTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -14,7 +14,6 @@
 import org.drools.base.ClassFieldExtractor;
 import org.drools.base.ClassObjectType;
 import org.drools.rule.Declaration;
-import org.drools.rule.builder.RuleBuilder;
 import org.drools.spi.ColumnExtractor;
 
 public class AccumulateTemplateTest extends TestCase {
@@ -28,23 +27,22 @@
     }
 
     public void testMethodGeneration() {
-        StringTemplateGroup ruleGroup = new StringTemplateGroup( new InputStreamReader( AccumulateTemplateTest.class.getResourceAsStream( "javaRule.stg" ) ),
+        final StringTemplateGroup ruleGroup = new StringTemplateGroup( new InputStreamReader( AccumulateTemplateTest.class.getResourceAsStream( "javaRule.stg" ) ),
                                                                  AngleBracketTemplateLexer.class );
-        StringTemplate accMethod = ruleGroup.getInstanceOf( "accumulateMethod" );
+        final StringTemplate accMethod = ruleGroup.getInstanceOf( "accumulateMethod" );
 
         final String[] declarationTypes = new String[]{"String", "int"};
         final Declaration[] declarations = new Declaration[]{new Declaration( "name",
                                                                               null,
-                                                                              null ), 
-                                                             new Declaration( "age",
-                                                                              null,
-                                                                              null )};
+                                                                              null ), new Declaration( "age",
+                                                                                                       null,
+                                                                                                       null )};
         final Declaration[] inner = new Declaration[]{new Declaration( "cheese",
-                                                                              new ColumnExtractor(new ClassObjectType(Cheese.class)),
-                                                                              null ), 
-                                                      new Declaration( "price",
-                                                                              new ClassFieldExtractor(Cheese.class, "price"),
-                                                                              null )};
+                                                                       new ColumnExtractor( new ClassObjectType( Cheese.class ) ),
+                                                                       null ), new Declaration( "price",
+                                                                                                new ClassFieldExtractor( Cheese.class,
+                                                                                                                         "price" ),
+                                                                                                null )};
         final String[] globals = new String[]{"aGlobal", "anotherGlobal"};
         final List globalTypes = Arrays.asList( new String[]{"String", "String"} );
 
@@ -75,15 +73,17 @@
     }
 
     public void testInvokerGeneration() {
-        StringTemplateGroup ruleGroup = new StringTemplateGroup( new InputStreamReader( AccumulateTemplateTest.class.getResourceAsStream( "javaInvokers.stg" ) ),
+        final StringTemplateGroup ruleGroup = new StringTemplateGroup( new InputStreamReader( AccumulateTemplateTest.class.getResourceAsStream( "javaInvokers.stg" ) ),
                                                                  AngleBracketTemplateLexer.class );
-        StringTemplate accMethod = ruleGroup.getInstanceOf( "accumulateInvoker" );
+        final StringTemplate accMethod = ruleGroup.getInstanceOf( "accumulateInvoker" );
 
         final String[] declarationTypes = new String[]{"String", "int"};
         final Declaration[] declarations = new Declaration[]{new Declaration( "name",
-                                                                              new ClassFieldExtractor(Person.class, "name"),
+                                                                              new ClassFieldExtractor( Person.class,
+                                                                                                       "name" ),
                                                                               null ), new Declaration( "age",
-                                                                                                       new ClassFieldExtractor(Person.class, "age"),
+                                                                                                       new ClassFieldExtractor( Person.class,
+                                                                                                                                "age" ),
                                                                                                        null )};
         final String[] globals = new String[]{"aGlobal", "anotherGlobal"};
         final List globalTypes = Arrays.asList( new String[]{"String", "String"} );
@@ -105,7 +105,7 @@
         accMethod.setAttribute( "methodName",
                                 "accumulateTestMethod" );
         accMethod.setAttribute( "hashCode",
-                                new Integer(13) );
+                                new Integer( 13 ) );
 
         System.out.println( accMethod.toString() );
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -37,7 +37,6 @@
 import org.drools.rule.Package;
 import org.drools.rule.Rule;
 import org.drools.rule.builder.RuleBuilder;
-import org.drools.spi.FunctionResolver;
 
 /**
  * @author etirelli
@@ -71,13 +70,13 @@
             Assert.assertFalse( parser.getErrors().toString(),
                                 parser.hasErrors() );
 
-            Package pkg = new Package( "org.drools" );
+            final Package pkg = new Package( "org.drools" );
 
-            RuleDescr ruleDescr = (RuleDescr) pkgDescr.getRules().get( 0 );
+            final RuleDescr ruleDescr = (RuleDescr) pkgDescr.getRules().get( 0 );
             final String ruleClassName = "RuleClassName.java";
             ruleDescr.setClassName( ruleClassName );
 
-            TypeResolver typeResolver = new ClassTypeResolver( new ArrayList(),
+            final TypeResolver typeResolver = new ClassTypeResolver( new ArrayList(),
                                                                this.getClass().getClassLoader() );
             // make an automatic import for the current package
             typeResolver.addImport( pkgDescr.getName() + ".*" );
@@ -85,7 +84,8 @@
 
             final RuleBuilder builder = new RuleBuilder( typeResolver,
                                                          new ClassFieldExtractorCache(),
-                                                         new JavaDialect(null, new PackageBuilderConfiguration() ) );
+                                                         new JavaDialect( null,
+                                                                          new PackageBuilderConfiguration() ) );
 
             builder.build( pkg,
                            ruleDescr );
@@ -94,69 +94,86 @@
                                builder.getErrors().isEmpty() );
 
             final Rule rule = builder.getRule();
-            
-            assertEquals( "There should be 2 rule level declarations", 2, rule.getDeclarations().length );
-            
+
+            assertEquals( "There should be 2 rule level declarations",
+                          2,
+                          rule.getDeclarations().length );
+
             // second GE should be a not
-            GroupElement not = (GroupElement) rule.getLhs().getChildren().get( 1 );
+            final GroupElement not = (GroupElement) rule.getLhs().getChildren().get( 1 );
             assertTrue( not.isNot() );
             // not has no outer declarations
             assertTrue( not.getOuterDeclarations().isEmpty() );
-            assertEquals( 1, not.getInnerDeclarations().size() );
+            assertEquals( 1,
+                          not.getInnerDeclarations().size() );
             assertTrue( not.getInnerDeclarations().keySet().contains( "$state" ) );
-            
+
             // second not
-            GroupElement not2 = (GroupElement) ((GroupElement) not.getChildren().get( 0 )).getChildren().get( 1 );
+            final GroupElement not2 = (GroupElement) ((GroupElement) not.getChildren().get( 0 )).getChildren().get( 1 );
             assertTrue( not2.isNot() );
             // not has no outer declarations
             assertTrue( not2.getOuterDeclarations().isEmpty() );
-            assertEquals( 1, not2.getInnerDeclarations().size() );
+            assertEquals( 1,
+                          not2.getInnerDeclarations().size() );
             assertTrue( not2.getInnerDeclarations().keySet().contains( "$likes" ) );
-            
-        } catch ( Exception e ) {
+
+        } catch ( final Exception e ) {
             e.printStackTrace();
             fail( "This test is not supposed to throw any exception: " + e.getMessage() );
         }
 
     }
-    
+
     public void testBuildAttributes() throws Exception {
-        RuleBuilder builder = new RuleBuilder(null,  null, new JavaDialect(null, new PackageBuilderConfiguration()) );
-        Rule rule = new Rule("myrule");
+        final RuleBuilder builder = new RuleBuilder( null,
+                                               null,
+                                               new JavaDialect( null,
+                                                                new PackageBuilderConfiguration() ) );
+        Rule rule = new Rule( "myrule" );
         List attributes = new ArrayList();
-        
-        attributes.add( new AttributeDescr("no-loop", "true") );
-        attributes.add( new AttributeDescr("enabled", "false") );
-        attributes.add( new AttributeDescr("ruleflow-group", "mygroup") );
-        builder.setAttributes( rule, attributes );
-        
-        assertTrue(rule.getNoLoop());
-        assertFalse(rule.isEffective());
-        assertEquals("mygroup", rule.getRuleFlowGroup() );
-        
+
+        attributes.add( new AttributeDescr( "no-loop",
+                                            "true" ) );
+        attributes.add( new AttributeDescr( "enabled",
+                                            "false" ) );
+        attributes.add( new AttributeDescr( "ruleflow-group",
+                                            "mygroup" ) );
+        builder.setAttributes( rule,
+                               attributes );
+
+        assertTrue( rule.getNoLoop() );
+        assertFalse( rule.isEffective() );
+        assertEquals( "mygroup",
+                      rule.getRuleFlowGroup() );
+
         attributes = new ArrayList();
-        attributes.add(new AttributeDescr("date-effective", "10-Jul-1974"));
-        attributes.add(new AttributeDescr("date-expires", "10-Jul-2040") );
-        
-        rule = new Rule("myrule");
-        
-        builder.setAttributes( rule, attributes );
-        
-        Field eff = rule.getClass().getDeclaredField( "dateEffective" );
-        eff.setAccessible( true );       
-        Calendar effectiveDate = (Calendar) eff.get( rule );
-        assertNotNull(effectiveDate);
-        
-        assertEquals(1974, effectiveDate.get( Calendar.YEAR ));
-        
-        Field exp = rule.getClass().getDeclaredField( "dateExpires" );
+        attributes.add( new AttributeDescr( "date-effective",
+                                            "10-Jul-1974" ) );
+        attributes.add( new AttributeDescr( "date-expires",
+                                            "10-Jul-2040" ) );
+
+        rule = new Rule( "myrule" );
+
+        builder.setAttributes( rule,
+                               attributes );
+
+        final Field eff = rule.getClass().getDeclaredField( "dateEffective" );
+        eff.setAccessible( true );
+        final Calendar effectiveDate = (Calendar) eff.get( rule );
+        assertNotNull( effectiveDate );
+
+        assertEquals( 1974,
+                      effectiveDate.get( Calendar.YEAR ) );
+
+        final Field exp = rule.getClass().getDeclaredField( "dateExpires" );
         exp.setAccessible( true );
-        Calendar expiryDate = (Calendar) exp.get( rule );
-        
-        assertEquals(2040, expiryDate.get(Calendar.YEAR));
-        
-        assertNotNull(expiryDate);
-        
+        final Calendar expiryDate = (Calendar) exp.get( rule );
+
+        assertEquals( 2040,
+                      expiryDate.get( Calendar.YEAR ) );
+
+        assertNotNull( expiryDate );
+
     }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -9,24 +9,18 @@
 import org.drools.RuleBase;
 import org.drools.RuleBaseFactory;
 import org.drools.WorkingMemory;
-import org.drools.base.ClassFieldExtractor;
 import org.drools.base.ClassObjectType;
 import org.drools.base.DefaultKnowledgeHelper;
 import org.drools.common.AgendaItem;
 import org.drools.common.InternalFactHandle;
-import org.drools.lang.descr.EvalDescr;
 import org.drools.lang.descr.RuleDescr;
 import org.drools.reteoo.ReteTuple;
 import org.drools.rule.Column;
 import org.drools.rule.Declaration;
-import org.drools.rule.EvalCondition;
 import org.drools.rule.Package;
-import org.drools.rule.Rule;
 import org.drools.rule.builder.BuildContext;
-import org.drools.rule.builder.dialect.mvel.MVELEvalBuilder;
 import org.drools.spi.ColumnExtractor;
 import org.drools.spi.DeclarationScopeResolver;
-import org.drools.spi.FieldExtractor;
 import org.drools.spi.ObjectType;
 
 public class MVELConsequenceBuilderTest extends TestCase {
@@ -35,49 +29,56 @@
     }
 
     public void testSimpleExpression() throws Exception {
-        Package pkg = new Package( "pkg1" );
-        RuleDescr ruleDescr = new RuleDescr( "rule 1" );
+        final Package pkg = new Package( "pkg1" );
+        final RuleDescr ruleDescr = new RuleDescr( "rule 1" );
         ruleDescr.setConsequence( "cheese.setPrice( 5 );" );
 
-        InstrumentedBuildContent context = new InstrumentedBuildContent( pkg,
+        final InstrumentedBuildContent context = new InstrumentedBuildContent( pkg,
                                                                          ruleDescr );
-        
-        InstrumentedDeclarationScopeResolver declarationResolver = new InstrumentedDeclarationScopeResolver();
-        
-        ObjectType cheeseObjeectType = new ClassObjectType( Cheese.class );
-        
-        Column column = new Column( 0,
+
+        final InstrumentedDeclarationScopeResolver declarationResolver = new InstrumentedDeclarationScopeResolver();
+
+        final ObjectType cheeseObjeectType = new ClassObjectType( Cheese.class );
+
+        final Column column = new Column( 0,
                                     cheeseObjeectType );
-        
-        ColumnExtractor extractor = new ColumnExtractor( cheeseObjeectType );
-        
-        Declaration declaration = new Declaration( "cheese",
+
+        final ColumnExtractor extractor = new ColumnExtractor( cheeseObjeectType );
+
+        final Declaration declaration = new Declaration( "cheese",
                                                    extractor,
                                                    column );
-        Map map = new HashMap();
+        final Map map = new HashMap();
         map.put( "cheese",
                  declaration );
         declarationResolver.setDeclarations( map );
         context.setDeclarationResolver( declarationResolver );
 
-        MVELConsequenceBuilder builder = new MVELConsequenceBuilder();
+        final MVELConsequenceBuilder builder = new MVELConsequenceBuilder();
         builder.build( context,
                        null,
                        ruleDescr );
 
-        RuleBase ruleBase = RuleBaseFactory.newRuleBase();
-        WorkingMemory wm = ruleBase.newWorkingMemory();
+        final RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+        final WorkingMemory wm = ruleBase.newWorkingMemory();
 
-        Cheese cheddar = new Cheese( "cheddar",
+        final Cheese cheddar = new Cheese( "cheddar",
                                      10 );
-        InternalFactHandle f0 = (InternalFactHandle) wm.assertObject( cheddar );
-        ReteTuple tuple = new ReteTuple( f0 );
+        final InternalFactHandle f0 = (InternalFactHandle) wm.assertObject( cheddar );
+        final ReteTuple tuple = new ReteTuple( f0 );
 
-        AgendaItem item = new AgendaItem(0, tuple, null, context.getRule(), null);
-        DefaultKnowledgeHelper kbHelper = new DefaultKnowledgeHelper(item, wm);
-        context.getRule().getConsequence().evaluate( kbHelper, wm );
-        
-        assertEquals( 5, cheddar.getPrice() );
+        final AgendaItem item = new AgendaItem( 0,
+                                          tuple,
+                                          null,
+                                          context.getRule(),
+                                          null );
+        final DefaultKnowledgeHelper kbHelper = new DefaultKnowledgeHelper( item,
+                                                                      wm );
+        context.getRule().getConsequence().evaluate( kbHelper,
+                                                     wm );
+
+        assertEquals( 5,
+                      cheddar.getPrice() );
     }
 
     public static class InstrumentedDeclarationScopeResolver extends DeclarationScopeResolver {
@@ -87,7 +88,7 @@
             super( null );
         }
 
-        public void setDeclarations(Map map) {
+        public void setDeclarations(final Map map) {
             this.declarations = map;
         }
 
@@ -99,13 +100,13 @@
     public static class InstrumentedBuildContent extends BuildContext {
         private DeclarationScopeResolver declarationScopeResolver;
 
-        public InstrumentedBuildContent(Package pkg,
-                                        RuleDescr ruleDescr) {
+        public InstrumentedBuildContent(final Package pkg,
+                                        final RuleDescr ruleDescr) {
             super( pkg,
                    ruleDescr );
         }
 
-        public void setDeclarationResolver(DeclarationScopeResolver declarationScopeResolver) {
+        public void setDeclarationResolver(final DeclarationScopeResolver declarationScopeResolver) {
             this.declarationScopeResolver = declarationScopeResolver;
         }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -26,50 +26,54 @@
 
 public class MVELEvalBuilderTest extends TestCase {
 
-    public void setUp() {     
+    public void setUp() {
     }
 
     public void testSimpleExpression() {
-        Package pkg = new Package( "pkg1" );
-        RuleDescr ruleDescr = new RuleDescr( "rule 1" );
+        final Package pkg = new Package( "pkg1" );
+        final RuleDescr ruleDescr = new RuleDescr( "rule 1" );
 
-        InstrumentedBuildContent context = new InstrumentedBuildContent( pkg,
+        final InstrumentedBuildContent context = new InstrumentedBuildContent( pkg,
                                                                          ruleDescr );
-        InstrumentedDeclarationScopeResolver declarationResolver = new InstrumentedDeclarationScopeResolver();
+        final InstrumentedDeclarationScopeResolver declarationResolver = new InstrumentedDeclarationScopeResolver();
         final FieldExtractor extractor = new ClassFieldExtractor( Cheese.class,
                                                                   "price" );
-        Column column = new Column( 0,
+        final Column column = new Column( 0,
                                     new ClassObjectType( int.class ) );
-        Declaration declaration = new Declaration( "a",
+        final Declaration declaration = new Declaration( "a",
                                                    extractor,
                                                    column );
-        Map map = new HashMap();
+        final Map map = new HashMap();
         map.put( "a",
                  declaration );
         declarationResolver.setDeclarations( map );
         context.setDeclarationResolver( declarationResolver );
 
-        EvalDescr evalDescr = new EvalDescr();
+        final EvalDescr evalDescr = new EvalDescr();
         evalDescr.setContent( "a == 10" );
 
-        MVELEvalBuilder builder = new MVELEvalBuilder();
-        EvalCondition eval = ( EvalCondition ) builder.build( context,
-                                                    null,
-                                                    null,
-                                                    evalDescr );
-        
-        RuleBase ruleBase = RuleBaseFactory.newRuleBase();
-        WorkingMemory wm = ruleBase.newWorkingMemory();
-        
-        Cheese cheddar = new Cheese("cheddar", 10);
-        InternalFactHandle f0 = ( InternalFactHandle ) wm.assertObject( cheddar );
-        ReteTuple tuple = new ReteTuple( f0 );      
-        
-        assertTrue( eval.isAllowed( tuple, wm ) );
-        
+        final MVELEvalBuilder builder = new MVELEvalBuilder();
+        final EvalCondition eval = (EvalCondition) builder.build( context,
+                                                            null,
+                                                            null,
+                                                            evalDescr );
+
+        final RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+        final WorkingMemory wm = ruleBase.newWorkingMemory();
+
+        final Cheese cheddar = new Cheese( "cheddar",
+                                     10 );
+        final InternalFactHandle f0 = (InternalFactHandle) wm.assertObject( cheddar );
+        final ReteTuple tuple = new ReteTuple( f0 );
+
+        assertTrue( eval.isAllowed( tuple,
+                                    wm ) );
+
         cheddar.setPrice( 9 );
-        wm.modifyObject( f0, cheddar );
-        assertFalse( eval.isAllowed( tuple, wm ) );
+        wm.modifyObject( f0,
+                         cheddar );
+        assertFalse( eval.isAllowed( tuple,
+                                     wm ) );
     }
 
     public static class InstrumentedDeclarationScopeResolver extends DeclarationScopeResolver {
@@ -79,7 +83,7 @@
             super( null );
         }
 
-        public void setDeclarations(Map map) {
+        public void setDeclarations(final Map map) {
             this.declarations = map;
         }
 
@@ -91,13 +95,13 @@
     public static class InstrumentedBuildContent extends BuildContext {
         private DeclarationScopeResolver declarationScopeResolver;
 
-        public InstrumentedBuildContent(Package pkg,
-                                        RuleDescr ruleDescr) {
+        public InstrumentedBuildContent(final Package pkg,
+                                        final RuleDescr ruleDescr) {
             super( pkg,
                    ruleDescr );
         }
 
-        public void setDeclarationResolver(DeclarationScopeResolver declarationScopeResolver) {
+        public void setDeclarationResolver(final DeclarationScopeResolver declarationScopeResolver) {
             this.declarationScopeResolver = declarationScopeResolver;
         }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -10,18 +10,15 @@
 import org.drools.Cheese;
 import org.drools.RuleBase;
 import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
 import org.drools.base.ClassFieldExtractor;
 import org.drools.base.ClassObjectType;
 import org.drools.common.InternalFactHandle;
 import org.drools.common.InternalWorkingMemory;
-import org.drools.lang.descr.EvalDescr;
 import org.drools.lang.descr.PredicateDescr;
 import org.drools.lang.descr.RuleDescr;
 import org.drools.reteoo.ReteTuple;
 import org.drools.rule.Column;
 import org.drools.rule.Declaration;
-import org.drools.rule.EvalCondition;
 import org.drools.rule.Package;
 import org.drools.rule.PredicateConstraint;
 import org.drools.rule.PredicateConstraint.PredicateContextEntry;
@@ -29,9 +26,7 @@
 import org.drools.rule.builder.dialect.java.BuildUtils;
 import org.drools.rule.builder.dialect.java.DeclarationTypeFixer;
 import org.drools.rule.builder.dialect.java.JavaExprAnalyzer;
-import org.drools.rule.builder.dialect.java.JavaPredicateBuilder;
 import org.drools.rule.builder.dialect.java.KnowledgeHelperFixer;
-import org.drools.rule.builder.dialect.mvel.MVELEvalBuilder;
 import org.drools.spi.DeclarationScopeResolver;
 import org.drools.spi.FieldExtractor;
 
@@ -41,28 +36,28 @@
     }
 
     public void testSimpleExpression() {
-        Package pkg = new Package( "pkg1" );
-        RuleDescr ruleDescr = new RuleDescr( "rule 1" );
+        final Package pkg = new Package( "pkg1" );
+        final RuleDescr ruleDescr = new RuleDescr( "rule 1" );
 
-        InstrumentedBuildContent context = new InstrumentedBuildContent( pkg,
+        final InstrumentedBuildContent context = new InstrumentedBuildContent( pkg,
                                                                          ruleDescr );
-        InstrumentedDeclarationScopeResolver declarationResolver = new InstrumentedDeclarationScopeResolver();
+        final InstrumentedDeclarationScopeResolver declarationResolver = new InstrumentedDeclarationScopeResolver();
         final FieldExtractor extractor = new ClassFieldExtractor( Cheese.class,
                                                                   "price" );
-        Column columnA = new Column( 0,
+        final Column columnA = new Column( 0,
                                      new ClassObjectType( int.class ) );
 
-        Column columnB = new Column( 1,
+        final Column columnB = new Column( 1,
                                      new ClassObjectType( int.class ) );
 
-        Declaration a = new Declaration( "a",
+        final Declaration a = new Declaration( "a",
                                          extractor,
                                          columnA );
-        Declaration b = new Declaration( "b",
+        final Declaration b = new Declaration( "b",
                                          extractor,
                                          columnB );
 
-        Map map = new HashMap();
+        final Map map = new HashMap();
         map.put( "a",
                  a );
         map.put( "b",
@@ -70,22 +65,22 @@
         declarationResolver.setDeclarations( map );
         context.setDeclarationResolver( declarationResolver );
 
-        PredicateDescr predicateDescr = new PredicateDescr();
+        final PredicateDescr predicateDescr = new PredicateDescr();
         predicateDescr.setContent( "a == b" );
 
-        MVELPredicateBuilder builder = new MVELPredicateBuilder();
+        final MVELPredicateBuilder builder = new MVELPredicateBuilder();
 
-        List[] usedIdentifiers = new ArrayList[2];
-        List list = new ArrayList();
+        final List[] usedIdentifiers = new ArrayList[2];
+        final List list = new ArrayList();
         usedIdentifiers[1] = list;
 
-        Declaration[] previousDeclarations = new Declaration[]{a};
-        Declaration[] localDeclarations = new Declaration[]{b};
+        final Declaration[] previousDeclarations = new Declaration[]{a};
+        final Declaration[] localDeclarations = new Declaration[]{b};
 
         final PredicateConstraint predicate = new PredicateConstraint( null,
                                                                        localDeclarations );
 
-        BuildUtils utils = new BuildUtils( new KnowledgeHelperFixer(),
+        final BuildUtils utils = new BuildUtils( new KnowledgeHelperFixer(),
                                            new DeclarationTypeFixer(),
                                            new JavaExprAnalyzer(),
                                            null,
@@ -100,18 +95,18 @@
                        predicate,
                        predicateDescr );
 
-        RuleBase ruleBase = RuleBaseFactory.newRuleBase();
-        InternalWorkingMemory wm = (InternalWorkingMemory) ruleBase.newWorkingMemory();
+        final RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+        final InternalWorkingMemory wm = (InternalWorkingMemory) ruleBase.newWorkingMemory();
 
-        Cheese stilton = new Cheese( "stilton",
+        final Cheese stilton = new Cheese( "stilton",
                                      10 );
 
-        Cheese cheddar = new Cheese( "cheddar",
+        final Cheese cheddar = new Cheese( "cheddar",
                                      10 );
-        InternalFactHandle f0 = (InternalFactHandle) wm.assertObject( cheddar );
-        ReteTuple tuple = new ReteTuple( f0 );
+        final InternalFactHandle f0 = (InternalFactHandle) wm.assertObject( cheddar );
+        final ReteTuple tuple = new ReteTuple( f0 );
 
-        PredicateContextEntry predicateContext = new PredicateContextEntry();
+        final PredicateContextEntry predicateContext = new PredicateContextEntry();
         predicateContext.leftTuple = tuple;
 
         assertTrue( predicate.isAllowedCachedLeft( predicateContext,
@@ -132,7 +127,7 @@
             super( null );
         }
 
-        public void setDeclarations(Map map) {
+        public void setDeclarations(final Map map) {
             this.declarations = map;
         }
 
@@ -144,13 +139,13 @@
     public static class InstrumentedBuildContent extends BuildContext {
         private DeclarationScopeResolver declarationScopeResolver;
 
-        public InstrumentedBuildContent(Package pkg,
-                                        RuleDescr ruleDescr) {
+        public InstrumentedBuildContent(final Package pkg,
+                                        final RuleDescr ruleDescr) {
             super( pkg,
                    ruleDescr );
         }
 
-        public void setDeclarationResolver(DeclarationScopeResolver declarationScopeResolver) {
+        public void setDeclarationResolver(final DeclarationScopeResolver declarationScopeResolver) {
             this.declarationScopeResolver = declarationScopeResolver;
         }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -10,32 +10,25 @@
 import org.drools.Cheese;
 import org.drools.RuleBase;
 import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
 import org.drools.base.ClassFieldExtractor;
 import org.drools.base.ClassObjectType;
 import org.drools.base.ValueType;
 import org.drools.base.evaluators.Operator;
 import org.drools.common.InternalFactHandle;
 import org.drools.common.InternalWorkingMemory;
-import org.drools.lang.descr.EvalDescr;
 import org.drools.lang.descr.ReturnValueRestrictionDescr;
 import org.drools.lang.descr.RuleDescr;
 import org.drools.reteoo.ReteTuple;
 import org.drools.rule.Column;
 import org.drools.rule.Declaration;
-import org.drools.rule.EvalCondition;
 import org.drools.rule.Package;
-import org.drools.rule.PredicateConstraint;
-import org.drools.rule.ReturnValueConstraint;
 import org.drools.rule.ReturnValueRestriction;
 import org.drools.rule.PredicateConstraint.PredicateContextEntry;
 import org.drools.rule.builder.BuildContext;
 import org.drools.rule.builder.dialect.java.BuildUtils;
 import org.drools.rule.builder.dialect.java.DeclarationTypeFixer;
 import org.drools.rule.builder.dialect.java.JavaExprAnalyzer;
-import org.drools.rule.builder.dialect.java.JavaPredicateBuilder;
 import org.drools.rule.builder.dialect.java.KnowledgeHelperFixer;
-import org.drools.rule.builder.dialect.mvel.MVELEvalBuilder;
 import org.drools.spi.DeclarationScopeResolver;
 import org.drools.spi.FieldExtractor;
 
@@ -45,28 +38,28 @@
     }
 
     public void testSimpleExpression() {
-        Package pkg = new Package( "pkg1" );
-        RuleDescr ruleDescr = new RuleDescr( "rule 1" );
+        final Package pkg = new Package( "pkg1" );
+        final RuleDescr ruleDescr = new RuleDescr( "rule 1" );
 
-        InstrumentedBuildContent context = new InstrumentedBuildContent( pkg,
+        final InstrumentedBuildContent context = new InstrumentedBuildContent( pkg,
                                                                          ruleDescr );
-        InstrumentedDeclarationScopeResolver declarationResolver = new InstrumentedDeclarationScopeResolver();
+        final InstrumentedDeclarationScopeResolver declarationResolver = new InstrumentedDeclarationScopeResolver();
         final FieldExtractor extractor = new ClassFieldExtractor( Cheese.class,
                                                                   "price" );
-        Column columnA = new Column( 0,
+        final Column columnA = new Column( 0,
                                      new ClassObjectType( int.class ) );
 
-        Column columnB = new Column( 1,
+        final Column columnB = new Column( 1,
                                      new ClassObjectType( int.class ) );
 
-        Declaration a = new Declaration( "a",
+        final Declaration a = new Declaration( "a",
                                          extractor,
                                          columnA );
-        Declaration b = new Declaration( "b",
+        final Declaration b = new Declaration( "b",
                                          extractor,
                                          columnB );
 
-        Map map = new HashMap();
+        final Map map = new HashMap();
         map.put( "a",
                  a );
         map.put( "b",
@@ -74,24 +67,24 @@
         declarationResolver.setDeclarations( map );
         context.setDeclarationResolver( declarationResolver );
 
-        ReturnValueRestrictionDescr returnValueDescr = new ReturnValueRestrictionDescr("=");
+        final ReturnValueRestrictionDescr returnValueDescr = new ReturnValueRestrictionDescr( "=" );
         returnValueDescr.setContent( "a + b" );
 
-        MVELReturnValueBuilder builder = new MVELReturnValueBuilder();
+        final MVELReturnValueBuilder builder = new MVELReturnValueBuilder();
 
-        List[] usedIdentifiers = new ArrayList[2];
-        List list = new ArrayList();
+        final List[] usedIdentifiers = new ArrayList[2];
+        final List list = new ArrayList();
         usedIdentifiers[1] = list;
 
-        Declaration[] previousDeclarations = new Declaration[]{a, b};
-        Declaration[] localDeclarations = new Declaration[]{};
-        
-        final ReturnValueRestriction returnValue = new ReturnValueRestriction(extractor,
-                                                                              previousDeclarations,
-                                                                              localDeclarations,
-                                                                              ValueType.PINTEGER_TYPE.getEvaluator( Operator.EQUAL ) );
+        final Declaration[] previousDeclarations = new Declaration[]{a, b};
+        final Declaration[] localDeclarations = new Declaration[]{};
 
-        BuildUtils utils = new BuildUtils( new KnowledgeHelperFixer(),
+        final ReturnValueRestriction returnValue = new ReturnValueRestriction( extractor,
+                                                                               previousDeclarations,
+                                                                               localDeclarations,
+                                                                               ValueType.PINTEGER_TYPE.getEvaluator( Operator.EQUAL ) );
+
+        final BuildUtils utils = new BuildUtils( new KnowledgeHelperFixer(),
                                            new DeclarationTypeFixer(),
                                            new JavaExprAnalyzer(),
                                            null,
@@ -106,29 +99,36 @@
                        returnValue,
                        returnValueDescr );
 
-        RuleBase ruleBase = RuleBaseFactory.newRuleBase();
-        InternalWorkingMemory wm = (InternalWorkingMemory) ruleBase.newWorkingMemory();
+        final RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+        final InternalWorkingMemory wm = (InternalWorkingMemory) ruleBase.newWorkingMemory();
 
-        Cheese stilton = new Cheese( "stilton",
+        final Cheese stilton = new Cheese( "stilton",
                                      10 );
 
-        Cheese cheddar = new Cheese( "cheddar",
+        final Cheese cheddar = new Cheese( "cheddar",
                                      10 );
-        InternalFactHandle f0 = (InternalFactHandle) wm.assertObject( cheddar );
+        final InternalFactHandle f0 = (InternalFactHandle) wm.assertObject( cheddar );
         ReteTuple tuple = new ReteTuple( f0 );
-        
-        InternalFactHandle f1 = (InternalFactHandle) wm.assertObject( stilton );
-        tuple = new ReteTuple( tuple, f1 );        
 
-        PredicateContextEntry predicateContext = new PredicateContextEntry();
+        final InternalFactHandle f1 = (InternalFactHandle) wm.assertObject( stilton );
+        tuple = new ReteTuple( tuple,
+                               f1 );
+
+        final PredicateContextEntry predicateContext = new PredicateContextEntry();
         predicateContext.leftTuple = tuple;
 
-        Cheese brie = new Cheese( "brie",
-                                     20 );
-        assertTrue( returnValue.isAllowed( extractor, brie, tuple, wm ) );
-        
+        final Cheese brie = new Cheese( "brie",
+                                  20 );
+        assertTrue( returnValue.isAllowed( extractor,
+                                           brie,
+                                           tuple,
+                                           wm ) );
+
         brie.setPrice( 18 );
-        assertFalse( returnValue.isAllowed( extractor, brie, tuple, wm ) );
+        assertFalse( returnValue.isAllowed( extractor,
+                                            brie,
+                                            tuple,
+                                            wm ) );
     }
 
     public static class InstrumentedDeclarationScopeResolver extends DeclarationScopeResolver {
@@ -138,7 +138,7 @@
             super( null );
         }
 
-        public void setDeclarations(Map map) {
+        public void setDeclarations(final Map map) {
             this.declarations = map;
         }
 
@@ -150,13 +150,13 @@
     public static class InstrumentedBuildContent extends BuildContext {
         private DeclarationScopeResolver declarationScopeResolver;
 
-        public InstrumentedBuildContent(Package pkg,
-                                        RuleDescr ruleDescr) {
+        public InstrumentedBuildContent(final Package pkg,
+                                        final RuleDescr ruleDescr) {
             super( pkg,
                    ruleDescr );
         }
 
-        public void setDeclarationResolver(DeclarationScopeResolver declarationScopeResolver) {
+        public void setDeclarationResolver(final DeclarationScopeResolver declarationScopeResolver) {
             this.declarationScopeResolver = declarationScopeResolver;
         }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/DumperTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/DumperTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/DumperTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -61,7 +61,7 @@
         final DrlDumper dumper = new DrlDumper();
         final String result = dumper.dump( pkgOriginal );
         assertNotNull( result );
-        
+
         parser = new DrlParser();
         final PackageDescr pkgDumped = parser.parse( new StringReader( result ) );
 
@@ -86,8 +86,8 @@
                       ruleDumped.getConsequence() );
 
         // Now double check the contents are the same
-        BufferedReader reader = new BufferedReader( new InputStreamReader( getClass().getResourceAsStream( "test_Dump.drl" ) ) );
-        StringBuffer buffer = new StringBuffer();
+        final BufferedReader reader = new BufferedReader( new InputStreamReader( getClass().getResourceAsStream( "test_Dump.drl" ) ) );
+        final StringBuffer buffer = new StringBuffer();
         String s = null;
         while ( (s = reader.readLine()) != null ) {
             buffer.append( s );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/XmlPackageReaderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/XmlPackageReaderTest.java	2007-04-12 23:10:10 UTC (rev 10952)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/XmlPackageReaderTest.java	2007-04-12 23:13:13 UTC (rev 10953)
@@ -71,8 +71,8 @@
         final List globals = packageDescr.getGlobals();
         assertEquals( 2,
                       globals.size() );
-        GlobalDescr x = (GlobalDescr) globals.get( 0 );
-        GlobalDescr yada = (GlobalDescr) globals.get( 1 );
+        final GlobalDescr x = (GlobalDescr) globals.get( 0 );
+        final GlobalDescr yada = (GlobalDescr) globals.get( 1 );
         assertEquals( "com.sample.X",
                       x.getType() );
         assertEquals( "x",
@@ -102,8 +102,8 @@
         final List globals = packageDescr.getGlobals();
         assertEquals( 2,
                       globals.size() );
-        GlobalDescr x = (GlobalDescr) globals.get( 0 );
-        GlobalDescr yada = (GlobalDescr) globals.get( 1 );
+        final GlobalDescr x = (GlobalDescr) globals.get( 0 );
+        final GlobalDescr yada = (GlobalDescr) globals.get( 1 );
         assertEquals( "com.sample.X",
                       x.getType() );
         assertEquals( "x",
@@ -149,8 +149,8 @@
         final List globals = packageDescr.getGlobals();
         assertEquals( 2,
                       globals.size() );
-        GlobalDescr x = (GlobalDescr) globals.get( 0 );
-        GlobalDescr yada = (GlobalDescr) globals.get( 1 );
+        final GlobalDescr x = (GlobalDescr) globals.get( 0 );
+        final GlobalDescr yada = (GlobalDescr) globals.get( 1 );
         assertEquals( "com.sample.X",
                       x.getType() );
         assertEquals( "x",
@@ -219,8 +219,8 @@
         final List globals = packageDescr.getGlobals();
         assertEquals( 2,
                       globals.size() );
-        GlobalDescr x = (GlobalDescr) globals.get( 0 );
-        GlobalDescr yada = (GlobalDescr) globals.get( 1 );
+        final GlobalDescr x = (GlobalDescr) globals.get( 0 );
+        final GlobalDescr yada = (GlobalDescr) globals.get( 1 );
         assertEquals( "com.sample.X",
                       x.getType() );
         assertEquals( "x",
@@ -266,8 +266,8 @@
 
         final ColumnDescr column3 = (ColumnDescr) lhsDescr.getDescrs().get( 4 );
         //final LiteralDescr literalDescr = (LiteralDescr) column3.getDescrs().get( 0 );
-        FieldConstraintDescr fieldConstraintDescr = (FieldConstraintDescr) column3.getDescrs().get( 0 );
-        final LiteralRestrictionDescr literalDescr = (  LiteralRestrictionDescr ) fieldConstraintDescr.getRestrictions().get( 0 );
+        final FieldConstraintDescr fieldConstraintDescr = (FieldConstraintDescr) column3.getDescrs().get( 0 );
+        final LiteralRestrictionDescr literalDescr = (LiteralRestrictionDescr) fieldConstraintDescr.getRestrictions().get( 0 );
         assertEquals( "field1",
                       fieldConstraintDescr.getFieldName() );
         assertEquals( "==",
@@ -275,23 +275,22 @@
         assertEquals( "value1",
                       literalDescr.getText() );
 
-        final ReturnValueRestrictionDescr returnValueDescr = (ReturnValueRestrictionDescr) fieldConstraintDescr.getRestrictions().get( 1 );    
+        final ReturnValueRestrictionDescr returnValueDescr = (ReturnValueRestrictionDescr) fieldConstraintDescr.getRestrictions().get( 1 );
         assertEquals( "==",
                       returnValueDescr.getEvaluator() );
         assertEquals( "1==1",
                       returnValueDescr.getContent() );
-        
-      final VariableRestrictionDescr variableDescr = (VariableRestrictionDescr) fieldConstraintDescr.getRestrictions().get( 2 ); 
-      assertEquals( "==",
-                    variableDescr.getEvaluator() );
-      assertEquals( "var1",
-                    variableDescr.getIdentifier() );        
-        
+
+        final VariableRestrictionDescr variableDescr = (VariableRestrictionDescr) fieldConstraintDescr.getRestrictions().get( 2 );
+        assertEquals( "==",
+                      variableDescr.getEvaluator() );
+        assertEquals( "var1",
+                      variableDescr.getIdentifier() );
+
         final PredicateDescr predicateDescr = (PredicateDescr) column3.getDescrs().get( 1 );
         assertEquals( "1==1",
-                      predicateDescr.getContent() );        
+                      predicateDescr.getContent() );
 
-
         final FieldBindingDescr fieldBindingDescr = (FieldBindingDescr) column3.getDescrs().get( 2 );
         assertEquals( "field1",
                       fieldBindingDescr.getFieldName() );
@@ -358,8 +357,8 @@
         final List globals = packageDescr.getGlobals();
         assertEquals( 2,
                       globals.size() );
-        GlobalDescr x = (GlobalDescr) globals.get( 0 );
-        GlobalDescr yada = (GlobalDescr) globals.get( 1 );
+        final GlobalDescr x = (GlobalDescr) globals.get( 0 );
+        final GlobalDescr yada = (GlobalDescr) globals.get( 1 );
         assertEquals( "com.sample.X",
                       x.getType() );
         assertEquals( "x",
@@ -414,8 +413,8 @@
         final List globals = packageDescr.getGlobals();
         assertEquals( 2,
                       globals.size() );
-        GlobalDescr x = (GlobalDescr) globals.get( 0 );
-        GlobalDescr yada = (GlobalDescr) globals.get( 1 );
+        final GlobalDescr x = (GlobalDescr) globals.get( 0 );
+        final GlobalDescr yada = (GlobalDescr) globals.get( 1 );
         assertEquals( "com.sample.X",
                       x.getType() );
         assertEquals( "x",




More information about the jboss-svn-commits mailing list