* update EXI codec to latest given schema

git-svn-id: https://svn.code.sf.net/p/openv2g/code/trunk@42 d9f2db14-54d0-4bde-b00c-16405c910529

src/codec/AbstractDecoderChannel.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>
@@ -495,7 +495,7 @@ int decodeBinary(bitstream_t* stream, bytes_t* bytes) {
  * Decode Date-Time as sequence of values representing the individual
  * components of the Date-Time.
  */
-int decodeDateTime(bitstream_t* stream, datetime_type_t type, datetime_t* datetime){
+int decodeDateTime(bitstream_t* stream, exi_datetime_type_t type, datetime_t* datetime){
 	int errn;
 
 	datetime->type = type;
@@ -509,15 +509,15 @@ int decodeDateTime(bitstream_t* stream, datetime_type_t type, datetime_t* dateti
 	datetime->timezone = 0;
 
 	switch (type) {
-	case gYear: /* Year, [Time-Zone] */
+	case exiGYear: /* Year, [Time-Zone] */
 		errn = decodeInteger32(stream, &datetime->year);
 		if (errn < 0) {
 			return errn;
 		}
 		datetime->year += DATETIME_YEAR_OFFSET;
 		break;
-	case gYearMonth: /* Year, MonthDay, [TimeZone] */
-	case date:
+	case exiGYearMonth: /* Year, MonthDay, [TimeZone] */
+	case exiDate:
 		errn = decodeInteger32(stream, &datetime->year);
 		if (errn < 0) {
 			return errn;
@@ -525,7 +525,7 @@ int decodeDateTime(bitstream_t* stream, datetime_type_t type, datetime_t* dateti
 		datetime->year += DATETIME_YEAR_OFFSET;
 		errn = decodeNBitUnsignedInteger(stream, DATETIME_NUMBER_BITS_MONTHDAY, &datetime->monthDay);
 		break;
-	case dateTime: /* Year, MonthDay, Time, [FractionalSecs], [TimeZone] */
+	case exiDateTime: /* Year, MonthDay, Time, [FractionalSecs], [TimeZone] */
 		/* e.g. "0001-01-01T00:00:00.111+00:33"  */
 		errn = decodeInteger32(stream, &datetime->year);
 		if (errn < 0) {
@@ -537,7 +537,7 @@ int decodeDateTime(bitstream_t* stream, datetime_type_t type, datetime_t* dateti
 			return errn;
 		}
 		/* Note: *no* break  */
-	case time: /* Time, [FractionalSecs], [TimeZone] */
+	case exiTime: /* Time, [FractionalSecs], [TimeZone] */
 		/* e.g. "12:34:56.135"  */
 		errn = decodeNBitUnsignedInteger(stream, DATETIME_NUMBER_BITS_TIME, &datetime->time);
 		if (errn < 0) {
@@ -551,11 +551,11 @@ int decodeDateTime(bitstream_t* stream, datetime_type_t type, datetime_t* dateti
 			errn = decodeUnsignedInteger32(stream, &datetime->fractionalSecs);
 		}
 		break;
-	case gMonth: /* MonthDay, [TimeZone] */
+	case exiGMonth: /* MonthDay, [TimeZone] */
 		/* e.g. "--12" */
-	case gMonthDay: /* MonthDay, [TimeZone] */
+	case exiGMonthDay: /* MonthDay, [TimeZone] */
 		/* e.g. "--01-28"  */
-	case gDay: /* MonthDay, [TimeZone] */
+	case exiGDay: /* MonthDay, [TimeZone] */
 		/* "---16"  */
 		errn = decodeNBitUnsignedInteger(stream, DATETIME_NUMBER_BITS_MONTHDAY, &datetime->monthDay );
 		break;

src/codec/AbstractEncoderChannel.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>
@@ -370,18 +370,18 @@ int encodeBinary(bitstream_t* stream, bytes_t* bytes) {
 int encodeDateTime(bitstream_t* stream, datetime_t* datetime) {
 	int errn = 0;
 	switch (datetime->type) {
-	case gYear: /* Year, [Time-Zone] */
+	case exiGYear: /* Year, [Time-Zone] */
 		errn = encodeInteger32(stream, datetime->year - DATETIME_YEAR_OFFSET);
 		break;
-	case gYearMonth: /* Year, MonthDay, [TimeZone] */
-	case date: /* Year, MonthDay, [TimeZone] */
+	case exiGYearMonth: /* Year, MonthDay, [TimeZone] */
+	case exiDate: /* Year, MonthDay, [TimeZone] */
 		errn = encodeInteger32(stream, datetime->year - DATETIME_YEAR_OFFSET);
 		if (errn < 0) {
 			return errn;
 		}
 		errn = encodeNBitUnsignedInteger(stream, DATETIME_NUMBER_BITS_MONTHDAY, datetime->monthDay);
 		break;
-	case dateTime: /* Year, MonthDay, Time, [FractionalSecs], [TimeZone] */
+	case exiDateTime: /* Year, MonthDay, Time, [FractionalSecs], [TimeZone] */
 		errn = encodeInteger32(stream, datetime->year - DATETIME_YEAR_OFFSET);
 		if (errn < 0) {
 			return errn;
@@ -391,7 +391,7 @@ int encodeDateTime(bitstream_t* stream, datetime_t* datetime) {
 			return errn;
 		}
 		/* Note: *no* break */
-	case time: /* Time, [FractionalSecs], [TimeZone] */
+	case exiTime: /* Time, [FractionalSecs], [TimeZone] */
 		errn = encodeNBitUnsignedInteger(stream, DATETIME_NUMBER_BITS_TIME, datetime->time);
 		if (errn < 0) {
 			return errn;
@@ -406,9 +406,9 @@ int encodeDateTime(bitstream_t* stream, datetime_t* datetime) {
 			encodeBoolean(stream, 0);
 		}
 		break;
-	case gMonth: /* MonthDay, [TimeZone] */
-	case gMonthDay: /* MonthDay, [TimeZone] */
-	case gDay: /* MonthDay, [TimeZone] */
+	case exiGMonth: /* MonthDay, [TimeZone] */
+	case exiGMonthDay: /* MonthDay, [TimeZone] */
+	case exiGDay: /* MonthDay, [TimeZone] */
 		errn = encodeNBitUnsignedInteger(stream, DATETIME_NUMBER_BITS_MONTHDAY, datetime->monthDay);
 		break;
 	default:

src/codec/BitDecoderChannel.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/BitEncoderChannel.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/BitInputStream.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/BitInputStream.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/BitOutputStream.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/BitOutputStream.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/ByteDecoderChannel.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/ByteEncoderChannel.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/ByteStream.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/ByteStream.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/CoderChannel.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/DecoderChannel.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>
@@ -167,7 +167,7 @@ int decodeBinary(bitstream_t* stream, bytes_t* bytes);
  * Decode Date-Time as sequence of values representing the individual
  * components of the Date-Time.
  */
-int decodeDateTime(bitstream_t* stream, datetime_type_t type, datetime_t* datetime);
+int decodeDateTime(bitstream_t* stream, exi_datetime_type_t type, datetime_t* datetime);
 
 #endif
 

src/codec/EXICoder.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>
@@ -36,12 +36,12 @@ extern "C" {
 
 #include "EXITypes.h"
 
-#define IS_STRICT 1
+#define IS_STRICT 0
 #define DOCUMENT 0
 #define DOC_CONTENT 1
 #define DOC_END 2
-#define UR_TYPE_GRAMMAR_0 71
-#define UR_TYPE_GRAMMAR_1 654
+#define UR_TYPE_GRAMMAR_0 97
+#define UR_TYPE_GRAMMAR_1 809
 
 
 

src/codec/EXIDecoder.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/EXIEncoder.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/EXIHeaderDecoder.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/EXIHeaderDecoder.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/EXIHeaderEncoder.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/EXIHeaderEncoder.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/EXITypes.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>
@@ -53,8 +53,8 @@ extern "C" {
 /* EXI stream */
 #define BYTE_ARRAY 1
 #define FILE_STREAM 2
-#define EXI_STREAM BYTE_ARRAY 
-/*#define EXI_STREAM FILE_STREAM*/
+#define EXI_STREAM BYTE_ARRAY
+/* #define EXI_STREAM FILE_STREAM */
 
 #define EXI_ELEMENT_STACK_SIZE 16
 
@@ -148,8 +148,8 @@ typedef enum {
 
 /* differ datetime types */
 typedef enum {
-	gYear, gYearMonth, date, dateTime, gMonth, gMonthDay, gDay, time
-} datetime_type_t;
+	exiGYear, exiGYearMonth, exiDate, exiDateTime, exiGMonth, exiGMonthDay, exiGDay, exiTime
+} exi_datetime_type_t;
 
 
 typedef struct {
@@ -223,7 +223,7 @@ typedef struct {
 
 typedef struct {
 	/* datetime type */
-	datetime_type_t type;
+	exi_datetime_type_t type;
 	/* values */
 	int32_t year;
 	uint32_t monthDay;

src/codec/EncoderChannel.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/MethodsBag.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/MethodsBag.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/NameTableEntries.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/NameTableEntries.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/StringTable.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/StringTable.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/UCSString.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/UCSString.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.5
+ * @version 2011-12-02 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>