Refactored several methods

usethesource · Apr 22, 2020 · 730b96d · 730b96d
1 parent 7b25db5
commit 730b96d
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/src/lang/cpp/internal/Parser.java b/src/lang/cpp/internal/Parser.java
@@ -502,23 +502,17 @@ public ISet getMethodOverrides(IASTTranslationUnit tu) {
 	}
 
 	public ISet getMacroDefinitionsFromTranslationUnit(IASTTranslationUnit tu) {
-		ISetWriter macros = vf.setWriter();
-		Stream.of(tu.getMacroDefinitions()).forEach(it -> {
-			ISourceLocation decl;
+		return Stream.of(tu.getMacroExpansions()).map(it -> {
 			try {
-				decl = br.resolveBinding(it.getName().resolveBinding());
+				return vf.tuple(getSourceLocation(it), br.resolveBinding(it.getMacroReference().resolveBinding()));
 			} catch (URISyntaxException e) {
-				decl = vf.sourceLocation(URIUtil.rootScheme("null"));
+				return vf.tuple(getSourceLocation(it), vf.sourceLocation(URIUtil.rootScheme("unknown")));
 			}
-			macros.insert(vf.tuple(decl, getSourceLocation(it)));
-		});
-		return macros.done();
+		}).collect(vf.setWriter());
 	}
 
 	public IList getCommentsFromTranslationUnit(IASTTranslationUnit tu) {
-		IListWriter comments = vf.listWriter();
-		Stream.of(tu.getComments()).forEach(it -> comments.append(getSourceLocation(it)));
-		return comments.done();
+		return Stream.of(tu.getComments()).map(this::getSourceLocation).collect(vf.listWriter());
 	}
 
 	public IList parseForComments(ISourceLocation file, IList includePath, IMap additionalMacros,