excel_to_code 0.0.8 → 0.0.9

data/src/commands/excel_to_c.rb

@@ -62,9 +62,13 @@ class ExcelToC < ExcelToX
     o.puts
     o.puts "// Used to decide whether to recalculate a cell"
     o.puts "static int variable_set[#{number_of_refs}];"
+    o.puts ""
+    o.puts "// Used to reset all cached values and free up memory"
+    # FIXME: This feels like a bad place for this. Should be in runtime?
     o.puts "void reset() {"
     o.puts "  int i;"
     o.puts "  cell_counter = 0;"
+    o.puts "  free_all_allocated_memory(); "
     o.puts "  for(i = 0; i < #{number_of_refs}; i++) {"
     o.puts "    variable_set[i] = 0;"
     o.puts "  }"

data/src/compile/c/excel_to_c_runtime.c

@@ -11,6 +11,7 @@
 // Probably bad practice. At the very least, I should make it
 // link to the cell reference in some way.
 #define MAX_EXCEL_VALUE_HEAP_SIZE 1000000
+#define MAX_MEMORY_TO_BE_FREED_HEAP_SIZE 100
 
 #define true 1
 #define false 0
@@ -74,11 +75,34 @@ static ExcelValue sumproduct(int number_of_arguments, ExcelValue *arguments);
 static ExcelValue vlookup_3(ExcelValue lookup_value_v,ExcelValue lookup_table_v, ExcelValue column_number_v);
 static ExcelValue vlookup(ExcelValue lookup_value_v,ExcelValue lookup_table_v, ExcelValue column_number_v, ExcelValue match_type_v);
 
-// My little heap
+// My little heap for excel values
 ExcelValue cells[MAX_EXCEL_VALUE_HEAP_SIZE];
 int cell_counter = 0;
 
-#define HEAPCHECK if(cell_counter >= MAX_EXCEL_VALUE_HEAP_SIZE) { printf("Heap exceeded"); exit(-1); }
+#define HEAPCHECK if(cell_counter >= MAX_EXCEL_VALUE_HEAP_SIZE) { printf("ExcelValue heap full. Edit MAX_EXCEL_VALUE_HEAP_SIZE in the c source code."); exit(-1); }
+
+// My little heap for keeping pointers to memory that I need to reclaim
+void *memory_that_needs_to_be_freed[MAX_MEMORY_TO_BE_FREED_HEAP_SIZE];
+int memory_that_needs_to_be_freed_counter = 0;
+
+#define MEMORY_THAT_NEEDS_TO_BE_FREED_HEAP_CHECK 
+
+static void free_later(void *pointer) {
+	memory_that_needs_to_be_freed[memory_that_needs_to_be_freed_counter] = pointer;
+	memory_that_needs_to_be_freed_counter++;
+	if(memory_that_needs_to_be_freed_counter >= MAX_MEMORY_TO_BE_FREED_HEAP_SIZE) { 
+		printf("Memory that needs to be freed heap full. Edit MAX_MEMORY_TO_BE_FREED_HEAP_SIZE in the c source code"); 
+		exit(-1);
+	}
+}
+
+static void free_all_allocated_memory() {
+	int i;
+	for(i = 0; i < memory_that_needs_to_be_freed_counter; i++) {
+		free(memory_that_needs_to_be_freed[i]);
+	}
+	memory_that_needs_to_be_freed_counter = 0;
+}
 
 // The object initializers
 static ExcelValue new_excel_number(double number) {
@@ -111,11 +135,12 @@ static ExcelValue new_excel_range(void *array, int rows, int columns) {
 };
 
 static void * new_excel_value_array(int size) {
-	ExcelValue *pointer = malloc(sizeof(ExcelValue)*size);
+	ExcelValue *pointer = malloc(sizeof(ExcelValue)*size); // Freed later
 	if(pointer == 0) {
 		printf("Out of memory\n");
 		exit(-1);
 	}
+	free_later(pointer);
 	return pointer;
 };
 
@@ -134,7 +159,6 @@ const ExcelValue EIGHT = {.type = ExcelNumber, .number = 8};
 const ExcelValue NINE = {.type = ExcelNumber, .number = 9};
 const ExcelValue TEN = {.type = ExcelNumber, .number = 10};
 
-
 // Booleans
 const ExcelValue TRUE = {.type = ExcelBoolean, .number = true };
 const ExcelValue FALSE = {.type = ExcelBoolean, .number = false };
@@ -688,17 +712,19 @@ static ExcelValue left(ExcelValue string_v, ExcelValue number_of_characters_v) {
 	int number_of_characters = (int) number_from(number_of_characters_v);
 	CHECK_FOR_CONVERSION_ERROR
 
-	char *string; 
+	char *string;
+	int string_must_be_freed = 0;
 	switch (string_v.type) {
   	  case ExcelString:
   		string = string_v.string;
   		break;
   	  case ExcelNumber:
-		  string = malloc(20);
+		  string = malloc(20); // Freed
 		  if(string == 0) {
 			  printf("Out of memory");
 			  exit(-1);
 		  }
+		  string_must_be_freed = 1;
 		  snprintf(string,20,"%f",string_v.number);
 		  break;
 	  case ExcelBoolean:
@@ -714,13 +740,17 @@ static ExcelValue left(ExcelValue string_v, ExcelValue number_of_characters_v) {
 		return string_v;
 	}
 	
-	char *left_string = malloc(number_of_characters+1);
+	char *left_string = malloc(number_of_characters+1); // Freed
 	if(left_string == 0) {
 	  printf("Out of memory");
 	  exit(-1);
-	}	
+	}
+	free_later(left_string);
 	memcpy(left_string,string,number_of_characters);
 	left_string[number_of_characters] = '\0';
+	if(string_must_be_freed == 1) {
+		free(string);
+	}
 	return new_excel_string(left_string);
 }
 
@@ -1033,27 +1063,31 @@ static ExcelValue roundup(ExcelValue number_v, ExcelValue decimal_places_v) {
 static ExcelValue string_join(int number_of_arguments, ExcelValue *arguments) {
 	int allocated_length = 100;
 	int used_length = 0;
-	char *string = malloc(allocated_length);
+	char *string = malloc(allocated_length); // Freed later
 	if(string == 0) {
 	  printf("Out of memory");
 	  exit(-1);
-	}		
+	}
+	free_later(string);
 	char *current_string;
 	int current_string_length;
+	int must_free_current_string;
 	ExcelValue current_v;
 	int i;
 	for(i=0;i<number_of_arguments;i++) {
+		must_free_current_string = 0;
 		current_v = (ExcelValue) arguments[i];
 		switch (current_v.type) {
   	  case ExcelString:
 	  		current_string = current_v.string;
 	  		break;
   	  case ExcelNumber:
-			  current_string = malloc(20);
+			  current_string = malloc(20); // Freed
 		  	if(current_string == 0) {
 		  	  printf("Out of memory");
 		  	  exit(-1);
-		  	}				  
+		  	}
+			must_free_current_string = 1;				  
 			  snprintf(current_string,20,"%g",current_v.number);
 			  break;
 		  case ExcelBoolean:
@@ -1077,6 +1111,9 @@ static ExcelValue string_join(int number_of_arguments, ExcelValue *arguments) {
 			string = realloc(string,allocated_length);
 		}
 		memcpy(string + used_length, current_string, current_string_length);
+		if(must_free_current_string == 1) {
+			free(current_string);
+		}
 		used_length = used_length + current_string_length;
 	}
 	string = realloc(string,used_length+1);
@@ -1152,7 +1189,7 @@ static ExcelValue sumifs(ExcelValue sum_range_v, int number_of_arguments, ExcelV
   }
   
   // Now go through and set up the criteria
-  ExcelComparison *criteria =  malloc(sizeof(ExcelComparison)*number_of_criteria);
+  ExcelComparison *criteria =  malloc(sizeof(ExcelComparison)*number_of_criteria); // freed at end of function
   if(criteria == 0) {
 	  printf("Out of memory\n");
 	  exit(-1);
@@ -1328,6 +1365,8 @@ static ExcelValue sumifs(ExcelValue sum_range_v, int number_of_arguments, ExcelV
       }
     }
   }
+  // Tidy up
+  free(criteria);
   return new_excel_number(total);
 }
 
@@ -1350,7 +1389,7 @@ static ExcelValue sumproduct(int number_of_arguments, ExcelValue *arguments) {
   int rows;
   int columns;
   ExcelValue current_value;
-  ExcelValue **ranges = malloc(sizeof(ExcelValue *)*number_of_arguments);
+  ExcelValue **ranges = malloc(sizeof(ExcelValue *)*number_of_arguments); // Added free statements
   if(ranges == 0) {
 	  printf("Out of memory\n");
 	  exit(-1);
@@ -1375,9 +1414,11 @@ static ExcelValue sumproduct(int number_of_arguments, ExcelValue *arguments) {
         ranges[a] = current_value.array;
         break;
       case ExcelError:
+		free(ranges);
         return current_value;
         break;
       case ExcelEmpty:
+		free(ranges);
         return VALUE;
         break;
       default:
@@ -1402,6 +1443,7 @@ static ExcelValue sumproduct(int number_of_arguments, ExcelValue *arguments) {
 			sum += product;
 		}
 	}
+	free(ranges);
   	return new_excel_number(sum);
 }
 
@@ -2027,6 +2069,9 @@ int test_functions() {
   ExcelValue sum_array_1[] = {sum_array_0_v};
   assert(sum(1,sum_array_1).number == 1253.8718091935484);
   
+  // Release memory
+  free_all_allocated_memory();
+  
   return 0;
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
-  requirement: &70200979061400 !ruby/object:Gem::Requirement
+  requirement: &70366938770280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70200979061400
+  version_requirements: *70366938770280
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70200979060900 !ruby/object:Gem::Requirement
+  requirement: &70366938769760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70200979060900
+  version_requirements: *70366938769760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70200979060400 !ruby/object:Gem::Requirement
+  requirement: &70366938769220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70200979060400
+  version_requirements: *70366938769220
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70200979050020 !ruby/object:Gem::Requirement
+  requirement: &70366938768740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *70200979050020
+  version_requirements: *70366938768740
 description: ! "# excel_to_code\n\nConverts some excel spreadsheets (.xlsx, not .xls)
   into some other programming languages (currently ruby or c).\nThis allows the excel
   spreadsheets to be run programatically, without excel.\n\nIts cannonical source
@@ -84,11 +84,11 @@ files:
 - src/commands/excel_to_ruby.rb
 - src/commands/excel_to_x.rb
 - src/commands.rb
+- src/compile/c/a.out
 - src/compile/c/compile_to_c.rb
 - src/compile/c/compile_to_c_header.rb
 - src/compile/c/compile_to_c_unit_test.rb
 - src/compile/c/excel_to_c_runtime.c
-- src/compile/c/excel_to_c_runtime.c.out
 - src/compile/c/map_formulae_to_c.rb
 - src/compile/c/map_sheet_names_to_c_names.rb
 - src/compile/c/map_values_to_c.rb