fix event and type handling so breakpoints work (after reconstituting

event.lua)
jbalint · Jun 11, 2015 · 0de4788 · 0de4788
1 parent 0279dd5
commit 0de4788
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/debuglib/event.lua b/debuglib/event.lua
@@ -1,14 +1,8 @@
 Event = {}
+Event.TYPE_COMMAND = "COMMAND"
+Event.TYPE_RESUME = "RESUME"
 
-EventType = {}
---EventType.BREAKPOINT = "BREAKPOINT"
-EventType.COMMAND = "COMMAND"
-EventType.RESUME = "RESUME"
---EventType.METHOD_ENTRY = "METHOD_ENTRY"
---EventType.METHOD_EXIT = "METHOD_EXIT"
---EventType.SINGLE_STEP = "SINGLE_STEP"
-
-function Event:new(thread, type, data)
+function Event.new(thread, type, data)
    local event = {thread=thread, type=type, data=data}
    return event
 end

diff --git a/java_bridge/jclass.lua b/java_bridge/jclass.lua
@@ -152,7 +152,7 @@ function jclass:find_methods(search_name)
 end
 
 -- ============================================================
--- search up the class hierarchy for the first field called `name'
+-- search up the class hierarchy for the first field called `search_name'
 function jclass:find_field(search_name)
    local superclass_method_id_raw = lj_get_method_id(lj_find_class("java/lang/Class"),
 													 "getSuperclass", "", "Ljava/lang/Class;")

diff --git a/java_bridge/jthread.lua b/java_bridge/jthread.lua
@@ -51,6 +51,8 @@ function jthread:handle_events()
 		 elseif m2 then
 			dbgio:print(m2)
 		 end
+	  else
+         error("Bad event type: " .. event.type)
 	  end
    end
 end

diff --git a/test/tsc/tsc_runner.lua b/test/tsc/tsc_runner.lua
@@ -5,7 +5,7 @@ table.insert(arg, 2, "early_return.lua")
 table.insert(arg, 3, "array_assignment.lua")
 
 -- run tsc
-tsc = loadfile("/home/jbalint/bin/tsc")
+tsc = loadfile("tsc")
 tsc()
 
 -- finish
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,8 @@ function jthread:handle_events() @@
     		 elseif m2 then
     			dbgio:print(m2)
     		 end
+    	  else
+             error("Bad event type: " .. event.type)
     	  end
        end
     end
@@ Expand Down @@