mr4th-public
/
4coder
1
Fork 0
Code Issues Releases Activity

Fixed up the file enumeration on windows, added invoke to the 4is parser rules

master
Allen Webster 2018-03-09 15:19:32 -08:00
parent 16bb223770
commit c48dbaa6dc
11 changed files with 207 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
4coder_file.h
View File

@ -51,8 +51,8 @@ struct Cross_Platform_File_Info{
struct Cross_Platform_File_List{ struct Cross_Platform_File_List{
Cross_Platform_File_Info *info; Cross_Platform_File_Info *info;
int32_t count; int32_t count;
int32_t final_length; int32_t path_length;
Filename_Character final_name[4096]; Filename_Character path_name[4096];
}; };
typedef bool32 File_Filter(Filename_Character *name, int32_t len); typedef bool32 File_Filter(Filename_Character *name, int32_t len);
@ -147,46 +147,59 @@ filter_is_code_file(Filename_Character *name, int32_t len){
//// WINDOWS BEGIN //// //// WINDOWS BEGIN ////
static Cross_Platform_File_List static Cross_Platform_File_List
get_file_list(Partition *part, Filename_Character *dir, File_Filter *filter){ get_file_list(Partition *part, Filename_Character *pattern, File_Filter *filter){
if (part == 0){ if (part == 0){
fprintf(stdout, "fatal error: NULL part passed to %s\n", __FUNCTION__); fprintf(stdout, "fatal error: NULL part passed to %s\n", __FUNCTION__);
exit(1); exit(1);
} }
if (dir == 0){ if (pattern == 0){
fprintf(stdout, "fatal error: NULL dir passed to %s\n", __FUNCTION__); fprintf(stdout, "fatal error: NULL pattern passed to %s\n", __FUNCTION__);
exit(1); exit(1);
} }
int32_t pattern_length = 0;
for (; pattern[pattern_length] != 0; ++pattern_length);
int32_t last_slash = pattern_length;
for (; last_slash > 0 && pattern[last_slash] != SLASH; --last_slash);
if (last_slash < 0){
fprintf(stdout, "fatal error: invalid file pattern\n");
exit(1);
}
pattern[last_slash] = 0;
HANDLE dir_handle = HANDLE dir_handle =
CreateFile(dir, CreateFile(pattern,
FILE_LIST_DIRECTORY, FILE_LIST_DIRECTORY,
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
0, 0,
OPEN_EXISTING, OPEN_EXISTING,
FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED,
0); 0);
pattern[last_slash] = SLASH;
if (dir_handle == INVALID_HANDLE_VALUE){ if (dir_handle == INVALID_HANDLE_VALUE){
fprintf(stdout, "fatal error: could not open directory handle\n"); fprintf(stdout, "fatal error: could not open directory handle\n");
exit(1); exit(1);
} }
Filename_Character final_name[4096]; Filename_Character path_name[4096];
DWORD final_length = GetFinalPathNameByHandle(dir_handle, final_name, sizeof(final_name), 0); DWORD path_length = GetFinalPathNameByHandle(dir_handle, path_name, sizeof(path_name), 0);
if (final_length > sizeof(final_name)){ if (path_length > sizeof(path_name)){
fprintf(stdout, "fatal error: path name too long for local buffer\n"); fprintf(stdout, "fatal error: path name too long for local buffer\n");
exit(1); exit(1);
} }
CloseHandle(dir_handle); CloseHandle(dir_handle);
final_length -= 4; path_length -= 4;
memmove(final_name, final_name + 4, final_length*sizeof(*final_name)); memmove(path_name, path_name + 4, path_length*sizeof(*path_name));
final_name[final_length] = '\\'; path_name[path_length] = 0;
final_name[final_length + 1] = '*';
final_name[final_length + 2] = 0; // TODO(allen): // TODO(allen): // TODO(allen): // TODO(allen): // TODO(allen):
// TODO(allen): // TODO(allen): // TODO(allen): // TODO(allen): // TODO(allen):
// Get this working with the new search by pattern structure!!!
WIN32_FIND_DATA find_data = {0}; WIN32_FIND_DATA find_data = {0};
HANDLE search = FindFirstFile(final_name, &find_data); HANDLE search = FindFirstFile(pattern, &find_data);
if (search == INVALID_HANDLE_VALUE){ if (search == INVALID_HANDLE_VALUE){
fprintf(stdout, "fatal error: could not begin a file search\n"); fprintf(stdout, "fatal error: could not begin a file search\n");
exit(1); exit(1);
@ -235,7 +248,7 @@ get_file_list(Partition *part, Filename_Character *dir, File_Filter *filter){
Cross_Platform_File_Info *info_ptr_base = info_ptr; Cross_Platform_File_Info *info_ptr_base = info_ptr;
search = FindFirstFile(final_name, &find_data); search = FindFirstFile(pattern, &find_data);
if (search == INVALID_HANDLE_VALUE){ if (search == INVALID_HANDLE_VALUE){
fprintf(stdout, "fatal error: could not restart a file search\n"); fprintf(stdout, "fatal error: could not restart a file search\n");
exit(1); exit(1);
@ -281,9 +294,9 @@ get_file_list(Partition *part, Filename_Character *dir, File_Filter *filter){
list.info = info_ptr_base; list.info = info_ptr_base;
list.count = adjusted_file_count; list.count = adjusted_file_count;
list.final_length = final_length; list.path_length = path_length;
memcpy(list.final_name, final_name, list.final_length*sizeof(*final_name)); memcpy(list.path_name, path_name, list.path_length*sizeof(*path_name));
list.final_name[list.final_length] = 0; list.path_name[list.path_length] = 0;
return(list); return(list);
} }

28
4coder_metadata_generator.cpp
View File

@ -633,16 +633,22 @@ parse_file(Partition *part, Meta_Command_Entry_Arrays *entry_arrays, Filename_Ch
} }
static void static void
parse_files_in_directory(Partition *part, Meta_Command_Entry_Arrays *entry_arrays, Filename_Character *root, bool32 recursive){ parse_files_by_pattern(Partition *part, Meta_Command_Entry_Arrays *entry_arrays, Filename_Character *pattern, bool32 recursive){
Cross_Platform_File_List list = get_file_list(part, root, filter_is_code_file); Cross_Platform_File_List list = get_file_list(part, pattern, filter_is_code_file);
for (int32_t i = 0; i < list.count; ++i){ for (int32_t i = 0; i < list.count; ++i){
Cross_Platform_File_Info *info = &list.info[i]; Cross_Platform_File_Info *info = &list.info[i];
if (info->is_folder && match(make_string(info->name, info->len), "4coder_generated")){ if (info->is_folder && match(make_string(info->name, info->len), "4coder_generated")){
continue; continue;
} }
if (!recursive && info->is_folder){
continue;
}
int32_t full_name_len = list.final_length + 1 + info->len; int32_t full_name_len = list.path_length + 1 + info->len;
if (info->is_folder){
full_name_len += 2;
}
Filename_Character *full_name = push_array(part, Filename_Character, full_name_len + 1); Filename_Character *full_name = push_array(part, Filename_Character, full_name_len + 1);
push_align(part, 8); push_align(part, 8);
@ -651,16 +657,18 @@ parse_files_in_directory(Partition *part, Meta_Command_Entry_Arrays *entry_array
exit(1); exit(1);
} }
memmove(full_name, list.final_name, list.final_length*sizeof(*full_name)); memmove(full_name, list.path_name, list.path_length*sizeof(*full_name));
full_name[list.final_length] = SLASH; full_name[list.path_length] = SLASH;
memmove(full_name + list.final_length + 1, info->name, info->len*sizeof(*full_name)); memmove(full_name + list.path_length + 1, info->name, info->len*sizeof(*full_name));
full_name[full_name_len] = 0; full_name[full_name_len] = 0;
if (!info->is_folder){ if (!info->is_folder){
parse_file(part, entry_arrays, full_name, full_name_len); parse_file(part, entry_arrays, full_name, full_name_len);
} }
else{ else{
parse_files_in_directory(part, entry_arrays, full_name, recursive); full_name[full_name_len - 2] = SLASH;
full_name[full_name_len - 1] = '*';
parse_files_by_pattern(part, entry_arrays, full_name, true);
} }
} }
} }
@ -671,7 +679,7 @@ show_usage(int argc, char **argv){
if (argc >= 1){ if (argc >= 1){
name = argv[0]; name = argv[0];
} }
fprintf(stdout, "usage:\n%s [-R] <4coder-root-directory> <scan-root-directory> [<scan-root-directory2> ...]\n", name); fprintf(stdout, "usage:\n%s [-R] <4coder-root-directory> <input-file-pattern> [<input-file-pattern> ...]\n", name);
exit(0); exit(0);
} }
@ -700,8 +708,8 @@ main(int argc, char **argv){
Meta_Command_Entry_Arrays entry_arrays = {0}; Meta_Command_Entry_Arrays entry_arrays = {0};
for (int32_t i = start_i; i < argc; ++i){ for (int32_t i = start_i; i < argc; ++i){
Filename_Character *root_name = encode(part, argv[i]); Filename_Character *pattern_name = encode(part, argv[i]);
parse_files_in_directory(part, &entry_arrays, root_name, recursive); parse_files_by_pattern(part, &entry_arrays, pattern_name, recursive);
} }
int32_t out_dir_len = str_size(out_directory); int32_t out_dir_len = str_size(out_directory);

9
build_metadata.bat
View File

@ -1,13 +1,14 @@
@echo off @echo off
SET OPTS=/W4 /wd4310 /wd4100 /wd4201 /wd4505 /wd4996 /wd4127 /wd4510 /wd4512 /wd4610 /wd4390 /WX set OPTS=/W4 /wd4310 /wd4100 /wd4201 /wd4505 /wd4996 /wd4127 /wd4510 /wd4512 /wd4610 /wd4390 /WX
SET OPTS=%OPTS% /GR- /EHa- /nologo /FC set OPTS=%OPTS% /GR- /EHa- /nologo /FC
pushd ..\build pushd ..\build
cl %OPTS% ..\code\4coder_metadata_generator.cpp /Zi /Femetadata_generator cl %OPTS% ..\code\4coder_metadata_generator.cpp /Zi /Femetadata_generator
popd popd
SET CODE_HOME=%~dp0 set code_home=%~dp0
..\build\metadata_generator -R "%CODE_HOME% " "%CODE_HOME% " if %code_home:~-1%==\ (set code_home=%code_home:~0,-1%)
..\build\metadata_generator -R "%code_home%" "%code_home%\*"

4
build_tests.bat
View File

@ -21,5 +21,7 @@ cl %opts% %inc% %code_home%\meta\4ed_test_builder.cpp /Zi /Fetest_builder
popd popd
pushd %data_home% pushd %data_home%
%build_home%\test_builder %code_home%\test_scripts %build_home%\test_builder %code_home%\test_scripts\test_full_click.4is
%build_home%\test_builder %code_home%\test_scripts\test_write_4coder_awesomeness.4is
%build_home%\test_builder %code_home%\test_scripts\test_bootstrap.4is
popd popd

25
buildsuper_x64.bat
View File

@ -4,23 +4,24 @@ REM This stores the path of the buildsuper.bat script
REM in CODE_HOME. This way you can always include the REM in CODE_HOME. This way you can always include the
REM default files no matter where you store your code. REM default files no matter where you store your code.
REM And no matter how you call buildsuper.bat. REM And no matter how you call buildsuper.bat.
SET CODE_HOME=%~dp0 set code_home=%~dp0
if %code_home:~-1%==\ (set code_home=%code_home:~0,-1%)
IF NOT "%Platform%" == "X64" IF NOT "%Platform%" == "x64" (call "%CODE_HOME%\\windows_scripts\\setup_cl_x64.bat") if NOT "%Platform%" == "X64" IF NOT "%Platform%" == "x64" (call "%code_home%\windows_scripts\setup_cl_x64.bat")
SET SRC=%1 set SRC=%1
if "%SRC%" == "" SET SRC=4coder_default_bindings.cpp if "%SRC%" == "" set SRC=4coder_default_bindings.cpp
SET OPTS=/W4 /wd4310 /wd4100 /wd4201 /wd4505 /wd4996 /wd4127 /wd4510 /wd4512 /wd4610 /wd4457 /WX set OPTS=/W4 /wd4310 /wd4100 /wd4201 /wd4505 /wd4996 /wd4127 /wd4510 /wd4512 /wd4610 /wd4457 /WX
SET OPTS=%OPTS% /GR- /nologo /FC set OPTS=%OPTS% /GR- /nologo /FC
SET DEBUG=/Zi set DEBUG=/Zi
SET BUILD_DLL=/LD /link /INCREMENTAL:NO /OPT:REF set BUILD_DLL=/LD /link /INCREMENTAL:NO /OPT:REF
SET EXPORTS=/EXPORT:get_bindings /EXPORT:get_alpha_4coder_version set EXPORTS=/EXPORT:get_bindings /EXPORT:get_alpha_4coder_version
cl /I"%CODE_HOME% " %OPTS% %DEBUG% "%CODE_HOME%4coder_metadata_generator.cpp" /Femetadata_generator cl /I"%code_home%" %OPTS% %DEBUG% "%code_home%\4coder_metadata_generator.cpp" /Femetadata_generator
metadata_generator -R "%CODE_HOME% " "%CODE_HOME% " metadata_generator -R "%code_home%" "%code_home%\*"
cl /I"%CODE_HOME% " %OPTS% %DEBUG% %SRC% /Fecustom_4coder %BUILD_DLL% %EXPORTS% cl /I"%code_home%" %OPTS% %DEBUG% %SRC% /Fecustom_4coder %BUILD_DLL% %EXPORTS%
REM file spammation preventation REM file spammation preventation
del metadata_generator* del metadata_generator*

25
buildsuper_x86.bat
View File

@ -4,23 +4,24 @@ REM This stores the path of the buildsuper.bat script
REM in CODE_HOME. This way you can always include the REM in CODE_HOME. This way you can always include the
REM default files no matter where you store your code. REM default files no matter where you store your code.
REM And no matter how you call buildsuper.bat. REM And no matter how you call buildsuper.bat.
SET CODE_HOME=%~dp0 set code_home=%~dp0
if %code_home:~-1%==\ (set code_home=%code_home:~0,-1%)
IF NOT "%Platform%" == "X86" IF NOT "%Platform%" == "x86" (call "%CODE_HOME%\\windows_scripts\\setup_cl_x86.bat") if NOT "%Platform%" == "X86" IF NOT "%Platform%" == "x86" (call "%code_home%\windows_scripts\setup_cl_x86.bat")
SET SRC=%1 set SRC=%1
if "%SRC%" == "" SET SRC=4coder_default_bindings.cpp if "%SRC%" == "" set SRC=4coder_default_bindings.cpp
SET OPTS=/W4 /wd4310 /wd4100 /wd4201 /wd4505 /wd4996 /wd4127 /wd4510 /wd4512 /wd4610 /wd4457 /WX set OPTS=/W4 /wd4310 /wd4100 /wd4201 /wd4505 /wd4996 /wd4127 /wd4510 /wd4512 /wd4610 /wd4457 /WX
SET OPTS=%OPTS% /GR- /nologo /FC set OPTS=%OPTS% /GR- /nologo /FC
SET DEBUG=/Zi set DEBUG=/Zi
SET BUILD_DLL=/LD /link /INCREMENTAL:NO /OPT:REF set BUILD_DLL=/LD /link /INCREMENTAL:NO /OPT:REF
SET EXPORTS=/EXPORT:get_bindings /EXPORT:get_alpha_4coder_version set EXPORTS=/EXPORT:get_bindings /EXPORT:get_alpha_4coder_version
cl %OPTS% /I"%CODE_HOME% " %DEBUG% "%CODE_HOME%4coder_metadata_generator.cpp" /Femetadata_generator cl %OPTS% /I"%code_home%" %DEBUG% "%code_home%\4coder_metadata_generator.cpp" /Femetadata_generator
metadata_generator -R "%CODE_HOME% " "%CODE_HOME% " metadata_generator -R "%code_home%" "%code_home%\*"
cl %OPTS% /I"%CODE_HOME% " %DEBUG% "%SRC%" /Fecustom_4coder %BUILD_DLL% %EXPORTS% cl %OPTS% /I"%code_home%" %DEBUG% "%SRC%" /Fecustom_4coder %BUILD_DLL% %EXPORTS%
REM file spammation preventation REM file spammation preventation
del metadata_generator* del metadata_generator*

137
meta/4ed_test_builder.cpp
View File

@ -201,12 +201,20 @@ require_integer(Line_Parse_Context context, i32 index, i32 *int_out){
} }
internal bool32 internal bool32
require_string(Line_Parse_Context context, i32 index, String *str_out){ require_unquoted_string(Line_Parse_Context context, i32 index, String *str_out){
bool32 result = false; bool32 result = false;
if (index < context.words.count){ if (index < context.words.count){
*str_out = context.words.strings[index]; String str = context.words.strings[index];
if (str.str[0] != '"'){
*str_out = str;
result = true; result = true;
} }
else{
show_error(context,
context.words.strings[context.words.count - 1].str,
"expected a simple word (a simple word must be unquoted)");
}
}
else{ else{
show_error(context, show_error(context,
context.words.strings[context.words.count - 1].str, context.words.strings[context.words.count - 1].str,
@ -215,6 +223,11 @@ require_string(Line_Parse_Context context, i32 index, String *str_out){
return(result); return(result);
} }
internal bool32
require_any_string(Line_Parse_Context context, i32 index, String *str_out){
bool32 result = require_unquoted_string(context, index, str_out);
return(result);
}
internal bool32 internal bool32
key_name_to_code(Line_Parse_Context context, String key_name, u32 *key_code_out){ key_name_to_code(Line_Parse_Context context, String key_name, u32 *key_code_out){
@ -241,10 +254,6 @@ key_name_to_code(Line_Parse_Context context, String key_name, u32 *key_code_out)
KEY_CODE_CHK(key_page_up); KEY_CODE_CHK(key_page_up);
KEY_CODE_CHK(key_page_down); KEY_CODE_CHK(key_page_down);
KEY_CODE_CHK(key_esc); KEY_CODE_CHK(key_esc);
KEY_CODE_CHK(key_mouse_left);
KEY_CODE_CHK(key_mouse_right);
KEY_CODE_CHK(key_mouse_left_release);
KEY_CODE_CHK(key_mouse_right_release);
KEY_CODE_CHK(key_f1); KEY_CODE_CHK(key_f1);
KEY_CODE_CHK(key_f2); KEY_CODE_CHK(key_f2);
KEY_CODE_CHK(key_f3); KEY_CODE_CHK(key_f3);
@ -262,6 +271,8 @@ key_name_to_code(Line_Parse_Context context, String key_name, u32 *key_code_out)
KEY_CODE_CHK(key_f15); KEY_CODE_CHK(key_f15);
KEY_CODE_CHK(key_f16); KEY_CODE_CHK(key_f16);
KEY_CODE_CHK_SET("key_space", ' '); KEY_CODE_CHK_SET("key_space", ' ');
KEY_CODE_CHK_SET("key_newline", '\n');
KEY_CODE_CHK_SET("key_tab", '\t');
} }
if (!result){ if (!result){
@ -292,8 +303,7 @@ mod_name_to_flags(Line_Parse_Context context, Partition *part, String mod_name,
MDFR_FLAG_CHK(MDFR_SHIFT); MDFR_FLAG_CHK(MDFR_SHIFT);
else{ else{
result = false; result = false;
show_error(context, flag_string.str, show_error(context, flag_string.str, "unrecognized flag string");
"unrecognized flag string");
break; break;
} }
@ -306,25 +316,27 @@ mod_name_to_flags(Line_Parse_Context context, Partition *part, String mod_name,
} }
internal void internal void
process_script_inner(Partition *part, char *name){ process_script_inner(Partition *scratch, char *name){
String data = file_dump(part, name); String data = file_dump(scratch, name);
String_Array lines = get_lines(part, data); String_Array lines = get_lines(scratch, data);
Simulation_Event *events = push_array(part, Simulation_Event, 0); Simulation_Event *events = push_array(scratch, Simulation_Event, 0);
i32 event_count = 0; i32 event_count = 0;
i32 time_counter = 0; i32 time_counter = 0;
for (i32 i = 0; i < lines.count; ++i){ for (i32 i = 0; i < lines.count; ++i){
Temp_Memory word_temp = begin_temp_memory(part); Temp_Memory word_temp = begin_temp_memory(scratch);
String line = lines.strings[i]; String line = lines.strings[i];
String_Array words = get_words(part, line); String_Array words = get_words(scratch, line);
Line_Parse_Context context = {0}; Line_Parse_Context context = {0};
context.name = name; context.name = name;
context.data = data; context.data = data;
context.words = words; context.words = words;
i32 current_debug_number = 0;
bool32 emit_event = false; bool32 emit_event = false;
Simulation_Event event = {0}; Simulation_Event event = {0};
@ -332,9 +344,13 @@ process_script_inner(Partition *part, char *name){
i32 type_increment = 0; i32 type_increment = 0;
String type_string = {0}; String type_string = {0};
bool32 emit_invoke = false;
String invoke_file = {0};
if (words.count != 0){ if (words.count != 0){
String first_word = words.strings[0]; String first_word = words.strings[0];
if (!match(substr(first_word, 0, 2), "//")){ if (!match(substr(first_word, 0, 2), "//")){
if (match(first_word, "debug_number")){ if (match(first_word, "debug_number")){
i32 debug_number = 0; i32 debug_number = 0;
if (require_integer(context, 1, &debug_number) && if (require_integer(context, 1, &debug_number) &&
@ -343,11 +359,13 @@ process_script_inner(Partition *part, char *name){
event.counter_index = time_counter; event.counter_index = time_counter;
event.type = SimulationEvent_DebugNumber; event.type = SimulationEvent_DebugNumber;
event.debug_number = debug_number; event.debug_number = debug_number;
current_debug_number = debug_number;
} }
else{ else{
return; return;
} }
} }
else if (match(first_word, "wait")){ else if (match(first_word, "wait")){
i32 increment = 0; i32 increment = 0;
if (require_integer(context, 1, &increment) && if (require_integer(context, 1, &increment) &&
@ -358,16 +376,17 @@ process_script_inner(Partition *part, char *name){
return; return;
} }
} }
else if (match(first_word, "key")){ else if (match(first_word, "key")){
String key_name = {0}; String key_name = {0};
String mod_name = {0}; String mod_name = {0};
if (require_string(context, 1, &key_name) && if (require_unquoted_string(context, 1, &key_name) &&
require_string(context, 2, &mod_name) && require_unquoted_string(context, 2, &mod_name) &&
require_blank(context, 3)){ require_blank(context, 3)){
u32 key_code = 0; u32 key_code = 0;
u8 modifiers = 0; u8 modifiers = 0;
if (key_name_to_code(context, key_name, &key_code) && if (key_name_to_code(context, key_name, &key_code) &&
mod_name_to_flags(context, part, mod_name, &modifiers)){ mod_name_to_flags(context, scratch, mod_name, &modifiers)){
emit_event = true; emit_event = true;
event.counter_index = time_counter; event.counter_index = time_counter;
event.type = SimulationEvent_Key; event.type = SimulationEvent_Key;
@ -382,11 +401,12 @@ process_script_inner(Partition *part, char *name){
return; return;
} }
} }
else if (match(first_word, "type")){ else if (match(first_word, "type")){
i32 increment = 0; i32 increment = 0;
String string = {0}; String string = {0};
if (require_integer(context, 1, &increment) && if (require_integer(context, 1, &increment) &&
require_string(context, 2, &string) && require_unquoted_string(context, 2, &string) &&
require_blank(context, 3)){ require_blank(context, 3)){
emit_type = true; emit_type = true;
type_increment = increment; type_increment = increment;
@ -396,6 +416,19 @@ process_script_inner(Partition *part, char *name){
return; return;
} }
} }
else if (match(first_word, "invoke")){
String file = {0};
if (require_any_string(context, 1, &file) &&
require_blank(context, 2)){
emit_invoke = true;
invoke_file = file;
}
else{
return;
}
}
else if (match(first_word, "mouse_left_press")){ else if (match(first_word, "mouse_left_press")){
if (require_blank(context, 1)){ if (require_blank(context, 1)){
emit_event = true; emit_event = true;
@ -406,6 +439,7 @@ process_script_inner(Partition *part, char *name){
return; return;
} }
} }
else if (match(first_word, "mouse_right_press")){ else if (match(first_word, "mouse_right_press")){
if (require_blank(context, 1)){ if (require_blank(context, 1)){
emit_event = true; emit_event = true;
@ -416,6 +450,7 @@ process_script_inner(Partition *part, char *name){
return; return;
} }
} }
else if (match(first_word, "mouse_left_release")){ else if (match(first_word, "mouse_left_release")){
if (require_blank(context, 1)){ if (require_blank(context, 1)){
emit_event = true; emit_event = true;
@ -426,6 +461,7 @@ process_script_inner(Partition *part, char *name){
return; return;
} }
} }
else if (match(first_word, "mouse_right_release")){ else if (match(first_word, "mouse_right_release")){
if (require_blank(context, 1)){ if (require_blank(context, 1)){
emit_event = true; emit_event = true;
@ -436,6 +472,7 @@ process_script_inner(Partition *part, char *name){
return; return;
} }
} }
else if (match(first_word, "mouse_wheel")){ else if (match(first_word, "mouse_wheel")){
i32 wheel = 0; i32 wheel = 0;
if (require_integer(context, 1, &wheel) && if (require_integer(context, 1, &wheel) &&
@ -449,6 +486,7 @@ process_script_inner(Partition *part, char *name){
return; return;
} }
} }
else if (match(first_word, "mouse_xy")){ else if (match(first_word, "mouse_xy")){
i32 x = 0; i32 x = 0;
i32 y = 0; i32 y = 0;
@ -465,6 +503,7 @@ process_script_inner(Partition *part, char *name){
return; return;
} }
} }
else if (match(first_word, "exit")){ else if (match(first_word, "exit")){
if (require_blank(context, 1)){ if (require_blank(context, 1)){
emit_event = true; emit_event = true;
@ -475,9 +514,9 @@ process_script_inner(Partition *part, char *name){
return; return;
} }
} }
else{ else{
show_error(name, data, first_word.str, show_error(name, data, first_word.str, "unrecognized control word");
"unrecognized control word");
return; return;
} }
} }
@ -486,7 +525,7 @@ process_script_inner(Partition *part, char *name){
end_temp_memory(word_temp); end_temp_memory(word_temp);
if (emit_event){ if (emit_event){
Simulation_Event *new_event = push_array(part, Simulation_Event, 1); Simulation_Event *new_event = push_array(scratch, Simulation_Event, 1);
memset(new_event, 0, sizeof(*new_event)); memset(new_event, 0, sizeof(*new_event));
*new_event = event; *new_event = event;
event_count += 1; event_count += 1;
@ -494,7 +533,7 @@ process_script_inner(Partition *part, char *name){
if (emit_type){ if (emit_type){
for (i32 j = 0; j < type_string.size; ++j){ for (i32 j = 0; j < type_string.size; ++j){
Simulation_Event *new_event = push_array(part, Simulation_Event, 1); Simulation_Event *new_event = push_array(scratch, Simulation_Event, 1);
memset(new_event, 0, sizeof(*new_event)); memset(new_event, 0, sizeof(*new_event));
new_event->counter_index = time_counter; new_event->counter_index = time_counter;
new_event->type = SimulationEvent_Key; new_event->type = SimulationEvent_Key;
@ -504,10 +543,48 @@ process_script_inner(Partition *part, char *name){
time_counter += type_increment; time_counter += type_increment;
} }
} }
if (emit_invoke){
Temp_Memory invoke_temp = begin_temp_memory(scratch);
char *invoke_name = push_array(scratch, char, invoke_file.size + 1);
push_align(scratch, 8);
memcpy(invoke_name, invoke_file.str, invoke_file.size);
invoke_name[invoke_file.size] = 0;
String invoke_data = file_dump(scratch, invoke_name);
if (invoke_data.str == 0){
show_error(name, data, invoke_file.str, "could not open invoked file");
return;
}
i32 count = *(i32*)invoke_data.str;
Simulation_Event *events = (Simulation_Event*)(invoke_data.str + 4);
Simulation_Event *event = events;
for (i32 i = 0; i < count; ++i, ++event){
event->counter_index = event->counter_index + time_counter;
if (event->type == SimulationEvent_Exit){
count = i + 1;
event->type = SimulationEvent_DebugNumber;
}
if (event->type == SimulationEvent_DebugNumber){
event->debug_number = current_debug_number;
}
}
if (count > 0){
time_counter = events[count - 1].counter_index;
}
end_temp_memory(invoke_temp);
// NOTE(allen): This is pulling back events from inside a
// closed temp block. Don't let it get separated from the
// end_temp_memory call!
void *ptr = push_array(scratch, Simulation_Event, count);
memmove(ptr, events, sizeof(*events)*count);
event_count += count;
}
} }
String out_name_s = front_of_directory(make_string_slowly(name)); String out_name_s = front_of_directory(make_string_slowly(name));
char *out_name = push_array(part, char, out_name_s.size + 1); char *out_name = push_array(scratch, char, out_name_s.size + 1);
memcpy(out_name, out_name_s.str, out_name_s.size); memcpy(out_name, out_name_s.str, out_name_s.size);
Assert(out_name[out_name_s.size - 1] == 's'); Assert(out_name[out_name_s.size - 1] == 's');
out_name[out_name_s.size - 1] = 'd'; out_name[out_name_s.size - 1] = 'd';
@ -526,9 +603,9 @@ process_script_inner(Partition *part, char *name){
} }
internal void internal void
process_script(Partition *part, char *name){ process_script(Partition *scratch, char *name){
Temp_Memory temp = begin_temp_memory(part); Temp_Memory temp = begin_temp_memory(scratch);
process_script_inner(part, name); process_script_inner(scratch, name);
end_temp_memory(temp); end_temp_memory(temp);
} }
@ -550,8 +627,8 @@ main(int argc, char **argv){
for (i32 i = 1; i < argc; ++i){ for (i32 i = 1; i < argc; ++i){
Cross_Platform_File_List files = get_file_list(part, encode(part, argv[i]), filter_all); Cross_Platform_File_List files = get_file_list(part, encode(part, argv[i]), filter_all);
char *final_name = unencode(part, files.final_name, files.final_length); char *path_name = unencode(part, files.path_name, files.path_length);
String final_name_s = make_string_slowly(final_name); String path_name_s = make_string_slowly(path_name);
Cross_Platform_File_Info *info = files.info; Cross_Platform_File_Info *info = files.info;
for (i32 j = 0; j < files.count; ++j, ++info){ for (i32 j = 0; j < files.count; ++j, ++info){
@ -565,12 +642,12 @@ main(int argc, char **argv){
continue; continue;
} }
i32 whole_name_max = final_name_s.size + 1 + s.size + 1; i32 whole_name_max = path_name_s.size + 1 + s.size + 1;
char *whole_name = push_array(part, char, whole_name_max); char *whole_name = push_array(part, char, whole_name_max);
push_align(part, 8); push_align(part, 8);
String w = make_string_cap(whole_name, 0, whole_name_max); String w = make_string_cap(whole_name, 0, whole_name_max);
append(&w, final_name_s); append(&w, path_name_s);
append(&w, '/'); append(&w, '/');
append(&w, s); append(&w, s);
terminate_with_null(&w); terminate_with_null(&w);

2
string/4coder_string_build_num.txt
View File

@ -1,5 +1,5 @@
1 1
0 0
110 111

10
test_scripts/test_bootstrap.4is
View File

@ -7,16 +7,10 @@ key _ MDFR_CTRL
wait 5 wait 5
debug_number 2 debug_number 2
type 2 4coder invoke test_write_4coder_awesomeness.4id
key key_space MDFR_NONE
wait 2
type 2 awesomeness
wait 30 wait 30
mouse_left_press invoke test_full_click.4id
wait 10
mouse_left_release
wait 10 wait 10
mouse_left_press mouse_left_press

6
test_scripts/test_full_click.4is Normal file
View File

@ -0,0 +1,6 @@
mouse_left_press
wait 2
mouse_left_release
exit

6
test_scripts/test_write_4coder_awesomeness.4is Normal file
View File

@ -0,0 +1,6 @@
type 2 4coder
key key_tab MDFR_NONE
wait 2
type 2 awesomeness
exit