Skip to content

Commit

Permalink
Major reorganization for documentation purposes and to upgrade to .NE…
Browse files Browse the repository at this point in the history
…T 4.7
  • Loading branch information
hallambaker committed Nov 1, 2017
1 parent 55e45b5 commit 3257b46
Show file tree
Hide file tree
Showing 640 changed files with 258,860 additions and 4,116 deletions.
Binary file modified .vs/BuildLibraries/v15/sqlite3/storage.ide
Binary file not shown.
Binary file modified .vs/BuildTools/v15/sqlite3/storage.ide
Binary file not shown.
Binary file added .vs/Templates/v15/sqlite3/storage.ide
Binary file not shown.
73 changes: 41 additions & 32 deletions ASN/Goedel.Tool.ASN/Asn2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using System.IO;
using System.Text;
using Goedel.Registry;
using Goedel.Utilities;


//
Expand Down Expand Up @@ -1094,7 +1095,8 @@ private Goedel.Tool.ASN._Choice New_Choice(string Label) {
case "Default": return NewDefault();

}
throw new System.Exception ("Reserved word not recognized \"" + Label + "\"");

throw new NotFoundReserved ("Reserved word not recognized \"" + Label + "\"");
}


Expand Down Expand Up @@ -1415,7 +1417,7 @@ void Push (Goedel.Tool.ASN._Choice Token) {
}

void Pop () {
if (Stack.Count == 0) throw new System.Exception ("Internal Parser Error");
Assert.False (Stack.Count == 0, InternalError.Throw);

_StackItem Item = Stack[Stack.Count -1];
State = Item.State;
Expand All @@ -1432,9 +1434,10 @@ public override void Process(TokenType Token, Position Position, string Text) {

if ((Token == TokenType.SEPARATOR) |
(Token == TokenType.NULL) |
(Token == TokenType.COMMENT)) return;
if (Token == TokenType.INVALID)
throw new System.Exception("Invalid Token");
(Token == TokenType.COMMENT)) {
return;
}
Assert.False (Token == TokenType.INVALID, InvalidToken.Throw);

bool Represent = true;

Expand All @@ -1449,7 +1452,9 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode._Choice;
break;
}
else throw new System.Exception("Parser Error Expected START");
else {
throw new ExpectedStart ();
}

case StateCode._Choice: // LABEL Class | END
if (Token == TokenType.LABEL) {
Expand All @@ -1464,18 +1469,21 @@ public override void Process(TokenType Token, Position Position, string Text) {
Top.Add(New_Choice(Text));
}
else {
throw new System.Exception("Parser Error Expected [Class]");
throw new Expected("Parser Error Expected [Class]");
}
break;
}
if (Token == TokenType.END) {
State = StateCode._End;
break;
}
else throw new System.Exception("Parser Error Expected [Class]");
else {
throw new ExpectedClass();
}

case StateCode._End: // -
throw new System.Exception("Too Many Closing Braces");
case StateCode._End: { // -
throw new TooManyClose();
}

case StateCode.Namespace_Start:
if ((Token == TokenType.LABEL) | (Token == TokenType.LITERAL)) {
Expand All @@ -1484,7 +1492,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.Namespace__Name;
break;
}
throw new System.Exception("Expected LABEL or LITERAL");
throw new Expected("Expected LABEL or LITERAL");

case StateCode.Namespace__Name:
Pop ();
Expand All @@ -1497,7 +1505,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.ROOT__Name;
break;
}
throw new System.Exception("Expected LABEL or LITERAL");
throw new Expected("Expected LABEL or LITERAL");

case StateCode.ROOT__Name:

Expand Down Expand Up @@ -1535,7 +1543,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.Entry__Name;
break;
}
throw new System.Exception("Expected LABEL or LITERAL");
throw new Expected("Expected LABEL or LITERAL");

case StateCode.Entry__Name:
if (Token == TokenType.INTEGER) {
Expand All @@ -1544,7 +1552,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.Entry__Value;
break;
}
throw new System.Exception("Expected Integer");
throw new Expected("Expected Integer");

case StateCode.Entry__Value:
Pop ();
Expand All @@ -1557,7 +1565,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.OID__Name;
break;
}
throw new System.Exception("Expected LABEL or LITERAL");
throw new Expected("Expected LABEL or LITERAL");

case StateCode.OID__Name:
if ((Token == TokenType.LABEL) | (Token == TokenType.LITERAL)) {
Expand All @@ -1566,7 +1574,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.OID__Root;
break;
}
throw new System.Exception("Expected LABEL or LITERAL");
throw new Expected("Expected LABEL or LITERAL");

case StateCode.OID__Root:
if (Token == TokenType.INTEGER) {
Expand All @@ -1575,7 +1583,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.OID__Value;
break;
}
throw new System.Exception("Expected Integer");
throw new Expected("Expected Integer");

case StateCode.OID__Value:
Pop ();
Expand All @@ -1588,7 +1596,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.Class__Name;
break;
}
throw new System.Exception("Expected LABEL or LITERAL");
throw new Expected("Expected LABEL or LITERAL");

case StateCode.Class__Name:

Expand Down Expand Up @@ -1626,7 +1634,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.Object__Name;
break;
}
throw new System.Exception("Expected LABEL or LITERAL");
throw new Expected("Expected LABEL or LITERAL");

case StateCode.Object__Name:
if ((Token == TokenType.LABEL) | (Token == TokenType.LITERAL)) {
Expand All @@ -1635,7 +1643,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.Object__OID;
break;
}
throw new System.Exception("Expected LABEL or LITERAL");
throw new Expected("Expected LABEL or LITERAL");

case StateCode.Object__OID:

Expand Down Expand Up @@ -1673,7 +1681,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.SingularObject__Name;
break;
}
throw new System.Exception("Expected LABEL or LITERAL");
throw new Expected("Expected LABEL or LITERAL");

case StateCode.SingularObject__Name:
if ((Token == TokenType.LABEL) | (Token == TokenType.LITERAL)) {
Expand All @@ -1682,7 +1690,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.SingularObject__OID;
break;
}
throw new System.Exception("Expected LABEL or LITERAL");
throw new Expected("Expected LABEL or LITERAL");

case StateCode.SingularObject__OID:

Expand Down Expand Up @@ -1720,7 +1728,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.Member__Name;
break;
}
throw new System.Exception("Expected LABEL or LITERAL");
throw new Expected("Expected LABEL or LITERAL");

case StateCode.Member__Name:
if (Token == TokenType.LABEL) {
Expand Down Expand Up @@ -1762,7 +1770,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.Member__Spec;
break;
}
else throw new System.Exception("Parser Error Expected [OIDRef Any Bits VBits Octets Integer BigInteger Boolean Time List Set Choice IA5String BMPString UTF8String PrintableString ]");
else throw new Expected ("Parser Error Expected [OIDRef Any Bits VBits Octets Integer BigInteger Boolean Time List Set Choice IA5String BMPString UTF8String PrintableString ]");

case StateCode.Member__Spec:

Expand Down Expand Up @@ -1869,7 +1877,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.List__Spec;
break;
}
else throw new System.Exception("Parser Error Expected [OIDRef Any Bits VBits Octets Integer BigInteger Boolean Time List Set Choice IA5String BMPString UTF8String PrintableString ]");
else throw new Expected ("Parser Error Expected [OIDRef Any Bits VBits Octets Integer BigInteger Boolean Time List Set Choice IA5String BMPString UTF8String PrintableString ]");

case StateCode.List__Spec:
Pop ();
Expand Down Expand Up @@ -1915,7 +1923,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.Set__Spec;
break;
}
else throw new System.Exception("Parser Error Expected [OIDRef Any Bits VBits Octets Integer BigInteger Boolean Time List Set Choice IA5String BMPString UTF8String PrintableString ]");
else throw new Expected ("Parser Error Expected [OIDRef Any Bits VBits Octets Integer BigInteger Boolean Time List Set Choice IA5String BMPString UTF8String PrintableString ]");

case StateCode.Set__Spec:
Pop ();
Expand Down Expand Up @@ -1981,11 +1989,11 @@ public override void Process(TokenType Token, Position Position, string Text) {
Current_Cast.Entry = New_Choice(Text);
}
else {
throw new System.Exception("Parser Error Expected [Code Implicit Explicit Optional Default Context ]");
throw new Expected ("Parser Error Expected [Code Implicit Explicit Optional Default Context ]");
}
break;
}
else throw new System.Exception("Parser Error Expected [Code Implicit Explicit Optional Default Context ]");
else throw new Expected("Parser Error Expected [Code Implicit Explicit Optional Default Context ]");

case StateCode.Qualifier__Entry:
Pop ();
Expand All @@ -1998,7 +2006,7 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.Code__Value;
break;
}
throw new System.Exception("Expected Integer");
throw new Expected("Expected Integer");

case StateCode.Code__Value:
Pop ();
Expand Down Expand Up @@ -2027,15 +2035,16 @@ public override void Process(TokenType Token, Position Position, string Text) {
State = StateCode.Default__Value;
break;
}
throw new System.Exception("Expected String");
throw new Expected("Expected String");

case StateCode.Default__Value:
Pop ();
Represent = true;
break;

default:
throw new System.Exception("Unreachable code reached");
default: {
throw new UnreachableCode();
}
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ASN/Goedel.Tool.ASN/Goedel.Tool.ASN.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Goedel.Tool.ASN</RootNamespace>
<AssemblyName>Goedel.Tool.ASN</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -104,15 +104,15 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\Goedel.ASN\Goedel.ASN.csproj">
<Project>{44e8b35d-0394-4f37-b52c-246f8610f031}</Project>
<Project>{68e6b0e8-d120-4da9-a5b3-ea64d40fba14}</Project>
<Name>Goedel.ASN</Name>
</ProjectReference>
<ProjectReference Include="..\..\Libraries\Goedel.Registry\Goedel.Registry.csproj">
<Project>{ebda947e-d7a9-4a93-aef1-aea9d56b9225}</Project>
<Name>Goedel.Registry</Name>
</ProjectReference>
<ProjectReference Include="..\..\Libraries\Goedel.Utilities\Goedel.Utilities.csproj">
<Project>{e891bc7f-d7bd-4931-931b-42c83cca68e2}</Project>
<Project>{71c0dce3-3f2a-4545-af77-1b89bcff7c1e}</Project>
<Name>Goedel.Utilities</Name>
</ProjectReference>
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions ASN/ShellASN/ShellASN.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Goedel.Shell.ASN2</RootNamespace>
<AssemblyName>asn2</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -101,7 +101,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\Goedel.ASN\Goedel.ASN.csproj">
<Project>{44e8b35d-0394-4f37-b52c-246f8610f031}</Project>
<Project>{68e6b0e8-d120-4da9-a5b3-ea64d40fba14}</Project>
<Name>Goedel.ASN</Name>
</ProjectReference>
<ProjectReference Include="..\..\Libraries\Goedel.Command\Goedel.Command.csproj">
Expand All @@ -113,7 +113,7 @@
<Name>Goedel.Registry</Name>
</ProjectReference>
<ProjectReference Include="..\..\Libraries\Goedel.Utilities\Goedel.Utilities.csproj">
<Project>{e891bc7f-d7bd-4931-931b-42c83cca68e2}</Project>
<Project>{71c0dce3-3f2a-4545-af77-1b89bcff7c1e}</Project>
<Name>Goedel.Utilities</Name>
</ProjectReference>
<ProjectReference Include="..\Goedel.Tool.ASN\Goedel.Tool.ASN.csproj">
Expand Down
2 changes: 1 addition & 1 deletion ASN/ShellASN/app.config
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>
Loading

0 comments on commit 3257b46

Please sign in to comment.