diff options
| -rw-r--r-- | input.c | 118 |
1 files changed, 94 insertions, 24 deletions
@@ -9,9 +9,10 @@ // This will be the new input system for combining commands with line numbers // Work in progress and far from finished. This is not included when compiling normally. -#define SMODE_MAX_SIZE 64 +#define SMODE_MAX_SIZE 33 +#define SMODE_MAX_INPUT_SIZE 32 -int smode_input(char *single, char **multiple, uint64_t focus) { +int smode_input_and_validator(char *single, char **multiple, uint64_t focus) { // This function checks for valid input // char *single is for p, e, c, q, a // char **multiple is for L, n, x and d. Although it can be expanded to be used in p and e. @@ -27,62 +28,131 @@ int smode_input(char *single, char **multiple, uint64_t focus) { case 'L': /* Check for + (or -) - path 1: If there is a + then check if there is anything else after it. If not then return L+. + path 1: If there is a + then check if there is anything else after it. If not then return L+. (DONEish) 1.1: If there is a anything that is not a number from 0-9 then return '?' (safety check) 1.2: If there is a number after the + then check for another number until there is no more numbers. For example we return L+34 1.3: If there happens to be something that is not a number from 0-9 in 1.2 case then immediately return '?' (safety check) - path 2: If there is a number from 1-9 immediately after the L then keep checking for numbers (between 0-9) until there is no more. - A valid return would be something like L24 - 2.1: If there is anything that is not a number from 1-9 then return '?' + path 2: If there is a number from 1-9 immediately after the L then keep checking for numbers (between 0-9) until there is no more. (DONE) + A valid return would be something like L24 (DONE) + 2.1: If there is anything that is not a number from 1-9 then return '?' (DONE) - path 3: If there is nothing else after the L (in this case just an L) then just return an L + + path 3: If there is nothing else after the L (in this case just an L) then just return an L (DONE) */ + char nums[] = "123456789"; + int L_num_flag = 2; + int plus_num_flag = -1; //If true the if statement will validate if input is valid after the + + int num_flag = -1; // If true the if statement will validate if input is valid after L + if (smode_buf[1] == '+') { + printf("Its a plus!\n"); // Check if its a plus + if (smode_buf[2] == '0') { + L_num_flag = -1; // if 0 then its just invalid immediately + } + + for (int i = 0 ; i < 9 ; i++) { // Check if theres a number after + + if (smode_buf[2] == nums[i]) { + printf("Its a number after + \n"); + plus_num_flag = 0; + break; + } + } } - int num_flag = -1; - char nums[] = "123456789"; - for (int i = 1 ; i < 9 ; i++) { + + if (plus_num_flag == 0) { + int plus_valid_flag = -1; + L_num_flag = -1; // False + char nums_with_zero[] = "0123456789"; + // Check the rest with a loop. Start at 2 + for (int i = 1 ; i < SMODE_MAX_INPUT_SIZE ; i++) { + // Nested loop to check every element in nums_with_zero on the current smode element (i)(outer loop) + for (int j = 0 ; j < 10 ; j++) { + + if(smode_buf[i] == nums_with_zero[j]) {//check if its not a number. It could be the null terminator so we check if it is + if (smode_buf[i+1] == '\n' || smode_buf[i+1] == '\0') { + + // 0 1 2 3 + // L 2 5 8 + L_num_flag = 0; + plus_valid_flag = 0; + printf(" +++ String is valid!\n"); + // success! return the "valid" string. (example: L44) + // Do something to indicate that its successful and break out somehow not sure yet + break; + } + break; + } + + } //inner nested loop + if (plus_valid_flag == 0) { + printf(" +++ Validflag!\n"); + break; + } + + + }//outer nested loop + } + + if (smode_buf[1] == '0') { // [1] because there is no + at 1. Number starts immediately after L + L_num_flag = -1; // if 0 then its just invalid immediately + } + + for (int i = 0 ; i < 9 ; i++) { // Check if it starts with a number if (smode_buf[1] == nums[i]) { + printf("Its a number!\n"); num_flag = 0; break; } } - - int L_num_flag = NULL; - if (num_flag == 0) { - L_num_flag = 0; // True + + if (num_flag == 0) { // Start validating if there are numbers after L + int valid_flag = -1; + L_num_flag = -1; // False char nums_with_zero[] = "0123456789"; // Check the rest with a loop. Start at 2 - for (int i = 2 ; i < SMODE_MAX_SIZE ; i++) { + for (int i = 1 ; i < SMODE_MAX_INPUT_SIZE ; i++) { // Nested loop to check every element in nums_with_zero on the current smode element (i)(outer loop) - for (int j = 0 ; j < 9 ; j++) { + for (int j = 0 ; j < 10 ; j++) { + + if(smode_buf[i] == nums_with_zero[j]) {//check if its not a number. It could be the null terminator so we check if it is + if (smode_buf[i+1] == '\n' || smode_buf[i+1] == '\0') { - if(smode_buf[i] != nums_with_zero[j]) {//check if its not a number. It could be the null terminator so we check if it is - if (smode_buf[i] == '\0') { + // 0 1 2 3 + // L 2 5 8 + L_num_flag = 0; + valid_flag = 0; + printf("Success! String is valid!\n"); // success! return the "valid" string. (example: L44) // Do something to indicate that its successful and break out somehow not sure yet break; } - L_num_flag = -1; // False. + break; } } //inner nested loop - break; // Is this where we break again to get out of the outer loop? + if (valid_flag == 0) { + printf("Validflag!\n"); + break; + } + }//outer nested loop }// num_flag if-statement if (L_num_flag == 0) { + printf("Because the string was valid we return it here!\n"); // actually return the valid string here } if (L_num_flag == -1) { + printf("Because the string was invalid we return '?' here!\n"); // invalid! return '?' } - if (smode_buf[1] == '\0') { + if (smode_buf[1] == '\n') { + printf("L only!\n"); // just return L } @@ -136,8 +206,8 @@ int main () { char *multiple; char single; uint64_t focus = 1; - smode_input(&single, &multiple, focus); - fprintf(stdout, "%s\n", multiple); - free(multiple); + smode_input_and_validator(&single, &multiple, focus); + //fprintf(stdout, "%s\n", multiple); + //free(multiple); }
\ No newline at end of file |