update parser to fit LTTV

git-svn-id: http://ltt.polymtl.ca/svn@1412 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/genevent-new/parser.c b/genevent-new/parser.c
index 42c38c316a52e9101cb45a610a82305ff6db88ec..bfa645643fde76932c19559ed7bfec597f2a2429 100644 (file)
--- a/genevent-new/parser.c
+++ b/genevent-new/parser.c
@@ -182,7 +182,6 @@ void getTypeAttributes(parse_file_t *in, type_descriptor_t *t,
 
   t->fmt = NULL;
   t->size = 0;
-  t->alignment = 0;
   
   while(1) {
     token = getToken(in); 
@@ -203,9 +202,6 @@ void getTypeAttributes(parse_file_t *in, type_descriptor_t *t,
     } else if(!strcmp("size",token)) {
       getEqual(in);
       t->size = getSize(in);
-    } else if(!strcmp("align",token)) {
-      getEqual(in);
-      t->alignment = getNumber(in);
     }
   }
 }
@@ -733,10 +729,10 @@ type_descriptor_t *parseType(parse_file_t *in, type_descriptor_t *inType,
                t->already_printed = 0;
     getTypeAttributes(in, t, unnamed_types, named_types);
     //if(t->size == 0) in->error(in, "Sequence has empty size");
-               //Mathieu : we fix enum size to 4 bytes. GCC is always like this.
+               //Mathieu : we fix enum size to target int size. GCC is always like this.
                //fox copy optimisation.
-    if(t->size != 0) in->error(in, "Enum has fixed size of 4.");
-               t->size = 4;
+    if(t->size != 0) in->error(in, "Enum has fixed size of target int.");
+               t->size = 0;
     getRAnglebracket(in);
 
     //<label name=label1 value=n/>
@@ -1243,12 +1239,13 @@ void generateChecksum(char* facName,
   unsigned long crc ;
   int pos;
   event_t * ev;
+  unsigned int i;
 
   crc = crc32(facName);
   for(pos = 0; pos < events->position; pos++){
     ev = (event_t *)(events->array[pos]);
     crc = partial_crc32(ev->name, crc);
-               for(unsigned int i = 0; i < ev->fields.position; i++) {
+               for(i = 0; i < ev->fields.position; i++) {
                        field_t *f = (field_t*)ev->fields.array[i];
       crc = partial_crc32(f->name, crc);
       crc = getTypeChecksum(crc, f->type);

diff --git a/genevent-new/parser.h b/genevent-new/parser.h
index 810c46cb3ee0394d458f60f5c8a8b829ebd1e086..21884fb6d0b82d35f44bd4cc12ee19e5f3e7a799 100644 (file)
--- a/genevent-new/parser.h
+++ b/genevent-new/parser.h
@@ -110,8 +110,7 @@ typedef struct _type_descriptor {
   sequence_t labels_values; // for enumeration
        sequence_t labels_description;
        int     already_printed;
-  sequence_t fields; // for structure, array and sequence
-  int alignment;
+  sequence_t fields; // for structure, array and sequence (field_t type)
 } type_descriptor_t;