Output compressor

Author: easycoder

ecr/ecr.cpp

@@ -5,8 +5,96 @@
 // Main program
 int main(void)
 {
-  // Read the code file into memory as an array of lines
-  StringArray* codes = readFile((char*)"test.code");
+  char* filename = (char*)"test.eco"; // During development
+
+  FILE *f = fopen(filename, "rb");
+  if (f == NULL) {
+    printf("Could not read file %s\n", filename);
+    return 1;
+  }
+  
+  // Get the size of the file
+  fseek(f, 0, SEEK_END);
+  long fsize = ftell(f);
+  rewind(f);
+
+  // Read the file as a single chunk
+  char* string = (char*)malloc(fsize + 1);
+  if (string != NULL) {
+    fread(string, fsize, 1, f);
+    fclose(f);
+    string[fsize] = 0;
+  } else {
+    printf("Could not allocate memory for %s\n", filename);
+    return 1;
+  }
+
+  // Split the code and key portions
+  char* codes;
+  char* keys;
+  char* keywords;
+  int codeCount = 0;
+  int keyCount = 0;
+  int codeSize;
+  int keySize;
+  int count = 0;
+  int size = 0;
+
+  char* token = strtok(string, "\n");
+  while (token != NULL) {
+    if (strcmp(token, (char*)"-") == 0) {
+      // When - is reached, convert to a list of codes
+      codeCount = count;
+      codeSize = size;
+      codes = (char*)malloc(++codeSize);
+      memcpy(codes, string, codeSize);
+      // Reset the scanner for the keyword list
+      keywords = string + codeSize + 1;
+      count = 0;
+      size = 0;
+      token = strtok(keywords, "\n");
+    } else if (strcmp(token, (char*)"--") == 0) {
+      // When -- is reached, convert to a list of keywords
+      keyCount = count;
+      keySize = size;
+      keys = (char*)malloc(++keySize);
+      memcpy(keys, keywords, keySize);
+      token = strtok(NULL, "\n");
+    } else {
+      // printf("%s\n", token);
+      count++;
+      size += strlen(token) +1;
+      token = strtok(NULL, "\n");
+    }
+  }
+  // Build a StringArray for each part
+  
+  char* ptr = codes;
+  for (int n = 0; n < codeCount; n++) {
+    printf("%s\n", ptr);
+
+    ptr += strlen(ptr) + 1;
+  }
+  printf("-\n");
+  ptr = keys;
+  for (int n = 0; n < keyCount; n++) {
+    printf("%s\n", ptr);
+    ptr += strlen(ptr) + 1;
+  }
+
+  // Convert the file to an array of lines
+  // StringArray* lines = getLines(string, NEWLINE);
+
+  // Dispose of the original file
+  free(string);
+
+
+
+
+  
+/*
+  // Read the compiled script into memory as an array of lines
+  StringArray* codes = readFile((char*)"test.eco");
   if (codes == NULL) {
     return 1;
   }
@@ -18,10 +106,13 @@ int main(void)
     return 1;
   }
   printf("Keys: %d\n", keys->size);
+*/
 
   // debug(codes, keys);
 
-  int result = run(codes, keys);
+  // int result = run(codes, keys);
+
+  // return result;
 
-  return result;
+  return 0;
 }

ecr/ecr.h

@@ -9,8 +9,8 @@
 
 // A struct to hold an array of string buffers and the array size
 struct StringArray {
-  char** array;
   int size;
+  char** array;
 };
 
 // Replace one character with another in situ
@@ -34,7 +34,7 @@ int strpos(char* haystack, char needle) {
   return -1;
 }
 
-// Convert a string to an array of lines, using a specified delimiter.
+// Convert a string to an array of lines, using a specified delimiter. Stop at an empty line.
 StringArray* getLines(char* string, char delimiter) {
   int length = strlen(string);
   int nlines = 0;
@@ -47,6 +47,9 @@ StringArray* getLines(char* string, char delimiter) {
     if (c == delimiter || c == '\0') {
       string[pos] = '\0';
       start = pos + 1;
+      if (string[start] == '\0') {
+        break;
+      }
       nlines++;
     }
     pos++;
@@ -74,35 +77,5 @@ StringArray* getLines(char* string, char delimiter) {
   return mylist;
 }
 
-// Read a file and convert it into an array of strings
-StringArray* readFile(char* filename) {
-  FILE *f = fopen(filename, "rb");
-  if (f == NULL) {
-    printf("Could not read file %s\n", filename);
-    return NULL;
-  };
-  
-  fseek(f, 0, SEEK_END);
-  long fsize = ftell(f);
-  rewind(f);
-
-  char* string = (char*)malloc(fsize + 1);
-  if (string != NULL) {
-    fread(string, fsize, 1, f);
-    fclose(f);
-    string[fsize] = 0;
-  } else {
-    printf("Could not allocate memory for %s\n", filename);
-    return NULL;
-  }
-
-  // Convert the file to an array of lines
-  StringArray* lines = getLines(string, NEWLINE);
-
-  // Dispose of the original file
-  free(string);
-  return lines;
-}
-
 
 #endif