From 01d40c17a4b8ed0c6597ce9c79b436a82e610555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20L=2E=20=C5=A0ijanec?= Date: Tue, 12 May 2020 18:54:28 +0200 Subject: separated bvr_command_processor --- a.out | Bin 21132 -> 22400 bytes src/bvr.h | 4 +- src/tape.c | 109 ++++++++++++++++++++++++----------------------------- test/tape-test.bvr | 8 +++- tmp/output.htm | 7 +--- 5 files changed, 58 insertions(+), 70 deletions(-) diff --git a/a.out b/a.out index b61da8e..5f5d85b 100755 Binary files a/a.out and b/a.out differ diff --git a/src/bvr.h b/src/bvr.h index 55b27de..dd26653 100644 --- a/src/bvr.h +++ b/src/bvr.h @@ -12,7 +12,7 @@ #define LINE_COMMAND_CHAR '?' #define WAITING_FOR_COMMAND 8922 #define READING_COMMAND 2343 -#define PROCESSING_COMMAND 346 +#define PROCESSING_COMMAND 346 // not needed #define THE_VOID "/dev/null" #define BVR_INITIAL_VARIABLES_COUNT 128 @@ -24,7 +24,7 @@ int bvr_bvrvar_first_time_set = 1; #define BVR_VER_MAJOR 0 #define BVR_VER_MINOR 1 -#define BVR_VER_PATCH 0 +#define BVR_VER_PATCH 1 #define BVR_PATH_SEPARATOR ' ' #define BVR_INCLUDE_PATH_VAR_NAME "bvr_include_path" diff --git a/src/tape.c b/src/tape.c index 1b1598d..185097b 100644 --- a/src/tape.c +++ b/src/tape.c @@ -10,85 +10,74 @@ #include #include #include +int bvr_command_processor(FILE * page_source_file, FILE * temp_output_file) { + char copy_buffer[COPY_BUFFER_SIZE]; + copy_buffer[(ftell(page_source_file))% COPY_BUFFER_SIZE] = fgetc(page_source_file); + char command_entered = copy_buffer[(ftell(page_source_file))% COPY_BUFFER_SIZE]; + int command_handler_output = SUCCESS;; + // argument_feed = fmemopen (argument_string, strlen (argument_string), "r"); + switch (command_entered) { // switch command + case 'g': + command_handler_output = bvr_handle_get(page_source_file, temp_output_file); + break; + case 's': + command_handler_output = bvr_handle_set(page_source_file, temp_output_file); + break; + case 'i': + command_handler_output = bvr_handle_include(page_source_file, temp_output_file); + break; + case 'm': + command_handler_output = bvr_handle_move(page_source_file, temp_output_file); + break; + case 'b': + fprintf(stderr, "bunden %c\n", command_entered); + command_handler_output = bvr_handle_info(page_source_file, temp_output_file); + break; + default: + fprintf(stderr, "[tape.c] bvr_command_processor: unknown command %c\n", command_entered); + fprintf(temp_output_file, "\nbVerbose unknown command %c\n", command_entered); + } + if(command_handler_output != SUCCESS) { + fprintf(stderr, "[tape.c] bvr_inline_command_processor: command handler for %c returned an error code.\n", command_entered); + fprintf(temp_output_file, "\nbVerbose command handler for %c returned an error code.\n", command_entered); + return FAILURE; + } + return SUCCESS; + +} int bvr_inline_command_processor(FILE * page_source_file, FILE * output_file, char copy_buffer[]) { FILE * temp_output_file = output_file; int what_to_return = SUCCESS; - for(int i = 1; i <= OPENING_COMMAND_TAG_LENGTH; i++) { - copy_buffer[ftell(page_source_file)% COPY_BUFFER_SIZE] = fgetc(page_source_file); // remove opening command tag characters - } + // for(int i = 1; i <= OPENING_COMMAND_TAG_LENGTH; i++) { + // copy_buffer[ftell(page_source_file)% COPY_BUFFER_SIZE] = fgetc(page_source_file); // remove opening command tag characters + // } int command_processor_status = WAITING_FOR_COMMAND; - int argument_length = 0; + // int argument_length = 0; char command_entered; while(copy_buffer[(ftell(page_source_file)-1)% COPY_BUFFER_SIZE] != CLOSING_COMMAND_TAG_CHAR_1 || copy_buffer[ftell(page_source_file)% COPY_BUFFER_SIZE] != CLOSING_COMMAND_TAG_CHAR_2 || command_processor_status == PROCESSING_COMMAND) { copy_buffer[(ftell(page_source_file))% COPY_BUFFER_SIZE] = fgetc(page_source_file); - if(copy_buffer[(ftell(page_source_file)-2)% COPY_BUFFER_SIZE] == LINE_COMMENT_CHAR && command_processor_status == WAITING_FOR_COMMAND) { + if(copy_buffer[(ftell(page_source_file))% COPY_BUFFER_SIZE] == LINE_COMMENT_CHAR && command_processor_status == WAITING_FOR_COMMAND) { temp_output_file = fopen(THE_VOID, "w"); continue; } - if(copy_buffer[(ftell(page_source_file)-2)% COPY_BUFFER_SIZE] == LINE_COMMAND_CHAR && command_processor_status == WAITING_FOR_COMMAND) { - command_entered = copy_buffer[(ftell(page_source_file)-1)% COPY_BUFFER_SIZE]; - command_processor_status = READING_COMMAND; - continue; - } - if(command_processor_status == READING_COMMAND) { - if(++argument_length > COPY_BUFFER_SIZE) { - fprintf(temp_output_file, "\nbVerbose %d bytes till buffer overflow. Decrease argument length (%d), increase COPY_BUFFER_SIZE (%d) or take cover.\n", - COPY_BUFFER_SIZE-argument_length, argument_length, COPY_BUFFER_SIZE); - fprintf(stderr, "[tape.c] bvr_inline_command_processor: %d bytes till buffer overflow. Decrease argument length (%d), increase COPY_BUFFER_SIZE (%d) or take cover.\n", - COPY_BUFFER_SIZE-argument_length, argument_length, COPY_BUFFER_SIZE); - what_to_return = FAILURE; - } - if(copy_buffer[(ftell(page_source_file)-1)% COPY_BUFFER_SIZE] == CLOSING_COMMAND_TAG_CHAR_1 && - copy_buffer[ftell(page_source_file)% COPY_BUFFER_SIZE] == CLOSING_COMMAND_TAG_CHAR_2) { // end of arguments! - char argument_string[argument_length+1]; - for(int i=0; i --- stopped with this bvr file\n"); return FAILURE; } } - copy_buffer[(ftell(page_source_file)% COPY_BUFFER_SIZE)] = fgetc(page_source_file); // remove closing command tag character + // copy_buffer[(ftell(page_source_file)% COPY_BUFFER_SIZE)] = fgetc(page_source_file); // remove closing command tag character return what_to_return; } diff --git a/test/tape-test.bvr b/test/tape-test.bvr index 0d4e496..90a2b2b 100644 --- a/test/tape-test.bvr +++ b/test/tape-test.bvr @@ -1,6 +1,10 @@ +# <@?s 123 123@> +# <@?g 123@> +# <@?b@> +# test navadne datoteke brez ukazov <@?i assets/content/global.bvr @> -<@?i krneski @> -# <@?g post_slug @> +# <@?i krneski @> +<@?g post_slug @> # <@?g bvr_include_path @> # <@?i tape-test-to-includes @> # <@?g included_variable @> diff --git a/tmp/output.htm b/tmp/output.htm index 0117a70..ebc5866 100644 --- a/tmp/output.htm +++ b/tmp/output.htm @@ -18,9 +18,4 @@ - -bVerbose include error. File krneski not found. -command handler for i with argument "krneski" returned an error code. - -bvr_inline_command_processor returned an error status. - +posts/undefined -- cgit v1.2.3