weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Progress 2

Browse Source
This commit is contained in:
FlightControl_Master 2017-11-08 09:41:18 +01:00
parent 7c7722efe6
commit 0a819f254a
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Moose Development/Debugger/debugger.lua
View File

@ -724,6 +724,7 @@ end
--TODO dynamic code handling --TODO dynamic code handling
-- The DBGp specification is not clear about the line number meaning, this implementation is 1-based and numbers are inclusive -- The DBGp specification is not clear about the line number meaning, this implementation is 1-based and numbers are inclusive
function M.source(self, args) function M.source(self, args)
BASE:E( { self = self, args = args } )
local path local path
if args.f then if args.f then
path = platform.get_path(args.f) path = platform.get_path(args.f)
@ -732,11 +733,17 @@ function M.source(self, args)
assert(path:sub(1,1) == "@") assert(path:sub(1,1) == "@")
path = path:sub(2) path = path:sub(2)
end end
BASE:E( { path = path } )
local file, err = io.open(path) local file, err = io.open(path)
if not file then dbgp.error(100, err, { success = 0 }) end if not file then
BASE:E( { "Not found" } )
dbgp.error(100, err, { success = 0 })
end
BASE:E( { "Found" } )
-- Try to identify compiled files -- Try to identify compiled files
if file:read(1) == "\033" then dbgp.error(100, args.f.." is bytecode", { success = 0 }) end --if file:read(1) == "\033" then dbgp.error(100, args.f.." is bytecode", { success = 0 }) end
file:seek("set", 0) BASE:E( { file = file } )
--file:seek("set", 0)
local srclines = { } local srclines = { }
@ -2113,7 +2120,12 @@ end
function M.get_uri (source) function M.get_uri (source)
-- search in cache -- search in cache
if string.sub(1,1) ~= "@" then
source = "@" .. source
end
BASE:E( { source=source, uri_cache = uri_cache } )
local uri = uri_cache[source] local uri = uri_cache[source]
BASE:E( { uri=uri } )
if uri ~= nil then return uri end if uri ~= nil then return uri end
-- not found, create uri -- not found, create uri
@ -3152,8 +3164,8 @@ local function line_hook(line)
local info = active_session.coro:getinfo(0, "S") local info = active_session.coro:getinfo(0, "S")
local ModifiedSource = info.source local ModifiedSource = info.source
ModifiedSource = ModifiedSource:match( '^Scripts/Moose/(.*)' ) or ModifiedSource --ModifiedSource = ModifiedSource:match( '^Scripts/Moose/(.*)' ) or ModifiedSource
ModifiedSource = "@"..ModifiedSource --ModifiedSource = ModifiedSource
local uri = platform.get_uri(ModifiedSource) local uri = platform.get_uri(ModifiedSource)
BASE:E( { "Source", info.source, ModifiedSource, uri, debugger_uri } ) BASE:E( { "Source", info.source, ModifiedSource, uri, debugger_uri } )

2
Moose Development/Moose/Moose.lua
View File

@ -14,6 +14,6 @@ _SETTINGS = SETTINGS:Set()
package.path = package.path..";.\\LuaSocket\\?.lua;" package.path = package.path..";.\\LuaSocket\\?.lua;"
local initconnection = require("debugger") local initconnection = require("debugger")
initconnection( "127.0.0.1", 10000, "dcsserver", nil, "win", "C:/Users/svenv/AppData/Local/Temp/DCS/Mission/l10n/DEFAULT" ) initconnection( "127.0.0.1", 10000, "dcsserver", nil, "win", "" )
print("Debugger is configured!") print("Debugger is configured!")