# HG changeset patch
# User Mario de Sousa <msousa@fe.up.pt>
# Date 1306774335 -3600
# Node ID 1b6d8e3df1b2685e7fb835672bcf0f800d92f468
# Parent  0cdf1410bcd8c5a06b901e6208e6f1d5672f4dc1
Fixing algorithm that determines bit size of constants containing underscores.

diff -r 0cdf1410bcd8 -r 1b6d8e3df1b2 absyntax_utils/get_sizeof_datatype.cc
--- a/absyntax_utils/get_sizeof_datatype.cc	Fri May 27 18:01:54 2011 +0100
+++ b/absyntax_utils/get_sizeof_datatype.cc	Mon May 30 17:52:15 2011 +0100
@@ -260,10 +260,12 @@
   if ('\0' == *sval) ERROR;
 
   /* determine the number of bits used... */
-  for (bitsize = 0; '\0' != *sval; sval++, bitsize++) {
+  for (bitsize = 0; '\0' != *sval; sval++) {
     /* consistency check: make sure we only have binary digits! */
-    if (('0' != *sval) && ('1' != *sval))
+    if (('0' != *sval) && ('1' != *sval) && ('_' != *sval))
       ERROR;
+
+    if ('_' != *sval) bitsize ++; /* 1 bits per binary digit */
   }
 
   /* special case... if (value == 0) <=> (bitsize == 0), return bit size of 1 ! */
@@ -291,11 +293,13 @@
   if ('\0' == *sval) ERROR;
 
   /* determine the number of bits used... */
-  for (bitsize = 0; '\0' != *sval; sval++, bitsize += 3 /* 3 bits per octal digit */) {
+  for (bitsize = 0; '\0' != *sval; sval++) {
     /* consistency check: make sure we only have octal digits! */
     /* Assumes ASCII */
-    if (('0' > *sval) || ('7' < *sval))
+    if ((('0' > *sval) || ('7' < *sval)) && ('_' != *sval))
       ERROR;
+
+    if ('_' != *sval) bitsize += 3; /* 3 bits per octal digit */
   }
 
   /* special case... if (value == 0) <=> (bitsize == 0), return bit size of 1 ! */
@@ -326,13 +330,16 @@
   if ('\0' == *sval) ERROR;
 
   /* determine the number of bits used... */
-  for (bitsize = 0; '\0' != *sval; sval++, bitsize += 4 /* 4 bits per hex digit */) {
-    /* consistency check: make sure we only have hex digits! */
+  for (bitsize = 0; '\0' != *sval; sval++) {
+    /* consistency check: make sure we only have hex digits or underscores! */
     /* Assumes ASCII */
     if (!(('0' <= *sval) && ('9' >= *sval)) && 
         !(('A' <= *sval) && ('F' >= *sval)) &&
-        !(('a' <= *sval) && ('b' >= *sval)))
+        !(('a' <= *sval) && ('b' >= *sval)) &&
+        ! ('_' == *sval))
       ERROR;
+
+    if ('_' != *sval) bitsize += 4; /* 4 bits per hex digit */
   }
 
   /* special case... if (value == 0) <=> (bitsize == 0), return bit size of 1 ! */