Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormtaal2006-09-07 22:27:42 +0000
committermtaal2006-09-07 22:27:42 +0000
commit121875f134c1c5b1f738aa355a03620a6f177e63 (patch)
tree8e2ef3d5331034e3490731ae4fbddff3538e3269 /plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo
parent0573e80193efa985ccfdfbe94ef40b44d1402b93 (diff)
downloadorg.eclipse.emf.teneo-121875f134c1c5b1f738aa355a03620a6f177e63.tar.gz
org.eclipse.emf.teneo-121875f134c1c5b1f738aa355a03620a6f177e63.tar.xz
org.eclipse.emf.teneo-121875f134c1c5b1f738aa355a03620a6f177e63.zip
Added support for enums
Diffstat (limited to 'plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo')
-rw-r--r--plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationParser.java20
1 files changed, 17 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationParser.java b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationParser.java
index f4e42354e..db32e50a9 100644
--- a/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationParser.java
+++ b/plugins/org.eclipse.emf.teneo.annotations/src/org/eclipse/emf/teneo/annotations/parser/AnnotationParser.java
@@ -11,7 +11,7 @@
* Martin Taal
* </copyright>
*
- * $Id: AnnotationParser.java,v 1.6 2006/09/05 12:16:57 mtaal Exp $
+ * $Id: AnnotationParser.java,v 1.7 2006/09/07 22:27:42 mtaal Exp $
*/
package org.eclipse.emf.teneo.annotations.parser;
@@ -112,17 +112,31 @@ public class AnnotationParser {
case AnnotationTokenizer.T_IDENTIFIER:
final String identifier = annotationTokenizer.getLexeme();
// next token must be an is
- if (annotationTokenizer.nextToken() != AnnotationTokenizer.T_IS) {
+ int nextToken = annotationTokenizer.nextToken();
+ if (nextToken == AnnotationTokenizer.T_CONTENTEND) {
+ final PrimitiveValueNode vn = new PrimitiveValueNode();
+ vn.setName("value");
+ vn.setValue(identifier);
+ addToParent(pn, vn);
+ return;
+ }
+ if (nextToken != AnnotationTokenizer.T_IS) {
throw new AnnotationParserException("No = character after identifier, see _ for error position " +
annotationTokenizer.getErrorText());
}
- final int nextToken = annotationTokenizer.nextToken();
+ nextToken = annotationTokenizer.nextToken();
if (nextToken == AnnotationTokenizer.T_VALUE) {
final String value = annotationTokenizer.getLexeme();
final PrimitiveValueNode vn = new PrimitiveValueNode();
vn.setName(identifier);
vn.setValue(value);
addToParent(pn, vn);
+ }if (nextToken == AnnotationTokenizer.T_VALUE) {
+ final String value = annotationTokenizer.getLexeme();
+ final PrimitiveValueNode vn = new PrimitiveValueNode();
+ vn.setName(identifier);
+ vn.setValue(value);
+ addToParent(pn, vn);
} else if (nextToken == AnnotationTokenizer.T_IDENTIFIER) {
final String value = annotationTokenizer.getLexeme();
final PrimitiveValueNode vn = new PrimitiveValueNode();

Back to the top