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

patch by michael clay BUG #239192

Browse source 
and other stuff
This commit is contained in:
dhubner 2008-07-02 07:30:52 +00:00
parent 15751b5d58
commit 645d1565bd
2 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
plugins/org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.java
View file

@ -43,9 +43,9 @@ public class GrammarUtil {
}
public static String getNamespace(Grammar g) {
return Strings.concat(".", g.getIdElements(), 1);
return Strings.concat(".", g.getIdElements(), 1);
}
public static Grammar getGrammar(EObject grammarElement) {
EObject root = getRootContainer(grammarElement);
if (root instanceof Grammar) {
@ -85,7 +85,8 @@ public class GrammarUtil {
for (AbstractElement ae : g.getAbstractTokens()) {
if (ae == _this || eAllContentsAsList(ae).contains(_this)) {
return result;
} else {
}
else {
result.add(ae);
}
}
@ -120,30 +121,30 @@ public class GrammarUtil {
}
public static Grammar getSuperGrammar(Grammar _this) {
if(IXtextBuiltin.ID.equals(getLanguageId(_this))) {
return null;
}
if (IXtextBuiltin.ID.equals(getLanguageId(_this))) {
return null;
}
String id = getSuperGrammarId(_this);
if (id == null) {
id = IXtextBuiltin.ID;
}
ILanguageDescriptor descriptor = LanguageDescriptorFactory.get(id);
if (descriptor == null)
throw new IllegalStateException("Language '"+id+"' has not been set up properly");
throw new IllegalStateException("Language '" + id + "' has not been set up properly");
IGrammarAccess service = ServiceRegistry.getService(descriptor, IGrammarAccess.class);
if (service == null)
throw new IllegalStateException("Language '"+id+"' has not been set up properly");
throw new IllegalStateException("Language '" + id + "' has not been set up properly");
Grammar superGrammar = service.getGrammar();
return superGrammar == _this ? null : superGrammar;
}
public static String getSuperGrammarId(Grammar _this) {
if (_this.getSuperGrammarIdElements().isEmpty())
return null;
StringBuffer buff = new StringBuffer();
for (int i = 0, x = _this.getSuperGrammarIdElements().size(); i<x; i++) {
for (int i = 0, x = _this.getSuperGrammarIdElements().size(); i < x; i++) {
buff.append(_this.getSuperGrammarIdElements().get(i));
if ((i+1)<x)
if ((i + 1) < x)
buff.append(".");
}
return buff.toString();
@ -253,22 +254,28 @@ public class GrammarUtil {
Set<String> kws = new HashSet<String>();
List<ParserRule> rules = allParserRules(g);
for (ParserRule parserRule : rules) {
List<Keyword> list = typeSelect(eAllContentsAsList(parserRule),Keyword.class);
List<Keyword> list = typeSelect(eAllContentsAsList(parserRule), Keyword.class);
for (Keyword keyword : list) {
kws.add(keyword.getValue());
}
}
return kws;
}
public static boolean isOptionalCardinality(AbstractElement e) {
return e.getCardinality()!=null && (e.getCardinality().equals("?") || e.getCardinality().equals("*"));
return e.getCardinality() != null && (e.getCardinality().equals("?") || e.getCardinality().equals("*"));
}
public static boolean isMultipleCardinality(AbstractElement e) {
return e.getCardinality()!=null && (e.getCardinality().equals("+") || e.getCardinality().equals("*"));
return isOneOrMoreCardinality(e) || isAnyCardinality(e);
}
public static boolean isOneOrMoreCardinality(AbstractElement e) {
return e.getCardinality() != null && (e.getCardinality().equals("+"));
}
public static boolean isAnyCardinality(AbstractElement e) {
return e.getCardinality() != null && (e.getCardinality().equals("*"));
}
}

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

@ -53,6 +53,7 @@ public class XtextResource extends ResourceImpl {
}
public void update(int offset, int length, String change) {
parser.reparse(parse.getRootNode(), offset, length, change);
}