example A2L have values out of bounds, handle them "properly"

Sauci · Jun 30, 2023 · 2b61f43 · 2b61f43
1 parent ca785ab
commit 2b61f43
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/grammar/A2L.g4 b/grammar/A2L.g4
@@ -1754,7 +1754,6 @@ FLOAT:
         ('0'..'9')+ '.' ('0'..'9')* EXPONENT?
     |   '.' ('0'..'9')+ EXPONENT?
     |   ('0'..'9')+ EXPONENT
-    |   'Inf'
     )
     ;
 

diff --git a/pkg/a2l/a2lhelpers.go b/pkg/a2l/a2lhelpers.go
@@ -59,7 +59,7 @@ func a2lLongToLongType(integerValue parser.IIntegerValueContext) (result *LongTy
 
 		if tmpResult, err = strconv.ParseInt(rawString, int(base), 64); err == nil {
 			result = &LongType{
-				Value: int32(tmpResult),
+				Value: tmpResult,
 				Base:  base,
 				Size:  uint32(len(rawString)),
 			}
@@ -91,7 +91,7 @@ func numericToLongType(integerValue parser.INumericValueContext) (result *LongTy
 
 		if tmpResult, err = strconv.ParseInt(rawString, int(base), 64); err == nil {
 			result = &LongType{
-				Value: int32(tmpResult),
+				Value: tmpResult,
 				Base:  base,
 				Size:  uint32(len(rawString)),
 			}
@@ -155,7 +155,7 @@ func floatToFloatType(integerValue parser.INumericValueContext) (result *FloatTy
 		}
 
 		if tmpResult, err = strconv.ParseFloat(originalString, 64); err == nil {
-			result.Value = float32(tmpResult)
+			result.Value = tmpResult
 		} else {
 			panic(err)
 		}

diff --git a/pkg/a2l/a2mlhelpers.go b/pkg/a2l/a2mlhelpers.go
@@ -35,7 +35,7 @@ func arraySpecifierToLongType(integerValue parser.IArraySpecifierContext) (resul
 
 	if tmpResult, err = strconv.ParseInt(rawString, int(base), 64); err == nil {
 		result = &LongType{
-			Value: int32(tmpResult),
+			Value: tmpResult,
 			Base:  base,
 			Size:  uint32(len(rawString)),
 		}

diff --git a/protobuf/shared.proto b/protobuf/shared.proto
@@ -9,13 +9,13 @@ message IntType {
 }
 
 message LongType {
-  int32 Value = 1;
+  int64 Value = 1;
   uint32 Base = 2;
   uint32 Size = 3;
 }
 
 message FloatType {
-  float Value = 1;
+  double Value = 1;
   optional string IntegralSign = 2;
   uint32 IntegralSize = 3;
   uint32 DecimalSize = 4;