# HG changeset patch
# User Mario de Sousa <msousa@fe.up.pt>
# Date 1340030257 -3600
# Node ID 0b1ee7e7123baf0399a71ba8927c7f30b6e30409
# Parent  7326a065810435f6126db0f4d2be876c9d687c9e
Fix stupid typos (in calculating array dimension)!

diff -r 7326a0658104 -r 0b1ee7e7123b stage3/array_range_check.cc
--- a/stage3/array_range_check.cc	Sat Jun 16 07:41:30 2012 +0100
+++ b/stage3/array_range_check.cc	Mon Jun 18 15:37:37 2012 +0100
@@ -164,29 +164,28 @@
 void *array_range_check_c::visit(subrange_c *symbol) {
 	unsigned long long int dimension = 0; // we use unsigned long long instead of uint64_t since it might just happen to be larger than uint64_t in the platform used for compiling this code!!
 
-/* Determine the size of the array... */
+	/* Determine the size of the array... */
 	if        (VALID_CVALUE( int64, symbol->upper_limit) && VALID_CVALUE( int64, symbol->lower_limit)) {  
 		// do the sums in such a way that no overflow is possible... even during intermediate steps used by compiler!
 		// remember that the result (dimension) is unsigned, while the operands are signed!!
 		// dimension = GET_CVALUE( int64, symbol->upper_limit) - VALID_CVALUE( int64, symbol->lower_limit);
-		if (VALID_CVALUE( int64, symbol->lower_limit) >= 0) {
+		if (GET_CVALUE( int64, symbol->lower_limit) >= 0) {
 			dimension = GET_CVALUE( int64, symbol->upper_limit) - GET_CVALUE( int64, symbol->lower_limit);
 		} else {
 			dimension  = -GET_CVALUE( int64, symbol->lower_limit);
 			dimension +=  GET_CVALUE( int64, symbol->upper_limit);     
 		}
 	} else if (VALID_CVALUE(uint64, symbol->upper_limit) && VALID_CVALUE(uint64, symbol->lower_limit)) {
-		dimension = GET_CVALUE(uint64, symbol->upper_limit) - VALID_CVALUE(uint64, symbol->lower_limit); 
+		dimension = GET_CVALUE(uint64, symbol->upper_limit) - GET_CVALUE(uint64, symbol->lower_limit); 
 	} else if (VALID_CVALUE(uint64, symbol->upper_limit) && VALID_CVALUE( int64, symbol->lower_limit)) {
-		if (VALID_CVALUE( int64, symbol->lower_limit) >= 0) {
-			dimension = GET_CVALUE( int64, symbol->upper_limit) - GET_CVALUE( int64, symbol->lower_limit);
+		if (GET_CVALUE( int64, symbol->lower_limit) >= 0) {
+			dimension = GET_CVALUE(uint64, symbol->upper_limit) - GET_CVALUE( int64, symbol->lower_limit);
 		} else {
-		unsigned long long int lower_ull;
-		lower_ull  = -GET_CVALUE( int64, symbol->lower_limit);
-		dimension  =  GET_CVALUE( int64, symbol->upper_limit) + lower_ull;     
-		/* TODO: check this overflow test, it does not seem to be working. I don't have to go now... Will check later. */
-		if (dimension < lower_ull)
-			STAGE3_ERROR(0, symbol, symbol, "Number of elements in array subrange exceeds maximum number of elements (%llu).", std::numeric_limits< unsigned long long int >::max());
+			unsigned long long int lower_ull;
+			lower_ull  = -GET_CVALUE( int64, symbol->lower_limit);
+			dimension  =  GET_CVALUE(uint64, symbol->upper_limit) + lower_ull;     
+			if (dimension < lower_ull)
+				STAGE3_ERROR(0, symbol, symbol, "Number of elements in array subrange exceeds maximum number of elements (%llu).", std::numeric_limits< unsigned long long int >::max());
 		}
 	} else ERROR;
 
@@ -205,6 +204,29 @@
 }
 
 
+
+
+
+/* integer '(' [array_initial_element] ')' */
+/* array_initial_element may be NULL ! */
+// SYM_REF2(array_initial_elements_c, integer, array_initial_element)
+void *array_range_check_c::visit(array_initial_elements_c *symbol) {
+	if (VALID_CVALUE( int64, symbol->integer) && (GET_CVALUE( int64, symbol->integer) < 0)) 
+		ERROR; /* the IEC 61131-3 syntax guarantees that this value will never be negative! */
+
+	/* TODO: check that the total number of 'initial values' does not exceed the size of the array! */
+
+	return NULL;
+}
+
+
+
+
+
+
+
+
+
 /*********************/
 /* B 1.4 - Variables */
 /*********************/
diff -r 7326a0658104 -r 0b1ee7e7123b stage3/array_range_check.hh
--- a/stage3/array_range_check.hh	Sat Jun 16 07:41:30 2012 +0100
+++ b/stage3/array_range_check.hh	Mon Jun 18 15:37:37 2012 +0100
@@ -63,8 +63,9 @@
     /********************************/
     /* B 1.3.3 - Derived data types */
     /********************************/
-    /* NOTE: we may later want to move this to a visitor that will focus on analysing the data type declarations! */
+    /* NOTE: we may later want to move the following 2 methods to a visitor that will focus on analysing the data type declarations! */
     void *visit(subrange_c *symbol);
+    void *visit(array_initial_elements_c *symbol);
   
     /*********************/
     /* B 1.4 - Variables */