Skip to content

Commit bf31a70

Browse files
committed
fix octet and bit string initialization
1 parent 95ce071 commit bf31a70

File tree

5 files changed

+10
-2
lines changed

5 files changed

+10
-2
lines changed

BackendAst/DAstInitialize.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ let createOctetStringInitFunc (r:Asn1AcnAst.AstRoot) (lm:LanguageMacros) (t:Asn
434434
let ii = p.accessPath.SequenceOfLevel + 1
435435
let i = sprintf "i%d" ii
436436
let funcBody = initTestCaseOctetString (p.accessPath.joined lm.lg) (lm.lg.getAccess p.accessPath) tdName o.maxSize.uper i (isFixedSize) true o.minSize.uper (o.maxSize.uper = 0I) resVar
437-
let lvars = lm.lg.init.zeroIA5String_localVars ii
437+
let lvars = lm.lg.init.zeroOctetString_localVars ii
438438
{InitFunctionResult.funcBody = funcBody; resultVar = resVar; localVariables=lvars}
439439

440440
testCaseFuncs, zero
@@ -536,7 +536,7 @@ let createBitStringInitFunc (r:Asn1AcnAst.AstRoot) (lm:LanguageMacros) (t:Asn1Ac
536536
| _ -> raise(BugErrorException "UnexpectedType")
537537

538538
let funcBody = initTestCaseBitString (p.accessPath.joined lm.lg) (lm.lg.getAccess p.accessPath) tdName nSize (nSizeCeiled) i (isFixedSize) true o.minSize.uper p.accessPath.isOptional resVar
539-
let lvars = lm.lg.init.zeroIA5String_localVars ii
539+
let lvars = lm.lg.init.zeroBitString_localVars ii
540540
{InitFunctionResult.funcBody = funcBody; resultVar = resVar; localVariables=lvars}
541541
testCaseFuncs, zero
542542
| _ ->

FrontEndAst/Language.fs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ type Acn_parts = {
3232
}
3333
type Initialize_parts = {
3434
zeroIA5String_localVars : int -> LocalVariable list
35+
zeroOctetString_localVars : int -> LocalVariable list
36+
zeroBitString_localVars : int -> LocalVariable list
3537
choiceComponentTempInit : bool
3638
initMethSuffix : Asn1TypeKind -> string // TODO REMOVE?
3739
}

StgAda/LangGeneric_a.fs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,8 @@ type LangGeneric_a() =
311311
override this.init =
312312
{
313313
Initialize_parts.zeroIA5String_localVars = fun ii -> [SequenceOfIndex (ii, None)]
314+
zeroOctetString_localVars = fun ii -> [SequenceOfIndex (ii, None)]
315+
zeroBitString_localVars = fun ii -> [SequenceOfIndex (ii, None)]
314316
choiceComponentTempInit = false
315317
initMethSuffix = fun _ -> ""
316318
}

StgC/LangGeneric_c.fs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,8 @@ type LangGeneric_c() =
306306
override this.init =
307307
{
308308
Initialize_parts.zeroIA5String_localVars = fun ii -> [SequenceOfIndex (ii, None)]
309+
zeroOctetString_localVars = fun _ -> []
310+
zeroBitString_localVars = fun _ -> []
309311
choiceComponentTempInit = false
310312
initMethSuffix = fun _ -> ""
311313
}

StgScala/LangGeneric_scala.fs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,8 @@ type LangGeneric_scala() =
518518
override this.init =
519519
{
520520
Initialize_parts.zeroIA5String_localVars = fun _ -> []
521+
zeroOctetString_localVars = fun _ -> []
522+
zeroBitString_localVars = fun _ -> []
521523
choiceComponentTempInit = false
522524
initMethSuffix = initMethSuffix
523525
}

0 commit comments

Comments
 (0)