From 6eeea5bf7ee3fe34369fdc7277c40b9679a949ed Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@gmail.com>
Date: Wed, 4 Jun 2014 12:48:31 -0400
Subject: [PATCH] Fix parsing via servers.

---
 bitshift/parser/__init__.py | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/bitshift/parser/__init__.py b/bitshift/parser/__init__.py
index 5cd9446..4fea385 100644
--- a/bitshift/parser/__init__.py
+++ b/bitshift/parser/__init__.py
@@ -10,7 +10,13 @@ from pygments import lexers as pgl, util
 from ..languages import LANGS
 from .python import parse_py
 
-_all__ = ["parse", "UnsupportedFileError", "start_parse_servers"]
+__all__ = ["parse", "UnsupportedFileError", "start_parse_servers"]
+
+PARSERS = {
+    "Python": parse_py,
+    "Java": parse_via_server,
+    "Ruby": parse_via_server,
+}
 
 PARSER_COMMANDS = [
         ('Java', ['mvn', '-f',
@@ -99,6 +105,21 @@ def start_parse_servers():
 
     return procs
 
+def parse_via_server(codelet):
+    port = 5001 + codelet.language
+    server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    server_socket.connect(("localhost", port))
+    server_socket.send("%d\n%s" % (len(codelet.code), codelet.code))
+
+    symbols = json.loads(_recv_data(server_socket))
+    symbols = {key: [(name, [tuple(loc)
+        for loc in syms[name]['assignments']],
+        [tuple(loc) for loc in syms[name]['uses']])
+        for name in syms.keys()]
+        for key, syms in symbols.iteritems()}
+
+    codelet.symbols = symbols
+
 def parse(codelet):
     """
     Dispatches the codelet to the correct parser based on its language.
@@ -110,25 +131,7 @@ def parse(codelet):
 
     :type code: Codelet
     """
-
     lang = _lang(codelet)
-    source = codelet.code
     codelet.language = lang
-    server_socket_number = 5001 + lang
-
-    if lang == LANGS.index('Python'):
-        parse_py(codelet)
-
-    else:
-        server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        server_socket.connect(("localhost", server_socket_number))
-        server_socket.send("%d\n%s" % (len(source), source))
-
-        symbols = json.loads(_recv_data(server_socket))
-        symbols = {key: [(name, [tuple(loc)
-            for loc in syms[name]['assignments']],
-            [tuple(loc) for loc in syms[name]['uses']])
-            for name in syms.keys()]
-            for key, syms in symbols.iteritems()}
-
-        codelet.symbols = symbols
+    if lang in PARSERS:
+        PARSERS[lang](codelet)