Simplified CodeFileSrc generic signature. Added interfaces and setup entire parsing process to be generic (added CodeLanguage.getExtractor() and AstExtractor interface). Refactored C# classes to support this more generic approach. Removed IntermClass.getBlockTree(), it should be tracked higher up in the parsing process. Added Simple and Resolved sub-classes of ProjectClassSet. Renamed CsMain -> ParserMain.

Author: TeamworkGuy2

.classpath

@@ -7,8 +7,7 @@
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-util/jar/jtext_util.jar" sourcepath="/JTextUtility"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jdata-util/jar/jdata_util.jar" sourcepath="/JDataUtility"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/TestUtil"/>
-	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jcollection-util/jar/jcollection_util.jar" sourcepath="/JCollectionUtility"/>
-	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/data-transfer/jar/data_transfer.jar" sourcepath="/DataTransfer/src"/>
+	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jcollection-util/jar/jcollection_util.jar" sourcepath="/JCollectionUtil"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jprimitive-collections/jar/jprimitive_collections.jar" sourcepath="/JPrimitiveCollections"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Lombok"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jsimple-types/jar/jsimple_types.jar" sourcepath="/JSimpleTypes/src"/>
@@ -23,5 +22,6 @@
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jfile-io/jar/jfile_io.jar" sourcepath="/JFileIo"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/TemplateUtil"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtree-walker/jar/jtree_walker.jar" sourcepath="/JTreeWalker"/>
+	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/data-transfer/jar/data_transfer.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

README.md

@@ -1,7 +1,8 @@
 ParserToolsTmp
 ==============
+version: 0.2.0
 
-In progress parser tools built atop [JTextParser] (https://github.com/TeamworkGuy2/JTextParser) and half a dozen other utility libraries. 
+In progress parser tools built atop [JTextParser] (https://github.com/TeamworkGuy2/JTextParser), [Jackson] (https://github.com/FasterXML/jackson-core/) (core, databind, annotations) and half a dozen other utility libraries. 
 
 ####The goal:
 * A competent source code parser that can turn C#, Java, or JavaScript/TypeScript code into a simple AST like structure ('competent' meaning this project aims to support common use cases, not every syntatic feature of the supported languages). 

src/twg2/parser/codeParser/AstExtractor.java

@@ -0,0 +1,20 @@
+package twg2.parser.codeParser;
+
+import java.util.List;
+import java.util.Map.Entry;
+
+import twg2.parser.baseAst.CompoundBlock;
+import twg2.parser.documentParser.DocumentFragmentText;
+import twg2.parser.intermAst.classes.IntermClass;
+import twg2.treeLike.simpleTree.SimpleTree;
+
+/**
+ * @param <T_BLOCK> the type of {@link CompoundBlock} that this extract can extract
+ * @author TeamworkGuy2
+ * @since 2016-1-6
+ */
+public interface AstExtractor<T_BLOCK extends CompoundBlock> {
+
+	public List<Entry<SimpleTree<DocumentFragmentText<CodeFragmentType>>, IntermClass.SimpleImpl<T_BLOCK>>> extractClassFieldsAndMethodSignatures(SimpleTree<DocumentFragmentText<CodeFragmentType>> astTree);
+
+}

src/twg2/parser/codeParser/CodeFileParsed.java

@@ -0,0 +1,44 @@
+package twg2.parser.codeParser;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import twg2.parser.baseAst.CompoundBlock;
+import twg2.parser.documentParser.DocumentFragmentText;
+import twg2.parser.intermAst.classes.IntermClass;
+import twg2.parser.intermAst.classes.IntermClassSig;
+import twg2.parser.output.JsonWritableSig;
+import twg2.treeLike.simpleTree.SimpleTree;
+
+/**
+ * @author TeamworkGuy2
+ * @since 2016-1-9
+ */
+@AllArgsConstructor
+public class CodeFileParsed<T_ID, T_CLASS extends IntermClass<? extends IntermClassSig, ? extends JsonWritableSig, ? extends CompoundBlock>> {
+	@Getter T_ID id;
+	@Getter T_CLASS parsedClass;
+	@Getter SimpleTree<DocumentFragmentText<CodeFragmentType>> astTree;
+
+
+
+
+	public static class Simple<T_ID, T_BLOCK extends CompoundBlock> extends CodeFileParsed<T_ID, IntermClass.SimpleImpl<T_BLOCK>> {
+
+		public Simple(T_ID id, IntermClass.SimpleImpl<T_BLOCK> parsedClass, SimpleTree<DocumentFragmentText<CodeFragmentType>> astTree) {
+			super(id, parsedClass, astTree);
+		}
+
+	}
+
+
+
+
+	public static class Resolved<T_ID, T_BLOCK extends CompoundBlock> extends CodeFileParsed<T_ID, IntermClass.ResolvedImpl<T_BLOCK>> {
+
+		public Resolved(T_ID id, IntermClass.ResolvedImpl<T_BLOCK> parsedClass, SimpleTree<DocumentFragmentText<CodeFragmentType>> astTree) {
+			super(id, parsedClass, astTree);
+		}
+
+	}
+
+}

src/twg2/parser/codeParser/CodeFileSrc.java

@@ -3,16 +3,17 @@
 import java.util.List;
 
 import lombok.Getter;
+import twg2.parser.documentParser.DocumentFragmentText;
 import twg2.treeLike.simpleTree.SimpleTree;
 
-/**
+/** All the information resulting from building a source string into an AST.
+ * Contains an {@link DocumentFragmentText} AST tree, source name, source string, source string as list of lines, and a language.
  * @author TeamworkGuy2
  * @since 2015-11-22
- * @param <T_TREE> the type of {@link SimpleTree} data stored in this code file's parsed {@link #getDoc()} structure
  * @param <T_LANG> the code language of the source file
  */
-public class CodeFileSrc<T_TREE, T_LANG extends CodeLanguage> {
-	@Getter SimpleTree<T_TREE> doc;
+public class CodeFileSrc<T_LANG extends CodeLanguage> {
+	@Getter SimpleTree<DocumentFragmentText<CodeFragmentType>> doc;
 	@Getter String srcName;
 	@Getter String src;
 	@Getter List<String> lines;
@@ -25,7 +26,7 @@ public class CodeFileSrc<T_TREE, T_LANG extends CodeLanguage> {
 	 * @param lines
 	 * @param language optional
 	 */
-	public CodeFileSrc(SimpleTree<T_TREE> doc, String srcName, String src, List<String> lines, T_LANG language) {
+	public CodeFileSrc(SimpleTree<DocumentFragmentText<CodeFragmentType>> doc, String srcName, String src, List<String> lines, T_LANG language) {
 		this.doc = doc;
 		this.srcName = srcName;
 		this.src = src;

src/twg2/parser/codeParser/CodeLanguage.java

@@ -3,8 +3,8 @@
 import java.util.List;
 import java.util.function.Function;
 
+import twg2.parser.baseAst.CompoundBlock;
 import twg2.parser.baseAst.LanguageAstUtil;
-import twg2.parser.documentParser.DocumentFragmentText;
 
 /**
  * @author TeamworkGuy2
@@ -18,6 +18,8 @@ public interface CodeLanguage {
 
 	public List<String> getFileExtensions();
 
-	public Function<ParseInput, ? extends CodeFileSrc<DocumentFragmentText<CodeFragmentType>, ? extends CodeLanguage>> getParser();
+	public Function<ParseInput, ? extends CodeFileSrc<? extends CodeLanguage>> getParser();
+
+	public AstExtractor<? extends CompoundBlock> getExtractor();
 
 }

src/twg2/parser/codeParser/CodeLanguageOptions.java

@@ -8,30 +8,32 @@
 
 import lombok.Getter;
 import lombok.val;
+import twg2.parser.baseAst.CompoundBlock;
 import twg2.parser.baseAst.LanguageAstUtil;
 import twg2.parser.baseAst.csharp.CsAstUtil;
+import twg2.parser.codeParser.csharp.CsBlock;
+import twg2.parser.codeParser.csharp.CsBlockParser;
 import twg2.parser.codeParser.csharp.CsClassParser;
-import twg2.parser.documentParser.DocumentFragmentText;
 
 /**
  * @author TeamworkGuy2
  * @since 2015-9-19
  */
-public class CodeLanguageOptions<T_LANG extends CodeLanguage, T_AST_UTIL extends LanguageAstUtil> implements CodeLanguage {
+public class CodeLanguageOptions<T_LANG extends CodeLanguage, T_AST_UTIL extends LanguageAstUtil, T_AST_EXTRACTOR extends AstExtractor<? extends CompoundBlock>> implements CodeLanguage {
 
-	public static class CSharp extends CodeLanguageOptions<CSharp, CsAstUtil> {
-		CSharp(String displayName, CsAstUtil astUtil, Function<ParseInput, CodeFileSrc<DocumentFragmentText<CodeFragmentType>, CSharp>> parser, String... fileExtensions) {
-			super(displayName, astUtil, parser, fileExtensions);
+	public static class CSharp extends CodeLanguageOptions<CSharp, CsAstUtil, AstExtractor<CsBlock>> {
+		CSharp(String displayName, CsAstUtil astUtil, Function<ParseInput, CodeFileSrc<CSharp>> parser, AstExtractor<CsBlock> extractor, String... fileExtensions) {
+			super(displayName, astUtil, parser, extractor, fileExtensions);
 		}
 
 	}
 
 
-	public static final CodeLanguageOptions<CodeLanguage, LanguageAstUtil> JAVA = new CodeLanguageOptions<>("Java", null, null, "java");
-	public static final CodeLanguageOptions<CodeLanguage, LanguageAstUtil> JAVASCRIPT = new CodeLanguageOptions<>("Javascript", null, null, "js", "ts");
-	public static final CSharp C_SHARP = new CSharp("C#", new CsAstUtil(), CsClassParser::parse, "cs");
-	public static final CodeLanguageOptions<CodeLanguage, LanguageAstUtil> CSS = new CodeLanguageOptions<>("CSS", (LanguageAstUtil)null, null, "css");
-	public static final CodeLanguageOptions<CodeLanguage, LanguageAstUtil> XML = new CodeLanguageOptions<>("XML", null, null, "html", "xml");
+	public static final CodeLanguageOptions<CodeLanguage, LanguageAstUtil, AstExtractor<CompoundBlock>> JAVA = new CodeLanguageOptions<>("Java", (LanguageAstUtil)null, null, null, "java");
+	public static final CodeLanguageOptions<CodeLanguage, LanguageAstUtil, AstExtractor<CompoundBlock>> JAVASCRIPT = new CodeLanguageOptions<>("Javascript", (LanguageAstUtil)null, null, null, "js", "ts");
+	public static final CSharp C_SHARP = new CSharp("C#", new CsAstUtil(), CsClassParser::parse, new CsBlockParser(), "cs");
+	public static final CodeLanguageOptions<CodeLanguage, LanguageAstUtil, AstExtractor<CompoundBlock>> CSS = new CodeLanguageOptions<>("CSS", (LanguageAstUtil)null, null, null, "css");
+	public static final CodeLanguageOptions<CodeLanguage, LanguageAstUtil, AstExtractor<CompoundBlock>> XML = new CodeLanguageOptions<>("XML", (LanguageAstUtil)null, null, null, "html", "xml");
 
 	private static CopyOnWriteArrayList<CodeLanguage> values;
 
@@ -47,18 +49,19 @@ public static class CSharp extends CodeLanguageOptions<CSharp, CsAstUtil> {
 
 
 	final String displayName;
-	@Getter final Function<ParseInput, CodeFileSrc<DocumentFragmentText<CodeFragmentType>, T_LANG>> parser;
+	@Getter final Function<ParseInput, CodeFileSrc<T_LANG>> parser;
 	@Getter final List<String> fileExtensions;
 	@Getter final T_AST_UTIL astUtil;
+	@Getter final T_AST_EXTRACTOR extractor;
 
 
 	// package-private
-	CodeLanguageOptions(String displayName, T_AST_UTIL astUtil,
-			Function<ParseInput, CodeFileSrc<DocumentFragmentText<CodeFragmentType>, T_LANG>> parser, String... fileExtensions) {
+	CodeLanguageOptions(String displayName, T_AST_UTIL astUtil, Function<ParseInput, CodeFileSrc<T_LANG>> parser, T_AST_EXTRACTOR extractor, String... fileExtensions) {
 		this.displayName = displayName;
 		this.parser = parser;
 		this.fileExtensions = new ArrayList<>(Arrays.asList(fileExtensions));
 		this.astUtil = astUtil;
+		this.extractor = extractor;
 	}
 
 
@@ -85,9 +88,9 @@ public static List<CodeLanguage> getLanguages() {
 	 * @param fileExtensions a list of file extensions associated with this language
 	 * @return a new {@link CodeLanguage} instance
 	 */
-	public static <_T_LANG extends CodeLanguage, _T_AST_UTIL extends LanguageAstUtil> CodeLanguage registerCodeLanguage(String displayName, _T_AST_UTIL astUtil,
-			Function<ParseInput, CodeFileSrc<DocumentFragmentText<CodeFragmentType>, _T_LANG>> parser, String... fileExtensions) {
-		val inst = new CodeLanguageOptions<>(displayName, astUtil, parser, fileExtensions);
+	public static <_T_LANG extends CodeLanguage, _T_AST_UTIL extends LanguageAstUtil, T_AST_EXTRACTOR extends AstExtractor<? extends CompoundBlock>> CodeLanguage registerCodeLanguage(String displayName, _T_AST_UTIL astUtil,
+			Function<ParseInput, CodeFileSrc<_T_LANG>> parser, T_AST_EXTRACTOR extractor, String... fileExtensions) {
+		val inst = new CodeLanguageOptions<>(displayName, astUtil, parser, extractor, fileExtensions);
 		_registerNewLanguage(inst);
 		return inst;
 	}
@@ -116,7 +119,7 @@ public static CodeLanguage tryFromFileExtension(String fileExtension) {
 	}
 
 
-	private static final void _registerNewLanguage(CodeLanguageOptions<? extends CodeLanguage, ? extends LanguageAstUtil> inst) {
+	private static final void _registerNewLanguage(CodeLanguageOptions<? extends CodeLanguage, ? extends LanguageAstUtil, ? extends AstExtractor<? extends CompoundBlock>> inst) {
 		values.add(inst);
 	}
 

src/twg2/parser/codeParser/ParseCommentsAndWhitespace.java

@@ -24,14 +24,14 @@
  */
 public class ParseCommentsAndWhitespace {
 
-	public static CodeFileSrc<DocumentFragmentText<CodeFragmentType>, CodeLanguage> buildCommentsAndWhitespaceTreeFromFileExtension(String srcName, String fileExtension, String src) throws IOException {
+	public static CodeFileSrc<CodeLanguage> buildCommentsAndWhitespaceTreeFromFileExtension(String srcName, String fileExtension, String src) throws IOException {
 		EnumSet<CommentStyle> commentStyle = CommentStyle.fromFileExtension(fileExtension);
 
 		return buildCommentsAndWhitespaceTree(commentStyle, src, srcName);
 	}
 
 
-	public static CodeFileSrc<DocumentFragmentText<CodeFragmentType>, CodeLanguage> buildCommentsAndWhitespaceTree(EnumSet<CommentStyle> style, String src, String srcName) throws IOException {
+	public static CodeFileSrc<CodeLanguage> buildCommentsAndWhitespaceTree(EnumSet<CommentStyle> style, String src, String srcName) throws IOException {
 		CharPrecondition stringParser = CodeStringParser.createStringParserForJavascript();
 		CharPrecondition commentParser = CommentParser.createCommentParser(style);
 

src/twg2/parser/codeParser/ParserBuilder.java

@@ -46,7 +46,7 @@ public ParserBuilder addConstParser(CharPrecondition parser, CodeFragmentType ty
 	 * @param srcName optional
 	 * @return a parsed {@link CodeFileSrc} containing {@link DocumentFragmentText} nodes represented the tokens parsed from {@code src}
 	 */
-	public <L extends CodeLanguage> CodeFileSrc<DocumentFragmentText<CodeFragmentType>, L> buildAndParse(String src, L language, String srcName) {
+	public <L extends CodeLanguage> CodeFileSrc<L> buildAndParse(String src, L language, String srcName) {
 		List<String> lines = new ArrayList<>();
 
 		// intercept each line request and add the line to our list of lines

src/twg2/parser/codeParser/csharp/CsBlockParser.java

@@ -9,9 +9,9 @@
 import lombok.val;
 import twg2.collections.tuple.Tuples;
 import twg2.parser.baseAst.AccessModifierEnum;
-import twg2.parser.baseAst.csharp.CsAstUtil;
 import twg2.parser.baseAst.tools.AstFragType;
 import twg2.parser.baseAst.tools.NameUtil;
+import twg2.parser.codeParser.AstExtractor;
 import twg2.parser.codeParser.CodeFragmentType;
 import twg2.parser.codeParser.CodeLanguageOptions;
 import twg2.parser.codeParser.tools.TokenListIterable;
@@ -31,14 +31,12 @@
  * @author TeamworkGuy2
  * @since 2015-12-5
  */
-public class CsBlockParser {
-	private static final CodeLanguageOptions<CodeLanguageOptions.CSharp, CsAstUtil> lang = CodeLanguageOptions.C_SHARP;
-	private IntermBlock<IntermClassSig.SimpleImpl, CsBlock> parentScope;
-	List<IntermBlock<IntermClassSig.SimpleImpl, CsBlock>> blocks = new ArrayList<>();
+public class CsBlockParser implements AstExtractor<CsBlock> {
 
 
-	public CsBlockParser(IntermBlock<IntermClassSig.SimpleImpl, CsBlock> parentScope) {
-		this.parentScope = parentScope;
+	@Override
+	public List<Entry<SimpleTree<DocumentFragmentText<CodeFragmentType>>, IntermClass.SimpleImpl<CsBlock>>> extractClassFieldsAndMethodSignatures(SimpleTree<DocumentFragmentText<CodeFragmentType>> astTree) {
+		return CsBlockParser.extractBlockFieldsAndInterfaceMethods(astTree);
 	}
 
 
@@ -48,8 +46,9 @@ public CsBlockParser(IntermBlock<IntermClassSig.SimpleImpl, CsBlock> parentScope
 	 * @param depth the current blockTree's depth within the tree (0=root node, 1=child of root, etc.)
 	 * @param parentNode the current blockTree's parent node or null if the parent is null (only possible if blockTree is a child of a tree with a null root or blockTree is the root and has no parent)
 	 */
-	public void extractBlocksFromTree(List<String> nameScope, SimpleTree<DocumentFragmentText<CodeFragmentType>> blockTree,
-			int depth, SimpleTree<DocumentFragmentText<CodeFragmentType>> parentNode) {
+	public static void extractBlocksFromTree(List<String> nameScope, SimpleTree<DocumentFragmentText<CodeFragmentType>> blockTree,
+			int depth, SimpleTree<DocumentFragmentText<CodeFragmentType>> parentNode, IntermBlock<IntermClassSig.SimpleImpl, CsBlock> parentScope, List<IntermBlock<IntermClassSig.SimpleImpl, CsBlock>> blocks) {
+		CodeLanguageOptions.CSharp lang = CodeLanguageOptions.C_SHARP;
 		val children = blockTree.getChildren();
 
 		val childIterable = new TokenListIterable(children);
@@ -90,7 +89,7 @@ public void extractBlocksFromTree(List<String> nameScope, SimpleTree<DocumentFra
 				}
 			}
 
-			extractBlocksFromTree(nameScope, child, depth + 1, blockTree);
+			extractBlocksFromTree(nameScope, child, depth + 1, blockTree, parentScope, blocks);
 
 			while(addBlockCount > 0) {
 				nameScope.remove(nameScope.size() - 1);
@@ -105,6 +104,7 @@ public void extractBlocksFromTree(List<String> nameScope, SimpleTree<DocumentFra
 	 * @return access modifiers read backward from the iterator's current {@code previous()} value
 	 */
 	private static List<String> readAccessModifier(EnhancedListBuilderIterator<SimpleTree<DocumentFragmentText<CodeFragmentType>>> iter) {
+		CodeLanguageOptions.CSharp lang = CodeLanguageOptions.C_SHARP;
 		int prevCount = 0;
 		List<String> accessModifiers = new ArrayList<>();
 		SimpleTree<DocumentFragmentText<CodeFragmentType>> child = iter.hasPrevious() ? iter.previous() : null;
@@ -128,6 +128,7 @@ private static List<String> readAccessModifier(EnhancedListBuilderIterator<Simpl
 	 * @return {@code <className, extendImplementNames>}
 	 */
 	private static Entry<String, List<String>> readClassIdentifierAndExtends(EnhancedListBuilderIterator<SimpleTree<DocumentFragmentText<CodeFragmentType>>> iter) {
+		CodeLanguageOptions.CSharp lang = CodeLanguageOptions.C_SHARP;
 		// class signatures are read backward from the opening '{'
 		int prevCount = 0;
 		List<String> names = new ArrayList<>();
@@ -172,10 +173,10 @@ else if(names.size() == 1) {
 
 
 	// TODO this only parses some fields and interface methods
-	public static List<IntermClass.SimpleImpl<CsBlock>> extractBlockFieldsAndInterfaceMethods(SimpleTree<DocumentFragmentText<CodeFragmentType>> tokenTree) {
+	public static List<Entry<SimpleTree<DocumentFragmentText<CodeFragmentType>>, IntermClass.SimpleImpl<CsBlock>>> extractBlockFieldsAndInterfaceMethods(SimpleTree<DocumentFragmentText<CodeFragmentType>> tokenTree) {
 		List<IntermBlock<IntermClassSig.SimpleImpl, CsBlock>> blockDeclarations = CsBlockParser.extractBlocks(tokenTree, null);
 
-		List<IntermClass.SimpleImpl<CsBlock>> resBlocks = new ArrayList<>();
+		List<Entry<SimpleTree<DocumentFragmentText<CodeFragmentType>>, IntermClass.SimpleImpl<CsBlock>>> resBlocks = new ArrayList<>();
 
 		CsUsingStatementExtractor usingStatementExtractor = new CsUsingStatementExtractor();
 
@@ -209,7 +210,7 @@ public static List<IntermClass.SimpleImpl<CsBlock>> extractBlockFieldsAndInterfa
 			}
 
 			if(block.getBlockType() != CsBlock.NAMESPACE) {
-				resBlocks.add(new IntermClass.SimpleImpl<>(block.getDeclaration(), usingStatements, fields, intfMethods, block.getBlockTree(), block.getBlockType()));
+				resBlocks.add(Tuples.of(block.getBlockTree(), new IntermClass.SimpleImpl<>(block.getDeclaration(), usingStatements, fields, intfMethods, block.getBlockType())));
 			}
 		}
 
@@ -247,11 +248,11 @@ public static void runParsers(SimpleTree<DocumentFragmentText<CodeFragmentType>>
 
 
 	public static List<IntermBlock<IntermClassSig.SimpleImpl, CsBlock>> extractBlocks(SimpleTree<DocumentFragmentText<CodeFragmentType>> tokenTree, IntermBlock<IntermClassSig.SimpleImpl, CsBlock> parentScope) {
-		CsBlockParser extractor = new CsBlockParser(parentScope);
+		List<IntermBlock<IntermClassSig.SimpleImpl, CsBlock>> blocks = new ArrayList<>();
 		//AstUtil.forEach(parsedFile.getDoc(), extractor::extractDataModelFieldsIndexedSubTreeConsumer);
 		List<String> nameScope = new ArrayList<>();
-		extractor.extractBlocksFromTree(nameScope, tokenTree, 0, null);
-		return extractor.blocks;
+		extractBlocksFromTree(nameScope, tokenTree, 0, null, parentScope, blocks);
+		return blocks;
 	}
 
 }