refactor parseInteractive

jckarter · Nov 25, 2012 · 67017c3 · 67017c3
1 parent 6f62bc2
commit 67017c3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 26 deletions.
diff --git a/compiler/interactive.cpp b/compiler/interactive.cpp
@@ -174,14 +174,11 @@ namespace clay {
                 replCommand(line.substr(1, line.size() - 1));
             } else {
                 SourcePtr source = new Source(line, 0);
-                vector<StatementPtr> stmts;
-                vector<TopLevelItemPtr> toplevels;
-                vector<ImportPtr> imports;
                 try {
-                    parseInteractive(source, 0, source->size(), toplevels, imports, stmts);
-                    loadImports(imports);
-                    jitTopLevel(toplevels);
-                    jitStatements(stmts);
+                    ReplItem x = parseInteractive(source, 0, source->size());
+                    loadImports(x.imports);
+                    jitTopLevel(x.toplevels);
+                    jitStatements(x.stmts);
                 }
                 catch (CompilerError) {
                     continue;

diff --git a/compiler/parser.cpp b/compiler/parser.cpp
@@ -3110,13 +3110,7 @@ static bool module(llvm::StringRef moduleName, ModulePtr &x) {
 // REPL
 //
 
-struct REPLitem {
-    vector<TopLevelItemPtr> toplevels;
-    vector<ImportPtr> imports;
-    vector<StatementPtr> stmts;
-};
-
-static bool replItems(REPLitem& x, bool = false) {
+static bool replItems(ReplItem& x, bool = false) {
     x.toplevels.clear();
     x.imports.clear();
     x.stmts.clear();
@@ -3244,16 +3238,11 @@ void parseTopLevelItems(SourcePtr source, int offset, int length,
 // parseInteractive
 //
 
-void parseInteractive(SourcePtr source, int offset, int length,
-                      vector<TopLevelItemPtr>& toplevels,
-                      vector<ImportPtr>& imports,
-                      vector<StatementPtr>& stmts)
+ReplItem parseInteractive(SourcePtr source, int offset, int length)
 {
-    REPLitem x;
+    ReplItem x;
     applyParser(source, offset, length, replItems, false, x);
-    toplevels = x.toplevels;
-    imports = x.imports;
-    stmts = x.stmts;
+    return x;
 }
 
 }
diff --git a/compiler/parser.hpp b/compiler/parser.hpp
@@ -12,17 +12,20 @@ enum ParserFlags
     ParserKeepDocumentation = 1
 };
 
+struct ReplItem {
+    vector<TopLevelItemPtr> toplevels;
+    vector<ImportPtr> imports;
+    vector<StatementPtr> stmts;
+};
+
 ModulePtr parse(llvm::StringRef moduleName, SourcePtr source, ParserFlags flags = NoParserFlags);
 ExprPtr parseExpr(SourcePtr source, int offset, int length);
 ExprListPtr parseExprList(SourcePtr source, int offset, int length);
 void parseStatements(SourcePtr source, int offset, int length,
     vector<StatementPtr> &statements);
 void parseTopLevelItems(SourcePtr source, int offset, int length,
     vector<TopLevelItemPtr> &topLevels, Module *);
-void parseInteractive(SourcePtr source, int offset, int length,
-                      vector<TopLevelItemPtr>& toplevels,
-                      vector<ImportPtr>& imports,
-                      vector<StatementPtr>& stmts);
+ReplItem parseInteractive(SourcePtr source, int offset, int length);
 
 typedef vector<Token>(*AddTokensCallback)();
 void setAddTokens(AddTokensCallback f);