Menu
▾
▴
[Rapideuphoria-commits] euphoria: struct: * merge trunk into structs branch
|
From: <sc...@op...> - 2014-09-23 10:38:24
|
changeset: d15c746efef8 in /home/euweb/scm/hg_repos/euphoria branch: struct author: Matt Lewis url: http://scm.openeuphoria.org/hg/euphoria?cmd=changeset;node=d15c746efef8 description: * merge trunk into structs branch diffstat: demo/dsearch.ex | 283 ++++++++++ demo/win32/dsearch.exw | 146 ----- docs/installing.txt | 176 +++--- docs/preproc.txt | 11 +- source/be_runtime.c | 18 +- source/block.e | 4 +- source/buildsys.e | 54 +- source/c_decl.e | 14 +- source/cominit.e | 48 +- source/compile.e | 10 +- source/coverage.e | 8 +- source/emit.e | 2 +- source/error.e | 26 +- source/fwdref.e | 10 +- source/global.e | 1 + source/il.e | 56 +- source/inline.e | 2 +- source/intinit.e | 14 +- source/main.e | 4 +- source/make_message_enum.ex | 282 ++++++++++ source/msgtext.e | 1142 ++++++++++++++++++++++++++++-------------- source/parser.e | 259 +++++---- source/platform.e | 2 +- source/scanner.e | 88 +- source/symtab.e | 6 +- source/traninit.e | 76 +- tests/893.map | 5 + tests/t_893.e | 27 + tests/t_callc.e | 18 +- 29 files changed, 1816 insertions(+), 976 deletions(-) diffs (truncated from 4630 to 300 lines): diff -r d4dccbcf4f7c -r d15c746efef8 demo/dsearch.ex --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/demo/dsearch.ex Mon Sep 22 16:37:06 2014 -0400 @@ -0,0 +1,283 @@ +--**** +-- === win32/dsearch.exw +-- +-- search for a .DLL that contains a given routine +-- ==== Usage +-- {{{ +-- eui dsearch [routine] +-- }}} +-- +-- If you don't supply a string on the command line you will be prompted +-- for it. +-- + +-- Some of the common WIN32 .DLLs. Feel free to add more. +include std/types.e +include std/filesys.e +include std/dll.e +include std/machine.e +include std/pipeio.e as pipeio +include std/error.e +include std/sequence.e as stdseq +include std/io.e +include std/console.e + +constant TRUE = 1, FALSE = 0 + +type boolean(integer x) + return x = FALSE or x = TRUE +end type + +type c_routine(integer x) + return x >= -1 and x <= 1000 +end type + +sequence cmd, orig_string + +integer scanned, no_open +scanned = 0 +no_open = 0 + +ifdef WINDOWS then + c_routine FreeLibrary, GetProcAddress, OpenLibrary +end ifdef + +ifdef LINUX then + enum + LH_PIPES, + LH_DATA +end ifdef + +atom string_pointer +sequence routine_name +sequence dll_list +ifdef WINDOWS then + dll_list = { + "kernel32.dll", + "user32.dll", + "gdi32.dll", + "winmm.dll", + "comdlg32.dll", + "comctl32.dll" + } +elsedef + dll_list = {} +end ifdef + +sequence file_list = { `c:\windows\system32`, dir(`c:\windows\system32\*.dll`), "/lib", dir(`/lib/*.so`), "/usr/lib", dir(`/usr/lib/*.so`), "/usr/local/lib", dir("/usr/local/*.so") } + +procedure CSetup() +-- set up C routines that we need: + ifdef WINDOWS then + atom kernel32 + + kernel32 = open_dll("kernel32.dll") + if kernel32 = 0 then + puts(io:STDERR, "Can't open kernel32.dll!\n") + abort(1) + end if + FreeLibrary = define_c_func(kernel32, "FreeLibrary", {C_POINTER}, C_INT) + if FreeLibrary = -1 then + puts(io:STDERR, "Can't find FreeLibrary\n") + console:any_key("Press any key to exit..", io:STDOUT) + abort(1) + end if + GetProcAddress = define_c_func(kernel32, "GetProcAddress", + {C_POINTER, C_POINTER}, C_INT) + if GetProcAddress = -1 then + puts(io:STDERR, "Can't find GetProcAddress\n") + console:any_key("Press any key to exit..", io:STDOUT) + abort(1) + end if + elsifdef LINUX then + -- Linux version is not done with loading dlls because often when loading many + -- dlls on Linux a segmentation fault occurs. Perhaps some libraries conflict + -- with each other. There is no way to use the dlsym, dlopen and dlclose + -- interface such that the dll's init routine isn't called. Since we are not + -- even calling anything from the dlls it is enough to interogate nm for what + -- routines are dynamically exported. + -- See: Ticket #869 + if not file_exists("/usr/bin/nm") then + puts(io:STDERR, "This program requires nm (from the binutils package).\n") + console:any_key("Press any key to exit..", io:STDOUT) + abort(1) + end if + end ifdef +end procedure + +type dl(object x) + ifdef WINDOWS then + return atom(x) + elsifdef LINUX then + return sequence(x) and length(x) = 2 + elsedef + crash("This routine is not yet implemented for your platform") + end ifdef +end type + +function dl_open(sequence name) + ifdef WINDOWS then + return eu:open_dll(name) + elsifdef LINUX then + atom name_string_pointer = allocate_string(name, TRUE) + object pipe = pipeio:exec( "nm -D " & name, pipeio:create() ) + if atom(pipe) then + return 0 + end if + sequence lib = {} + sequence buf + while 1 do + buf = pipeio:read(pipe[pipeio:STDOUT], 256) + if equal(buf, {}) then + exit + end if + lib = lib & buf + end while + return {pipe, stdseq:split(lib, '\n')} + elsedef + crash("Not yet implemented for your platform.\n") + end ifdef + return 0 +end function + +function dl_sym(dl dl_handle, sequence routine_name) + ifdef WINDOWS then + boolean ret = FALSE + string_pointer = allocate(length(routine_name)+4) + poke(string_pointer, routine_name & 0) + if c_func(GetProcAddress, {dl_handle, string_pointer}) then + ret = TRUE + end if + poke(string_pointer + length(routine_name), "A" & 0) + if c_func(GetProcAddress, {dl_handle, string_pointer}) then + ret = TRUE + end if + poke(string_pointer + length(routine_name), "Ex" & 0) + if c_func(GetProcAddress, {dl_handle, string_pointer}) then + ret = TRUE + end if + poke(string_pointer + length(routine_name), "ExA" & 0) + if c_func(GetProcAddress, {dl_handle, string_pointer}) then + ret = TRUE + end if + free(string_pointer) + return ret + elsifdef LINUX then + for i = 1 to length(dl_handle[LH_DATA]) do + sequence line = dl_handle[LH_DATA][i] + if equal(line,{}) then + continue + end if + if t_digit(line[1]) then + integer space_location = find(' ', line) + space_location = find(' ', line, space_location + 1) + if equal(routine_name, line[space_location+1..$]) then + return TRUE + end if + end if + end for + elsedef + crash("Not yet implemented for your platform.\n") + end ifdef + return FALSE +end function + +procedure dl_close(dl dl_handle) + ifdef WINDOWS then + atom code = c_func(FreeLibrary, {dl_handle}) + elsifdef LINUX then + pipeio:kill(dl_handle[LH_PIPES]) + elsedef + crash("Not yet implemented for your platform.\n") + end ifdef +end procedure + +function scan(sequence file_name) +-- process an eligible file + boolean found_in_file + dl lib + integer code + + lib = dl_open(file_name) + if equal(lib, 0) then + no_open += 1 + puts(io:STDERR, file_name & ": Couldn't open.\n") + return 0 + end if + printf(io:STDOUT, "%s: ", {file_name}) + scanned += 1 + found_in_file = FALSE + if dl_sym(lib, routine_name) then + printf(io:STDOUT, "\n\n%s was FOUND in %s\n", {routine_name, file_name}) + found_in_file = TRUE + end if + dl_close(lib) + return found_in_file +end function + +function delete_trailing_white(sequence name) +-- get rid of blanks, tabs, newlines at end of string + while length(name) > 0 do + if find(name[length(name)], "\n\r\t ") then + name = name[1..length(name)-1] + else + exit + end if + end while + return name +end function + +for i = 1 to length(file_list) by 2 do + if integer(file_list[i+1]) then + continue + end if + for j = 1 to length(file_list[i+1]) do + dll_list = append( dll_list, file_list[i] & SLASH & file_list[i+1][j][D_NAME] ) + end for +end for + +CSetup() + +cmd = command_line() -- eui dsearch [string] + +for cmd_i = 3 to length(cmd) do + if cmd_i > length(cmd) then + exit + end if + if equal(cmd[cmd_i], "--lib") then + if cmd_i < length(cmd) then + dll_list = {cmd[cmd_i+1]} + cmd = cmd[1..cmd_i-1] & cmd[cmd_i+2..$] + end if + end if +end for + +if length(cmd) >= 3 then + orig_string = cmd[$] +else + orig_string = delete_trailing_white( console:prompt_string("C function name:") ) +end if + +routine_name = orig_string + +procedure locate(sequence name) + routine_name = name + puts(io:STDOUT, "Looking for " & routine_name & "\n ") + for i = 1 to length(dll_list) do + if scan(dll_list[i]) then + console:any_key("Press any key to exit..", io:STDOUT) + abort(1) + end if + end for + puts(1, '\n') +end procedure + +if length(routine_name) = 0 then + abort(0) +end if + +locate(orig_string) + +puts(io:STDOUT, "\nCouldn't find " & orig_string & '\n') +console:any_key("Press any key to exit..", io:STDOUT) + diff -r d4dccbcf4f7c -r d15c746efef8 demo/win32/dsearch.exw --- a/demo/win32/dsearch.exw Fri Sep 19 15:58:35 2014 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,162 +0,0 @@ ---**** --- === win32/dsearch.exw --- --- search for a .DLL that contains a given routine --- ==== Usage --- {{{ --- eui dsearch [routine] --- }}} --- |