From 52835e0a03cb97a05ee6a5f932a40a396b930a3f Mon Sep 17 00:00:00 2001
From: Tait Hoyem <44244401+TTWNO@users.noreply.github.com>
Date: Thu, 13 Jun 2019 23:45:14 +0000
Subject: [PATCH] Fixed tests. Cause segfault

---
 morse.c | 40 ++++++++++++++++++++++++++++++----------
 test.c  |  9 +++++----
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/morse.c b/morse.c
index b7067c7..2a19ee5 100644
--- a/morse.c
+++ b/morse.c
@@ -6,14 +6,27 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#define NUM_OF_SYMBOLS 37
+#define NUM_OF_SYMBOLS 65
 
-static const char LOWERCASE_LETTERS[NUM_OF_SYMBOLS] = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ' '};
-static const char UPPERCASE_LETTERS[NUM_OF_SYMBOLS] = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ' '};
+static const char SYMBOLS[NUM_OF_SYMBOLS] = {
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+    ' ', '!'};
 
-// 6 spaces are needed to store the null terminator :)
+// 7 spaces are needed to store the null terminator with the extended symbols :)
 // C is fun?
-static const char MORSE[NUM_OF_SYMBOLS][6] = {".-", "-...", "-.-.", "-..", ".", "..-.", "--.", "....", "..", ".---", "-.-", ".-..", "--", "-.", "---", ".--.", "--.-", ".-.", "...", "-", "..-", "...-", ".--", "-..-", "-.--", "--..", ".----", "..---", "...--", "....-", ".....", "-....", "--...", "---..", "----.", "-----", "/"};
+static const char MORSE[NUM_OF_SYMBOLS][7] = {
+    // A-Z
+    ".-", "-...", "-.-.", "-..", ".", "..-.", "--.", "....", "..", ".---", "-.-", ".-..", "--", "-.", "---", ".--.", "--.-", ".-.", "...", "-", "..-", "...-", ".--", "-..-", "-.--", "--..",
+    // a-z (same as above, but needed twice due to design choices)
+    ".-", "-...", "-.-.", "-..", ".", "..-.", "--.", "....", "..", ".---", "-.-", ".-..", "--", "-.", "---", ".--.", "--.-", ".-.", "...", "-", "..-", "...-", ".--", "-..-", "-.--", "--..",
+    // 0-9
+    ".----", "..---", "...--", "....-", ".....", "-....", "--...", "---..", "----.", "-----",
+    // space
+    "/",
+    // exclamation mark
+    "-.-.--"};
 
 // This function returns a pointer to the morse code written above.
 // The genuis of this function feels amazing because I've never used C before, but I see why
@@ -22,27 +35,34 @@ static const char MORSE[NUM_OF_SYMBOLS][6] = {".-", "-...", "-.-.", "-..", ".",
 // I do not copy ANY data. The pointer returned points to the above array!
 const char* char_to_morse(char letter){
     const char* result_ptr;
+    bool result_set = false;
 	for (int i = 0; i < NUM_OF_SYMBOLS; i++){
-		if (letter == UPPERCASE_LETTERS[i] || letter == LOWERCASE_LETTERS[i]){
+		if (letter == SYMBOLS[i]){
             result_ptr = MORSE[i];
+            result_set = true;
 		}
 	}
+    printf("result_ptr: %s\n", result_ptr);
+    if (!result_set){
+        result_ptr = "";
+    }
 	return result_ptr;
 }
 
 char* string_to_morse(char* string){
 	int string_len = strlen(string);
 	// worse possible case is 8 times the length (assuming all numbers/punctuation, and adding spaces)
-	char result[string_len*8];
+    char result[string_len*8];
     char* result_ptr = result;
     // sets everything to null in the string, just in case there was data there previously.
-    strcpy(result, "");
+    //strcpy(result, "");
 	for (int i = 0; i < string_len; i++){
 		strcat(result, char_to_morse(string[i]));
         if (i != string_len-1){
             strcat(result, " ");
         }
 	}
+    printf("result_ptr (long): %s\n", result_ptr);
 	return result_ptr;
 }
 
@@ -76,7 +96,7 @@ void print_single_morse(char charToMorse, bool isSlow, bool addLetter, long dotD
 	// Loop through every character in the list of letters
 	for (int j = 0; j < NUM_OF_SYMBOLS; j++){
 		// If the character in the input string matches the character the character from the list
-		if (charToMorse == LOWERCASE_LETTERS[j] || charToMorse == UPPERCASE_LETTERS[j]){
+		if (charToMorse == SYMBOLS[j]){
 			strcpy(convertedTo, MORSE[j]);
 			sizeOfMorseCode = strlen(MORSE[j]);	
 			isConvertable = true;
@@ -134,7 +154,7 @@ void reverse_morse(char* morseToNormalize){
 		// if the morse code is euqal to the input string
 		if (strcmp(MORSE[i], morseToNormalize) == 0){
 			isConvertable = true;
-			convertedChar = UPPERCASE_LETTERS[i];
+			convertedChar = SYMBOLS[i];
 		}
 	}
 	if (isConvertable){
diff --git a/test.c b/test.c
index 81f9c08..a516768 100644
--- a/test.c
+++ b/test.c
@@ -45,7 +45,7 @@ void assert_ctm(char input, char* output){
 void assert_stm(char* input, char* output){
     char result[strlen(input)*8];
     // fill with blanks in case of previous data
-    strcpy(result, "");
+//    strcpy(result, "");
     strcpy(result, string_to_morse(input));
     assert_str_eq(result, output);
 }
@@ -111,10 +111,11 @@ void test_to_morse(){
 }
 
 void test_string_to_morse(){
-    assert_stm("Hello", ".... . .-. .-. .."); 
+    assert_stm("Wee!", ".-- . . . -.-.--");
+    assert_stm("Hello", ".... . .-. .-. ---"); 
     assert_stm("world", ".-- --- .-. .-.. -.."); 
-    assert_stm("Hello world!", ".... . .-. .-. .--- / .-- --- .-. .-.. -.. / -.-.--");
-    assert_stm("I! HATE! YOU!", ".. -.-.-- / .... .- - . -.-.-- / -.-- -- ..- -.-.--");
+    assert_stm("Hello world!", ".... . .-.. .-.. --- / .-- --- .-. .-.. -.. -.-.--");
+    assert_stm("I! HATE! YOU!", ".. -.-.-- / .... .- - . -.-.-- / -.-- --- ..- -.-.--");
 }
 
 void all_tests(){