#356

Author: usr3-1415

BackendAst/DAstACN.fs

@@ -1077,7 +1077,7 @@ let createAcnStringFunction (r:Asn1AcnAst.AstRoot) (deps:Asn1AcnAst.AcnInsertedF
         let str_VarSize         = lm.uper.str_VarSize
         let initExpr =
             match codec, lm.lg.decodingKind with
-            | Decode, Copy -> Some (lm.lg.initializeString (int o.maxSize.uper))
+            | Decode, Copy -> Some (lm.lg.initializeString None (int o.maxSize.uper))
             | _ -> None
         let pp, resultExpr = joinedOrAsIdentifier lm codec p
         let nBits = GetNumberOfBitsForNonNegativeInteger (BigInteger (o.uperCharSet.Length-1))
@@ -1438,7 +1438,7 @@ let initExpr (r:Asn1AcnAst.AstRoot) (lm:LanguageMacros) (m:Asn1AcnAst.Asn1Module
     | AcnInteger int -> lm.lg.asn1SccIntValueToString 0I int.isUnsigned
     | AcnNullType _ -> lm.lg.asn1SccIntValueToString 0I true
     | AcnBoolean _ -> lm.lg.FalseLiteral
-    | AcnReferenceToIA5String s -> lm.lg.initializeString (int s.str.maxSize.uper)
+    | AcnReferenceToIA5String s -> lm.lg.initializeString None (int s.str.maxSize.uper)
     | AcnReferenceToEnumerated e ->
         lm.lg.getNamedItemBackendName (Some (defOrRef r m e)) e.enumerated.items.Head
 

BackendAst/DAstConstruction.fs

@@ -79,7 +79,7 @@ let private createAcnChild (r:Asn1AcnAst.AstRoot) (icdStgFileName:string) (deps:
         | Asn1AcnAst.AcnReferenceToEnumerated e ->
             lm.lg.getNamedItemBackendName (Some (defOrRef r m e)) e.enumerated.items.Head
         | Asn1AcnAst.AcnReferenceToIA5String s ->
-            lm.lg.initializeString (int (s.str.maxSize.acn + 1I))
+            lm.lg.initializeString None (int (s.str.maxSize.acn + 1I))
 
     let rec dealiasDeps (dep: Asn1AcnAst.AcnDependency): Asn1AcnAst.AcnDependency =
         match dep.dependencyKind with

BackendAst/DAstInitialize.fs

@@ -336,14 +336,21 @@ let createIA5StringInitFunc (r:Asn1AcnAst.AstRoot)  (lm:LanguageMacros) (t:Asn1A
     //let i = sprintf "i%d" ii
     let bAlpha = o.uperCharSet.Length < 128
     let arrAsciiCodes = o.uperCharSet |> Array.map(fun x -> BigInteger (System.Convert.ToInt32 x))
+    let firstPrintableAsciiCode =
+        arrAsciiCodes
+        |> Array.tryFind(fun x -> x >= 32I && x <= 126I)
+    let sFirstNonNullChar =
+        match firstPrintableAsciiCode with
+        | Some c  -> sprintf "'%c'" (char (int c))
+        | None    -> "'\0'"
     let testCaseFuncs =
         let seqOfCase (nSize:BigInteger)  =
             let initTestCaseFunc (p:CodegenScope) =
                 let ii = p.accessPath.SequenceOfLevel + 1
                 let i = sprintf "i%d" ii
                 let resVar = p.accessPath.asIdentifier
                 let td = strTypeDef.longTypedefName2 (lm.lg.hasModules) (ToC p.modName)
-                let funcBody = initTestCaseIA5String (p.accessPath.joinedUnchecked lm.lg FullAccess) (lm.lg.getAccess p.accessPath) (nSize) ((o.maxSize.uper+1I)) i td bAlpha arrAsciiCodes (BigInteger arrAsciiCodes.Length) false resVar
+                let funcBody = initTestCaseIA5String (p.accessPath.joinedUnchecked lm.lg FullAccess) (lm.lg.getAccess p.accessPath) (nSize) ((o.maxSize.uper+1I)) i td bAlpha arrAsciiCodes (BigInteger arrAsciiCodes.Length) false resVar sFirstNonNullChar
                 {InitFunctionResult.funcBody = funcBody; resultVar = resVar; localVariables=[SequenceOfIndex (ii, None)]}
             {AutomaticTestCase.initTestCaseFunc = initTestCaseFunc; testCaseTypeIDsMap = Map.ofList [(t.id, TcvSizeableTypeValue nSize)] }
         seq {
@@ -362,11 +369,11 @@ let createIA5StringInitFunc (r:Asn1AcnAst.AstRoot)  (lm:LanguageMacros) (t:Asn1A
         let i = sprintf "i%d" ii
         let resVar = p.accessPath.asIdentifier
         let td = strTypeDef.longTypedefName2 (lm.lg.hasModules) (ToC p.modName)
-        let funcBody = initTestCaseIA5String (p.accessPath.joined lm.lg) (lm.lg.getAccess p.accessPath) ( (o.maxSize.uper+1I)) ( (o.maxSize.uper+1I)) i td bAlpha arrAsciiCodes (BigInteger arrAsciiCodes.Length) false resVar
+        let funcBody = initTestCaseIA5String (p.accessPath.joined lm.lg) (lm.lg.getAccess p.accessPath) (o.maxSize.uper) (o.maxSize.uper+1I) i td bAlpha arrAsciiCodes (BigInteger arrAsciiCodes.Length) true resVar sFirstNonNullChar
         let lvars = lm.lg.init.zeroIA5String_localVars ii
         let resVar = p.accessPath.asIdentifier
         {InitFunctionResult.funcBody = funcBody; resultVar = resVar; localVariables=lvars}
-    let constantInitExpression () = lm.lg.initializeString (int o.maxSize.uper)
+    let constantInitExpression () = lm.lg.initializeString firstPrintableAsciiCode (int o.maxSize.uper)
     createInitFunctionCommon r lm t typeDefinition funcBody zero testCaseFuncs constantInitExpression constantInitExpression [] [] []
 
 let createOctetStringInitFunc (r:Asn1AcnAst.AstRoot)  (lm:LanguageMacros) (t:Asn1AcnAst.Asn1Type) (o :Asn1AcnAst.OctetString ) (typeDefinition:TypeDefinitionOrReference) (isValidFunction:IsValidFunction option) =

BackendAst/DAstUPer.fs

@@ -458,7 +458,7 @@ let createIA5StringFunction (r:Asn1AcnAst.AstRoot) (lm:LanguageMacros) (codec:Co
         let nSizeInBits = GetNumberOfBitsForNonNegativeInteger ( (o.maxSize.uper - o.minSize.uper))
         let initExpr =
             match codec, lm.lg.decodingKind with
-            | Decode, Copy -> Some (lm.lg.initializeString (int o.maxSize.uper))
+            | Decode, Copy -> Some (lm.lg.initializeString None (int o.maxSize.uper))
             | _ -> None
         let pp, resultExpr = joinedOrAsIdentifier lm codec p
 

CommonTypes/AbstractMacros.fs

@@ -257,7 +257,7 @@ Generated by the C stg macros with the following command
         abstract member initIA5String : sPtr:string -> sValue:string -> bIsOptional:bool -> sResVar:string -> string;
         abstract member initEnumerated : sVal:string -> sValue:string -> sTypeDefName:string -> bIsOptional:bool -> sResVar:string -> string;
         abstract member initNull : sVal:string -> bIsOptional:bool -> sResVar:string -> string;
-        abstract member initTestCaseIA5String : p:string -> sAcc:string -> nSize:BigInteger -> nMaxSizePlusOne:BigInteger -> i:string -> td:FE_StringTypeDefinition -> bAlpha:bool -> arrnAlphabetAsciiCodes:seq<BigInteger> -> nAlphabetLength:BigInteger -> bZero:bool -> sResVar:string -> string;
+        abstract member initTestCaseIA5String : p:string -> sAcc:string -> nSize:BigInteger -> nMaxSizePlusOne:BigInteger -> i:string -> td:FE_StringTypeDefinition -> bAlpha:bool -> arrnAlphabetAsciiCodes:seq<BigInteger> -> nAlphabetLength:BigInteger -> bZero:bool -> sResVar:string -> sInitChar:string -> string;
         abstract member initBitOrOctStringFromCompoundLiteral : p:string -> sCompLiteral:string -> string;
         abstract member initFixSizeBitOrOctString_bytei : p:string -> sAcc:string -> sI:string -> sByteHexVal:string -> string;
         abstract member initFixSizeBitOrOctString : p:string -> sAcc:string -> arrsBytes:seq<string> -> string;

FrontEndAst/Language.fs

@@ -226,7 +226,7 @@ type ILangGeneric () =
     abstract member asn1SccIntValueToString : BigInteger -> unsigned: bool -> string;
     abstract member intValueToString : BigInteger -> Asn1AcnAst.IntegerClass -> string;
     abstract member doubleValueToString : double -> string
-    abstract member initializeString : int -> string
+    abstract member initializeString :BigInteger option -> int -> string    //the ascii code to use for initialization, and the length of the string
     abstract member supportsInitExpressions : bool
     abstract member setNamedItemBackendName0 : Asn1Ast.NamedItem -> string -> Asn1Ast.NamedItem
     abstract member getNamedItemBackendName0 : Asn1Ast.NamedItem -> string

StgAda/LangGeneric_a.fs

@@ -130,7 +130,10 @@ type LangGeneric_a() =
             v.ToString(FsUtils.doubleParseString, System.Globalization.NumberFormatInfo.InvariantInfo)
         override _.intValueToString (i:BigInteger) _ = i.ToString()
         override _.asn1SccIntValueToString (i: BigInteger) _ = i.ToString()
-        override _.initializeString (_) = "(others => adaasn1rtl.NUL)"
+        override _.initializeString (asciiCode:BigInteger option) stringSize = 
+            match asciiCode with
+            | Some ac -> sprintf "(1 .. %d => '%c', %d => adaasn1rtl.NUL)" (stringSize) (char (int ac)) (stringSize+1)
+            | None ->   sprintf "(others => adaasn1rtl.NUL)"
 
         override _.supportsInitExpressions = true
 

StgAda/init_a.stg

@@ -32,14 +32,17 @@ initEnumerated(sVal, sValue, sTypeDefName, bIsOptional, sResVar) ::= "<sVal> :=
 initNull(sVal, bIsOptional, sResVar) ::= "<sVal> := 0;"
 
 
-initTestCaseIA5String(p, sAcc, nSize, nMaxSizePlusOne, i, td/*:FE_StringTypeDefinition*/, bAlpha, arrnAlphabetAsciiCodes, nAlphabetLength, bZero, sResVar) ::= <<
+initTestCaseIA5String(p, sAcc, nSize, nMaxSizePlusOne, i, td/*:FE_StringTypeDefinition*/, bAlpha, arrnAlphabetAsciiCodes, nAlphabetLength, bZero, sResVar, sInitChar) ::= <<
 <i> := 1;
 while <i>\<= <nMaxSizePlusOne> loop
     --  commented because it casues this warning
     --  warning: condition can only be False if invalid values present
     pragma Loop_Invariant (<i> >=1 and <i>\<=<nMaxSizePlusOne>);
     <if(bZero)>
-    <p>(<i>) := <rtlModuleName()>.NUL;
+    if <i> \<= <nSize> then
+        <p>(<i>) := <sInitChar>;
+    else
+        <p>(<i>) := <rtlModuleName()>.NUL;
 
     <else>
     if <i> \<= <nSize> then

StgC/LangGeneric_c.fs

@@ -93,7 +93,10 @@ type LangGeneric_c() =
         override _.doubleValueToString (v:double) =
             v.ToString(FsUtils.doubleParseString, System.Globalization.NumberFormatInfo.InvariantInfo)
 
-        override _.initializeString stringSize = sprintf "{ [0 ... %d] = 0x0 }" stringSize
+        override _.initializeString (asciiCode:BigInteger option) stringSize = 
+            match asciiCode with
+            | Some ac -> sprintf "{ [0 ... %d] = 0x%X, [%d] = 0x0}" (stringSize-1) (int ac) stringSize
+            | None ->   sprintf "{ [0 ... %d] = 0x0 }" stringSize
 
         override _.supportsInitExpressions = false
         override _.requiresHandlingOfEmptySequences = true
@@ -305,7 +308,7 @@ type LangGeneric_c() =
             }
         override this.init =
             {
-                Initialize_parts.zeroIA5String_localVars    = fun ii -> [SequenceOfIndex (ii, None)]
+                Initialize_parts.zeroIA5String_localVars    = fun _ -> []
                 zeroOctetString_localVars                   = fun _ -> []
                 zeroBitString_localVars                     = fun _ -> []
                 choiceComponentTempInit                     = false

StgC/init_c.stg

@@ -84,9 +84,10 @@ initIA5String(sPtr, sValue, bIsOptional, sResVar) ::= "strcpy(<sPtr>,<sValue>);"
 initEnumerated(sVal, sValue, sTypeDefName, bIsOptional, sResVar) ::= "<sVal> = <sValue>;"
 initNull(sVal, bIsOptional, sResVar) ::= "<sVal> = 0;"
 
-initTestCaseIA5String(p, sAcc, nSize, nMaxSizePlusOne, i, td/*:FE_StringTypeDefinition*/, bAlpha, arrnAlphabetAsciiCodes, nAlphabetLength, bZero, sResVar) ::= <<
+initTestCaseIA5String(p, sAcc, nSize, nMaxSizePlusOne, i, td/*:FE_StringTypeDefinition*/, bAlpha, arrnAlphabetAsciiCodes, nAlphabetLength, bZero, sResVar, sInitChar) ::= <<
 <if(bZero)>
-memset(<p>, 0x0, <nMaxSizePlusOne>);
+memset(<p>, <sInitChar>, <nSize>);
+<p>[<nSize>] = 0;
 
 <else>
 <i> = 0;