From 3dc5ef017311c1aaf27028e0e81db68524c1574c Mon Sep 17 00:00:00 2001 From: jkohnlein Date: Wed, 22 Oct 2008 12:18:19 +0000 Subject: [PATCH] Fixed service registration , and calls to generator facade. Bootstrapped. --- .../org.eclipse.xtext/src/log4j.properties | 2 +- .../org/eclipse/xtext/XtextRuntimeConfig.java | 19 +++++++++++++++++++ .../builtin/XtextBuiltinRuntimeConfig.java | 2 ++ .../xtext/GenerateAllTestGrammars.java | 10 ++++++---- .../xtext/XtextGrammarTestRuntimeConfig.java | 19 +++++++++++++++++++ .../xtext/crossrefs/LangARuntimeConfig.java | 19 +++++++++++++++++++ .../dummy/DummyLanguageRuntimeConfig.java | 19 +++++++++++++++++++ .../AbstractTestLanguageRuntimeConfig.java | 19 +++++++++++++++++++ .../ConcreteTestLanguageRuntimeConfig.java | 19 +++++++++++++++++++ .../tests/MetamodelRefTestRuntimeConfig.java | 19 +++++++++++++++++++ .../ComplexReconstrTestRuntimeConfig.java | 19 +++++++++++++++++++ .../SimpleReconstrTestRuntimeConfig.java | 19 +++++++++++++++++++ .../ActionTestLanguageRuntimeConfig.java | 19 +++++++++++++++++++ .../LexerLanguageRuntimeConfig.java | 19 +++++++++++++++++++ .../LookaheadLanguageRuntimeConfig.java | 19 +++++++++++++++++++ .../OptionalEmptyLanguageRuntimeConfig.java | 19 +++++++++++++++++++ .../ReferenceGrammarRuntimeConfig.java | 19 +++++++++++++++++++ .../SimpleExpressionsRuntimeConfig.java | 19 +++++++++++++++++++ .../TestLanguageRuntimeConfig.java | 19 +++++++++++++++++++ 19 files changed, 313 insertions(+), 5 deletions(-) create mode 100644 plugins/org.eclipse.xtext/src/org/eclipse/xtext/XtextRuntimeConfig.java create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/XtextGrammarTestRuntimeConfig.java create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/crossrefs/LangARuntimeConfig.java create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/dummy/DummyLanguageRuntimeConfig.java create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageRuntimeConfig.java create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageRuntimeConfig.java create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestRuntimeConfig.java create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestRuntimeConfig.java create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestRuntimeConfig.java create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguageRuntimeConfig.java create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/LexerLanguageRuntimeConfig.java create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/LookaheadLanguageRuntimeConfig.java create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyLanguageRuntimeConfig.java create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarRuntimeConfig.java create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsRuntimeConfig.java create mode 100644 tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/TestLanguageRuntimeConfig.java diff --git a/plugins/org.eclipse.xtext/src/log4j.properties b/plugins/org.eclipse.xtext/src/log4j.properties index 54d0831c9..e0df6c1ed 100644 --- a/plugins/org.eclipse.xtext/src/log4j.properties +++ b/plugins/org.eclipse.xtext/src/log4j.properties @@ -4,4 +4,4 @@ log4j.appender.default=org.apache.log4j.ConsoleAppender log4j.appender.default.layout=org.apache.log4j.PatternLayout log4j.appender.default.layout.ConversionPattern=%-4r [%t] %-5p %35.35c %x - %m%n -log4j.logger.org.eclipse.xtext=DEBUG \ No newline at end of file +log4j.logger.org.eclipse.xtext=INFO \ No newline at end of file diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/XtextRuntimeConfig.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/XtextRuntimeConfig.java new file mode 100644 index 000000000..dcc9df901 --- /dev/null +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/XtextRuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class XtextRuntimeConfig extends AbstractXtextRuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} + diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/builtin/XtextBuiltinRuntimeConfig.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/builtin/XtextBuiltinRuntimeConfig.java index 44f0eb24c..fc5b29049 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/builtin/XtextBuiltinRuntimeConfig.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/builtin/XtextBuiltinRuntimeConfig.java @@ -22,6 +22,7 @@ import org.eclipse.xtext.crossref.impl.XtextBuiltinFragmentProvider; import org.eclipse.xtext.crossref.impl.XtextBuiltinLinkProvider; import org.eclipse.xtext.crossref.internal.Linker; import org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider; +import org.eclipse.xtext.parsetree.reconstr.impl.DefaultCrossReferenceSerializer; import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; /** @@ -41,6 +42,7 @@ public class XtextBuiltinRuntimeConfig extends AbstractServiceRegistrationFactor .with(IURIChecker.class, DefaultRuntimeURIChecker.class) .with(IFragmentProvider.class, XtextBuiltinFragmentProvider.class) .with(AntlrTokenDefProvider.class) + .with(DefaultCrossReferenceSerializer.class) .registrations(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GenerateAllTestGrammars.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GenerateAllTestGrammars.java index e0759f0a0..ed7786b1a 100755 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GenerateAllTestGrammars.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/GenerateAllTestGrammars.java @@ -33,7 +33,8 @@ import org.eclipse.xtext.testlanguages.TestLanguage; * */ public class GenerateAllTestGrammars { - private static String path = "./src-gen"; + private static String srcGenPath = "./src-gen"; + private static String srcPath= "./src"; private static Logger log = Logger.getLogger(GenerateAllTestGrammars.class); @@ -46,9 +47,10 @@ public class GenerateAllTestGrammars { public static void main(String[] args) throws Exception { XtextStandaloneSetup.doSetup(); if (args.length > 0) { - path = args[0] + "/" + path; + srcGenPath = args[0] + "/" + srcGenPath; + srcPath = args[0] + "/" + srcPath; } - GeneratorFacade.cleanFolder(path); + GeneratorFacade.cleanFolder(srcGenPath); for (Class c : testclasses) { String filename = "classpath:/" + c.getName().replace('.', '/') + ".xtext"; log.info("loading " + filename); @@ -57,7 +59,7 @@ public class GenerateAllTestGrammars { Resource resource = rs.createResource(uri); resource.load(null); Grammar grammarModel = (Grammar) resource.getContents().iterator().next(); - GeneratorFacade.generate(grammarModel, path, null, c.getSimpleName().toLowerCase()); + GeneratorFacade.generate(grammarModel, srcGenPath, srcPath, null, c.getSimpleName().toLowerCase()); } } diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/XtextGrammarTestRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/XtextGrammarTestRuntimeConfig.java new file mode 100644 index 000000000..57f3e1ad4 --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/XtextGrammarTestRuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class XtextGrammarTestRuntimeConfig extends AbstractXtextGrammarTestRuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} + diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/crossrefs/LangARuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/crossrefs/LangARuntimeConfig.java new file mode 100644 index 000000000..1778751aa --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/crossrefs/LangARuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext.crossrefs; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class LangARuntimeConfig extends AbstractLangARuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} + diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/dummy/DummyLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/dummy/DummyLanguageRuntimeConfig.java new file mode 100644 index 000000000..d97701a9f --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/dummy/DummyLanguageRuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext.dummy; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class DummyLanguageRuntimeConfig extends AbstractDummyLanguageRuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} + diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageRuntimeConfig.java new file mode 100644 index 000000000..2696cddf0 --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguageRuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext.grammarinheritance; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class AbstractTestLanguageRuntimeConfig extends AbstractAbstractTestLanguageRuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} + diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageRuntimeConfig.java new file mode 100644 index 000000000..7ae451d99 --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguageRuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext.grammarinheritance; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class ConcreteTestLanguageRuntimeConfig extends AbstractConcreteTestLanguageRuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} + diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestRuntimeConfig.java new file mode 100644 index 000000000..f893dc04b --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestRuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext.metamodelreferencing.tests; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class MetamodelRefTestRuntimeConfig extends AbstractMetamodelRefTestRuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} + diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestRuntimeConfig.java new file mode 100644 index 000000000..9177ed614 --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestRuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext.parsetree.reconstr; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class ComplexReconstrTestRuntimeConfig extends AbstractComplexReconstrTestRuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} + diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestRuntimeConfig.java new file mode 100644 index 000000000..6eeed4633 --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestRuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext.parsetree.reconstr; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class SimpleReconstrTestRuntimeConfig extends AbstractSimpleReconstrTestRuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} + diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguageRuntimeConfig.java new file mode 100644 index 000000000..e5c1e40fb --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/ActionTestLanguageRuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext.testlanguages; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class ActionTestLanguageRuntimeConfig extends AbstractActionTestLanguageRuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} + diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/LexerLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/LexerLanguageRuntimeConfig.java new file mode 100644 index 000000000..759ba5113 --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/LexerLanguageRuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext.testlanguages; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class LexerLanguageRuntimeConfig extends AbstractLexerLanguageRuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} + diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/LookaheadLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/LookaheadLanguageRuntimeConfig.java new file mode 100644 index 000000000..030b98bf2 --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/LookaheadLanguageRuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext.testlanguages; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class LookaheadLanguageRuntimeConfig extends AbstractLookaheadLanguageRuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} + diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyLanguageRuntimeConfig.java new file mode 100644 index 000000000..a7d0f8dca --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/OptionalEmptyLanguageRuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext.testlanguages; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class OptionalEmptyLanguageRuntimeConfig extends AbstractOptionalEmptyLanguageRuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} + diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarRuntimeConfig.java new file mode 100644 index 000000000..3d2b3ae0e --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/ReferenceGrammarRuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext.testlanguages; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class ReferenceGrammarRuntimeConfig extends AbstractReferenceGrammarRuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} + diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsRuntimeConfig.java new file mode 100644 index 000000000..0d331665c --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/SimpleExpressionsRuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext.testlanguages; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class SimpleExpressionsRuntimeConfig extends AbstractSimpleExpressionsRuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} + diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/TestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/TestLanguageRuntimeConfig.java new file mode 100644 index 000000000..868f36c17 --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/testlanguages/TestLanguageRuntimeConfig.java @@ -0,0 +1,19 @@ +package org.eclipse.xtext.testlanguages; + +import java.util.Set; + +import org.eclipse.xtext.service.AbstractServiceRegistrationFactory; + +/** + * used to register components to be used at runtime. + */ +public class TestLanguageRuntimeConfig extends AbstractTestLanguageRuntimeConfig { + + public Set registrations() { + Set generated = super.registrations(); + // do stuff + return generated; + } + +} +