sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 00:38:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed IElementFactory to IAstFactory

Browse source
This commit is contained in:
jkohnlein 2008-07-03 12:35:34 +00:00
parent 53838b74af
commit 46aae376ae
11 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/AbstractParser.java
View file

@ -25,12 +25,12 @@ import org.eclipse.xtext.service.Inject;
public abstract class AbstractParser implements IParser {
@Inject
private IElementFactory astElementFactory;
private IAstFactory astElementFactory;
@Inject
protected IGrammarAccess grammarAccess;
public IParseResult parse(String ruleName, InputStream in, IElementFactory factory) {
public IParseResult parse(String ruleName, InputStream in, IAstFactory factory) {
try {
IParseResult parseResult = (IParseResult) parse(ruleName, new ANTLRInputStream(in), factory);
return parseResult;
@ -39,7 +39,7 @@ public abstract class AbstractParser implements IParser {
}
}
public IParseResult parse(InputStream in, IElementFactory factory) {
public IParseResult parse(InputStream in, IAstFactory factory) {
return parse(getDefaultRuleName(), in, factory);
}
@ -55,11 +55,11 @@ public abstract class AbstractParser implements IParser {
return parse(ruleName, in, getDefaultASTFactory());
}
protected IElementFactory getDefaultASTFactory() {
protected IAstFactory getDefaultASTFactory() {
return astElementFactory;
}
protected abstract String getDefaultRuleName();
protected abstract IParseResult parse(String ruleName, ANTLRInputStream in, IElementFactory factory);
protected abstract IParseResult parse(String ruleName, ANTLRInputStream in, IAstFactory factory);
}

2
plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/GenericEcoreElementFactory.java
View file

@ -26,7 +26,7 @@ import org.eclipse.xtext.service.Inject;
* @author Sven Efftinge - Initial contribution and API
*
*/
public class GenericEcoreElementFactory implements IElementFactory {
public class GenericEcoreElementFactory implements IAstFactory {
@Inject
protected IMetamodelAccess metamodelAccess;

2
plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IElementFactory.java → plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IAstFactory.java
View file

@ -16,7 +16,7 @@ import org.eclipse.xtext.service.ILanguageService;
* @author sven efftinge
*
*/
public interface IElementFactory extends ILanguageService {
public interface IAstFactory extends ILanguageService {
/**
* creates an instance of the given typename

2
plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/IParser.java
View file

@ -26,7 +26,7 @@ public interface IParser extends ILanguageService {
* @param handler
* @return
*/
IParseResult parse(InputStream in, IElementFactory factory);
IParseResult parse(InputStream in, IAstFactory factory);
/**
* @param in

4
plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java
View file

@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.GrammarUtil;
import org.eclipse.xtext.LexerRule;
import org.eclipse.xtext.parser.IElementFactory;
import org.eclipse.xtext.parser.IAstFactory;
import org.eclipse.xtext.parser.IParseResult;
import org.eclipse.xtext.parser.ParseException;
import org.eclipse.xtext.parser.ParseResult;
@ -50,7 +50,7 @@ public abstract class AbstractAntlrParser extends Parser {
protected org.eclipse.xtext.Grammar grammar;
protected IElementFactory factory;
protected IAstFactory factory;
protected int lastConsumedIndex = -1;

4
plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/AbstractParseTreeConstructor.java
View file

@ -4,7 +4,7 @@ import org.eclipse.xtext.Grammar;
import org.eclipse.xtext.IGrammarAccess;
import org.eclipse.xtext.conversion.IValueConverterService;
import org.eclipse.xtext.parser.GenericEcoreElementFactory;
import org.eclipse.xtext.parser.IElementFactory;
import org.eclipse.xtext.parser.IAstFactory;
import org.eclipse.xtext.service.Inject;
public abstract class AbstractParseTreeConstructor implements IParseTreeConstructor {
@ -20,7 +20,7 @@ public abstract class AbstractParseTreeConstructor implements IParseTreeConstruc
private Grammar grammar;
@Inject
protected void setElementFactory(IElementFactory astElementFactory) {
protected void setElementFactory(IAstFactory astElementFactory) {
this.astElementFactory = (GenericEcoreElementFactory) astElementFactory;
}

4
plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/XtextResource.java
View file

@ -18,7 +18,7 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
import org.eclipse.xtext.parser.IElementFactory;
import org.eclipse.xtext.parser.IAstFactory;
import org.eclipse.xtext.parser.IParseResult;
import org.eclipse.xtext.parser.IParser;
import org.eclipse.xtext.parsetree.AbstractNode;
@ -38,7 +38,7 @@ public class XtextResource extends ResourceImpl {
private IParser parser;
@Inject
private IElementFactory elementFactory;
private IAstFactory elementFactory;
@Inject
private IParseTreeConstructor parsetreeConstructor;

4
tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTest.java
View file

@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EPackage;
import org.eclipse.xtext.XtextPackage;
import org.eclipse.xtext.metamodelreferencing.tests.services.MetamodelRefTestMetamodelAccess;
import org.eclipse.xtext.parser.GenericEcoreElementFactory;
import org.eclipse.xtext.parser.IElementFactory;
import org.eclipse.xtext.parser.IAstFactory;
import org.eclipse.xtext.service.ILanguageDescriptor;
import org.eclipse.xtext.service.LanguageDescriptorFactory;
import org.eclipse.xtext.service.ServiceRegistry;
@ -33,7 +33,7 @@ public class MetamodelRefTest extends AbstractGeneratorTest {
with(MetamodelRefTestStandaloneSetup.class);
ILanguageDescriptor languageDescriptor = LanguageDescriptorFactory.get(IMetamodelRefTest.ID);
GenericEcoreElementFactory astFactory = (GenericEcoreElementFactory) ServiceRegistry.getService(languageDescriptor,
IElementFactory.class);
IAstFactory.class);
astFactory.setMetamodelAccess(new MetamodelRefTestMetamodelAccess() {
@Override
public EPackage[] getGeneratedEPackages() {

4
tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTest.java
View file

@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EPackage;
import org.eclipse.xtext.XtextPackage;
import org.eclipse.xtext.metamodelreferencing.tests.services.MetamodelRefTestMetamodelAccess;
import org.eclipse.xtext.parser.GenericEcoreElementFactory;
import org.eclipse.xtext.parser.IElementFactory;
import org.eclipse.xtext.parser.IAstFactory;
import org.eclipse.xtext.service.ILanguageDescriptor;
import org.eclipse.xtext.service.LanguageDescriptorFactory;
import org.eclipse.xtext.service.ServiceRegistry;
@ -33,7 +33,7 @@ public class MultiGenMMTest extends AbstractGeneratorTest {
with(MetamodelRefTestStandaloneSetup.class);
ILanguageDescriptor languageDescriptor = LanguageDescriptorFactory.get(IMetamodelRefTest.ID);
GenericEcoreElementFactory astFactory = (GenericEcoreElementFactory) ServiceRegistry.getService(languageDescriptor,
IElementFactory.class);
IAstFactory.class);
astFactory.setMetamodelAccess(new MetamodelRefTestMetamodelAccess() {
@Override
public EPackage[] getGeneratedEPackages() {

2
tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/PartialParsingPerformanceTest.java
View file

@ -18,7 +18,7 @@ import org.eclipse.xtext.testlanguages.SimpleExpressionsStandaloneSetup;
*/
public class PartialParsingPerformanceTest extends AbstractPartialParserTest {
private static final int NUM_ELEMENTS = 10;
private static final int NUM_ELEMENTS = 200;
public void testExpression() throws Exception {
with(SimpleExpressionsStandaloneSetup.class);
StringBuffer modelBuffer = new StringBuffer();

6
tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/tests/AbstractGeneratorTest.java
View file

@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.m2t.type.emf.EmfRegistryMetaModel;
import org.eclipse.xtext.GenerateAllTestGrammars;
import org.eclipse.xtext.XtextStandaloneSetup;
import org.eclipse.xtext.parser.IElementFactory;
import org.eclipse.xtext.parser.IAstFactory;
import org.eclipse.xtext.parser.IParser;
import org.eclipse.xtext.parsetree.CompositeNode;
import org.eclipse.xtext.parsetree.IParseTreeConstructor;
@ -89,8 +89,8 @@ public abstract class AbstractGeneratorTest extends TestCase {
return ServiceRegistry.getService(currentLanguageDescriptor, IParser.class);
}
protected IElementFactory getASTFactory() throws Exception {
return ServiceRegistry.getService(currentLanguageDescriptor, IElementFactory.class);
protected IAstFactory getASTFactory() throws Exception {
return ServiceRegistry.getService(currentLanguageDescriptor, IAstFactory.class);
}
protected IParseTreeConstructor getParseTreeConstructor() throws Exception {