Skip to content

Commit 8c1bee7

Browse files
authored
Merge pull request #297 from ateleris/better-scala-backend
Better Scala Backend
2 parents 7c75248 + ca13abc commit 8c1bee7

File tree

169 files changed

+16244
-15670
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+16244
-15670
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
.metals
2+
.vscode
13
.idea
4+
.bloop
5+
.scala-build
26
/.vs
37
/Debug
48
/Release

ADA_RTL2/src/adaasn1rtl-encoding-acn.adb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,7 +1428,7 @@ is
14281428
strVal (strVal'Last) := Standard.Ascii.NUL;
14291429
end Acn_Dec_String_Ascii_FixSize;
14301430

1431-
procedure Acn_Enc_String_Ascii_Null_Teminated
1431+
procedure Acn_Enc_String_Ascii_Null_Terminated
14321432
(bs : in out Bitstream; null_characters : OctetBuffer; strVal : String)
14331433
is
14341434
i : Integer := strVal'First;
@@ -1449,9 +1449,9 @@ is
14491449
bs.Current_Bit_Pos'Loop_Entry + (i - null_characters'First) * 8);
14501450
BitStream_AppendByte (bs, null_characters (i), False);
14511451
end loop;
1452-
end Acn_Enc_String_Ascii_Null_Teminated;
1452+
end Acn_Enc_String_Ascii_Null_Terminated;
14531453

1454-
procedure Acn_Dec_String_Ascii_Null_Teminated
1454+
procedure Acn_Dec_String_Ascii_Null_Terminated
14551455
(bs : in out Bitstream; null_characters : OctetBuffer;
14561456
strVal : in out String; Result : out ASN1_RESULT)
14571457
is
@@ -1519,7 +1519,7 @@ is
15191519
I := I + 1;
15201520
end loop;
15211521

1522-
end Acn_Dec_String_Ascii_Null_Teminated;
1522+
end Acn_Dec_String_Ascii_Null_Terminated;
15231523

15241524
procedure Acn_Enc_String_Ascii_Internal_Field_Determinant
15251525
(bs : in out Bitstream; asn1Min : Asn1Int;
@@ -1597,7 +1597,7 @@ is
15971597
end Acn_Enc_String_Ascii_External_Field_Determinant;
15981598

15991599
procedure Acn_Dec_String_Ascii_External_Field_Determinant
1600-
(bs : in out Bitstream; extSizeDeterminatFld : Asn1Int;
1600+
(bs : in out Bitstream; extSizeDeterminantFld : Asn1Int;
16011601
strVal : in out String; Result : out ASN1_RESULT)
16021602
is
16031603
I : Integer := strVal'First;
@@ -1607,7 +1607,7 @@ is
16071607
ASN1_RESULT'(Success => True, ErrorCode => ERR_INCORRECT_STREAM);
16081608

16091609
while Result.Success and then I <= strVal'Last - 1
1610-
and then I <= Integer (extSizeDeterminatFld)
1610+
and then I <= Integer (extSizeDeterminantFld)
16111611
loop
16121612
pragma Loop_Invariant
16131613
(I >= strVal'First and I <= strVal'Last and
@@ -1649,7 +1649,7 @@ is
16491649

16501650
procedure Acn_Dec_String_CharIndex_External_Field_Determinant
16511651
(bs : in out Bitstream; charSet : String; nCharSize : Integer;
1652-
extSizeDeterminatFld : Asn1Int; strVal : out String;
1652+
extSizeDeterminantFld : Asn1Int; strVal : out String;
16531653
Result : out ASN1_RESULT)
16541654
is
16551655
I : Integer := strVal'First;
@@ -1660,7 +1660,7 @@ is
16601660
ASN1_RESULT'(Success => True, ErrorCode => ERR_INCORRECT_STREAM);
16611661
strVal := (others => Standard.Ascii.NUL);
16621662
while Result.Success and then I <= strVal'Last - 1
1663-
and then I <= Integer (extSizeDeterminatFld)
1663+
and then I <= Integer (extSizeDeterminantFld)
16641664
loop
16651665
pragma Loop_Invariant
16661666
(I >= strVal'First and I <= strVal'Last and

ADA_RTL2/src/adaasn1rtl-encoding-acn.ads

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ is
900900
bs.Current_Bit_Pos =
901901
bs'Old.Current_Bit_Pos + (strVal'Last - strVal'First) * 8;
902902

903-
procedure Acn_Enc_String_Ascii_Null_Teminated
903+
procedure Acn_Enc_String_Ascii_Null_Terminated
904904
(bs : in out Bitstream; null_characters : OctetBuffer;
905905
strVal : String) with
906906
Depends => (bs => (bs, strVal, null_characters)),
@@ -919,7 +919,7 @@ is
919919
bs'Old.Current_Bit_Pos +
920920
(strVal'Length - 1 + null_characters'Length) * 8;
921921

922-
procedure Acn_Dec_String_Ascii_Null_Teminated
922+
procedure Acn_Dec_String_Ascii_Null_Terminated
923923
(bs : in out Bitstream; null_characters : OctetBuffer;
924924
strVal : in out String; Result : out ASN1_RESULT) with
925925
Pre => null_characters'Length >= 1 and then null_characters'Length <= 10
@@ -996,10 +996,10 @@ is
996996
bs'Old.Current_Bit_Pos + ((strVal'Last - strVal'First) * 8);
997997

998998
procedure Acn_Dec_String_Ascii_External_Field_Determinant
999-
(bs : in out Bitstream; extSizeDeterminatFld : Asn1Int;
999+
(bs : in out Bitstream; extSizeDeterminantFld : Asn1Int;
10001000
strVal : in out String; Result : out ASN1_RESULT) with
1001-
Pre => extSizeDeterminatFld >= 0
1002-
and then extSizeDeterminatFld <= Asn1Int (Integer'Last)
1001+
Pre => extSizeDeterminantFld >= 0
1002+
and then extSizeDeterminantFld <= Asn1Int (Integer'Last)
10031003
and then strVal'Last < Natural'Last and then strVal'Last >= strVal'First
10041004
and then strVal'Last - strVal'First < Natural'Last / 8 - 8
10051005
and then bs.Current_Bit_Pos <
@@ -1032,10 +1032,10 @@ is
10321032

10331033
procedure Acn_Dec_String_CharIndex_External_Field_Determinant
10341034
(bs : in out Bitstream; charSet : String; nCharSize : Integer;
1035-
extSizeDeterminatFld : Asn1Int; strVal : out String;
1035+
extSizeDeterminantFld : Asn1Int; strVal : out String;
10361036
Result : out ASN1_RESULT) with
1037-
Pre => extSizeDeterminatFld >= 0
1038-
and then extSizeDeterminatFld <= Asn1Int (Integer'Last)
1037+
Pre => extSizeDeterminantFld >= 0
1038+
and then extSizeDeterminantFld <= Asn1Int (Integer'Last)
10391039
and then nCharSize >= 1 and then nCharSize <= 8
10401040
and then strVal'Last < Natural'Last and then strVal'Last >= strVal'First
10411041
and then charSet'Last < Natural'Last

0 commit comments

Comments
 (0)