Permalink
Browse files

Applied patch with several enhancements to the Debugger, by Herrick M…

…uhlestein, et al.
  • Loading branch information...
1 parent 4b02df2 commit fa14bd0e286aa491d2a9937e7f03f2d7d0663ba5 jasonsantos committed Mar 25, 2009
Showing with 1,485 additions and 736 deletions.
  1. +4 −3 org.keplerproject.ldt.debug.core/META-INF/MANIFEST.MF
  2. +19 −12 org.keplerproject.ldt.debug.core/lua/5.1/debugger/client.lua
  3. +754 −443 org.keplerproject.ldt.debug.core/lua/5.1/remdebug/engine.lua
  4. +10 −1 org.keplerproject.ldt.debug.core/src/org/keplerproject/ldt/debug/core/LuaDebuggerPlugin.java
  5. +47 −10 ...lerproject.ldt.debug.core/src/org/keplerproject/ldt/debug/core/breakpoints/LuaLineBreakpoint.java
  6. +142 −59 ...keplerproject.ldt.debug.core/src/org/keplerproject/ldt/debug/core/launcher/LuaLaunchDelegate.java
  7. +70 −60 org.keplerproject.ldt.debug.core/src/org/keplerproject/ldt/debug/core/model/LuaDebugServer.java
  8. +29 −43 org.keplerproject.ldt.debug.core/src/org/keplerproject/ldt/debug/core/model/LuaDebugTarget.java
  9. +31 −27 org.keplerproject.ldt.debug.core/src/org/keplerproject/ldt/debug/core/model/LuaDebugThread.java
  10. +36 −8 org.keplerproject.ldt.debug.core/src/org/keplerproject/ldt/debug/core/model/LuaStackFrame.java
  11. +3 −0 org.keplerproject.ldt.debug.core/src/org/keplerproject/ldt/debug/core/model/LuaTable.java
  12. +8 −2 org.keplerproject.ldt.debug.core/src/org/keplerproject/ldt/debug/core/model/LuaTableEntry.java
  13. +43 −13 org.keplerproject.ldt.debug.core/src/org/keplerproject/ldt/debug/core/model/LuaVariable.java
  14. +20 −21 ...roject.ldt.debug.core/src/org/keplerproject/ldt/debug/core/source/SourcePathComputerDelegate.java
  15. +2 −2 org.keplerproject.ldt.debug.feature/feature.xml
  16. +2 −2 org.keplerproject.ldt.debug.ui/META-INF/MANIFEST.MF
  17. +5 −1 org.keplerproject.ldt.debug.ui/plugin.xml
  18. +23 −0 org.keplerproject.ldt.debug.ui/src/org/keplerproject/ldt/debug/ui/LuaDebugUIPlugin.java
  19. +59 −2 org.keplerproject.ldt.debug.ui/src/org/keplerproject/ldt/debug/ui/launcher/LuaLaunchShortcut.java
  20. +112 −21 org.keplerproject.ldt.debug.ui/src/org/keplerproject/ldt/debug/ui/launcher/LuaMainTab.java
  21. +33 −2 ...oject.ldt.debug.ui/src/org/keplerproject/ldt/debug/ui/presentation/LuaDebugModelPresentation.java
  22. +4 −2 org.keplerproject.ldt.feature/feature.xml
  23. +29 −2 org.keplerproject.ldt.feature_x64/feature.xml
@@ -2,11 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: LDT Debugger Plug-in
Bundle-SymbolicName: org.keplerproject.ldt.debug.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.3.4.qualifier
Bundle-Activator: org.keplerproject.ldt.debug.core.LuaDebuggerPlugin
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.core
-Eclipse-LazyStart: true
+ org.eclipse.debug.core,
+ org.keplerproject.ldt.launcher;bundle-version="1.2.1"
+Bundle-ActivationPolicy: lazy
Export-Package: org.keplerproject.ldt.debug.core;uses:="org.eclipse.core.runtime,org.osgi.framework",
org.keplerproject.ldt.debug.core.breakpoints;uses:="org.keplerproject.ldt.debug.core.model,org.eclipse.core.resources,org.eclipse.debug.core.model",
org.keplerproject.ldt.debug.core.launcher;uses:="org.eclipse.debug.core,org.eclipse.core.runtime,org.eclipse.debug.core.model",
@@ -1,23 +1,32 @@
+CLIENT_LAUNCH_MODE = true
+
-- to use my own version of remdebug
-- but the system's own luasocket
oldrequire = require
-pcall(require, 'luarocks.require')
+--pcall(require, 'luarocks.require')
require'socket'
print('LuaEclipse RemDebug Client')
-opts = {...}
-options = {}
-files = {}
+local options = {}
+local file
-for k,v in pairs(opts) do
+local killIndices = {}
+for i,v in ipairs(arg) do
if string.sub(v, 1, 2)=='--' then
table.insert(options, string.sub(v, 3))
+ table.insert(killIndices, i)
else
- table.insert(files, v)
+ file = file or v
end
end
+for i = #killIndices,1,-1 do
+ table.remove(arg, i)
+end
+arg[0] = arg[1]
+table.remove(arg, 1)
+
table.foreach(options, function(k,v)
string.gsub(v, '(.*)=(.*)', function(key,value) options[key]=value end)
end)
@@ -27,15 +36,13 @@ package.path=";;"..tostring(options.prefix).."/?.lua"
oldrequire'remdebug.engine'
package.path=path
-remdebug.engine.config{
+remdebug.engine.config {
host = options.host;
port = options.port;
}
print('start', remdebug.engine.start())
-table.foreachi(files, function(_, file)
- local path = string.gsub(file, "(.-)/[^/]-$", "%1") or '.'
- package.path = package.path .. ";" .. path .. "/?.lua"
- dofile(file)
-end)
+local path = string.gsub(file, "(.-)/[^/]-$", "%1") or '.'
+package.path = package.path .. ";" .. path .. "/?.lua"
+remdebug.engine.launch(file)
Oops, something went wrong.

0 comments on commit fa14bd0

Please sign in to comment.