From c8f4dcf72fc88ab8dbfde7d43991044442537ba7 Mon Sep 17 00:00:00 2001
From: sefftinge
Date: Thu, 28 Feb 2008 09:48:51 +0000
Subject: Fixed NPE

---
 .../org/eclipse/xpand3/parser/AbstractXpand3NodeParser.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParser.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParser.java
index 1ff4c0e8..60e38d9b 100644
--- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParser.java
+++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParser.java
@@ -16,7 +16,7 @@ import org.eclipse.xpand3.node.NodeFactory;
 public abstract class AbstractXpand3NodeParser extends Xpand3Parser {
 
 	private CompositeNode current = null;
-	private CompositeNode rootNode = null;
+	private Node rootNode = null;
 
 	public AbstractXpand3NodeParser(TokenStream input) {
 		super(input);
@@ -49,9 +49,13 @@ public abstract class AbstractXpand3NodeParser extends Xpand3Parser {
 				&& current.getChildren().size() == 1
 				&& (current.getChildren().get(0) instanceof CompositeNode)) {
 			Node child = current.getChildren().get(0);
-			int i = parent.getChildren().indexOf(current);
-			parent.getChildren().remove(i);
-			parent.getChildren().add(i, child);
+			if (parent != null) {
+				int i = parent.getChildren().indexOf(current);
+				parent.getChildren().remove(i);
+				parent.getChildren().add(i, child);
+			} else {
+				rootNode = child;
+			}
 		}
 		current = parent;
 	}
-- 
cgit v1.2.3