Skip to content

Commit 153fb70

Browse files
committed
Improved debugging support
Improved debugging support in exes generated by Shakespeare2MSIL Fixed some minor bugs Add copyright & license summary to all source files.
1 parent dda613f commit 153fb70

33 files changed

+1252
-774
lines changed

Libraries/TriAxis.RunSharp.dll

1.5 KB
Binary file not shown.

MakeScannerCS/Program.cs

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,25 @@
1-
using System;
2-
using System.Collections.Generic;
1+
 #region Copyright & License summary
2+
/*
3+
Copyright 2013, James M. Curran, Novel Theory Software
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
*/
17+
#endregion
18+
19+
using System;
20+
using System.IO;
321
using System.Linq;
422
using System.Text;
5-
using System.Threading.Tasks;
6-
using System.IO;
723

824
namespace MakeScannerCS
925
{

Original/examples/guess.spl

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,96 +14,96 @@ Desdemona, feeds lines to others.
1414
Helen, returns with a carriage.
1515
Hamlet, marks a question.
1616

17-
Act I: A guess comes to dinner.
17+
Act I: A guess comes to dinner.
1818

19-
Scene I: The introductions.
19+
Scene I: The introductions.
2020
[Enter Romeo and Desdemona]
2121
Romeo:
22-
Thou art as fine as the sum of a pretty flower and a
23-
lovely smooth rich plum.
22+
Thou art as fine as the sum of a pretty flower and a
23+
lovely smooth rich plum.
2424
[Exit Desdemona]
2525
[Enter Emilia]
2626
Romeo:
27-
Thou art as charming as the cube of Desdemona.
27+
Thou art as charming as the cube of Desdemona.
2828
[Exit Emilia]
2929
[Enter Helen]
3030
Romeo:
31-
Thou art as fine as the sum of Desdemona and the sum of a red
32-
rose and a flower.
31+
Thou art as fine as the sum of Desdemona and the sum of a red
32+
rose and a flower.
3333
[Exit Helen]
3434
[Enter Bianca]
3535
Romeo:
36-
Thou art as warm as a summer's day.
36+
Thou art as warm as a summer's day.
3737
[Exit Bianca]
3838
[Enter Oberon]
3939
Romeo:
40-
Thou art as foul as the sum of a little tiny furry white old
41-
animal and a smelly toad. Thou art as disgusting as the product of thyself and
42-
a horrible hog. Thou art as evil as the difference between a
43-
cow and thyself.
40+
Thou art as foul as the sum of a little tiny furry white old
41+
animal and a smelly toad. Thou art as disgusting as the product of thyself and
42+
a horrible hog. Thou art as evil as the difference between a
43+
cow and thyself.
4444
[Exit Oberon]
4545
[Enter Hamlet]
4646
Romeo:
47-
Thou art as disgusting as the sum of Oberon and a big cow.
47+
Thou art as disgusting as the sum of Oberon and a big cow.
4848

49-
Scene II: The repetitions.
49+
Scene II: The repetitions.
5050
[Exeunt]
5151
[Enter Romeo and Juliet]
5252
Romeo:
53-
Thou art as lovely as the sum of Emilia and Bianca. Thou art
54-
as sweet as the quotient between thyself and a little flower.
55-
Open your heart.
53+
Thou art as lovely as the sum of Emilia and Bianca. Thou art
54+
as sweet as the quotient between thyself and a little flower.
55+
Open your heart.
5656
[Exit Juliet]
5757
[Enter Hamlet]
5858
Romeo:
59-
Speak your mind.
60-
Scene III: In case of foul play.
59+
Speak your mind.
60+
Scene III: In case of foul play.
6161
[Exeunt]
6262
[Enter Romeo and Juliet]
6363
Juliet:
64-
Open your mind.
64+
Open your mind.
6565
[Exit Juliet]
6666
[Enter Helen]
6767
Romeo:
68-
Speak your mind.
68+
Speak your mind.
6969
[Exit Helen]
7070
[Enter Desdemona]
7171
Romeo:
72-
Speak your mind.
72+
Speak your mind.
7373
Romeo:
74-
Am I as brave as Oberon? If so, let us proceed to Scene VI.
75-
Am I as bold as the sum of Oberon and a pig? If so, let us proceed to Scene IV.
76-
Am I as cunning as the sum of Oberon and a cow? If so, let us proceed to Scene V.
77-
Let us proceed to Scene III.
74+
Am I as brave as Oberon? If so, let us proceed to Scene VI.
75+
Am I as bold as the sum of Oberon and a pig? If so, let us proceed to Scene IV.
76+
Am I as cunning as the sum of Oberon and a cow? If so, let us proceed to Scene V.
77+
Let us proceed to Scene III.
7878

79-
Scene IV: Where less is more.
79+
Scene IV: Where less is more.
8080
[Exeunt]
8181
[Enter Emilia and Juliet]
8282
Emilia:
83-
Am I as good as the sum of Bianca and a flower? If so, thou
84-
art as fine as Bianca.
83+
Am I as good as the sum of Bianca and a flower? If so, thou
84+
art as fine as Bianca.
8585
Juliet:
86-
Remember me. Recall that I am your friend. Let us return to Scene II.
86+
Remember me. Recall that I am your friend. Let us return to Scene II.
8787

88-
Scene V: Where more is needed.
88+
Scene V: Where more is needed.
8989
[Exeunt]
9090
[Enter Bianca and Juliet]
9191
Bianca:
92-
Am I as good as the difference between Emilia and a flower? If so, thou
93-
art as fine as Emilia.
94-
Am I as good as the difference between Emilia and a red rose? If so, thou
95-
art as fine as Emilia.
92+
Am I as good as the difference between Emilia and a flower? If so, thou
93+
art as fine as Emilia.
94+
Am I as good as the difference between Emilia and a red rose? If so, thou
95+
art as fine as Emilia.
9696
Juliet:
97-
Remember me. Recall that I am your friend. Let us return to Scene II.
97+
Remember me. Recall that I am your friend. Let us return to Scene II.
9898

99-
Scene VI: The End.
99+
Scene VI: The End.
100100
[Exeunt]
101101
[Enter Romeo and Juliet]
102102
Romeo:
103-
Open your heart.
103+
Open your heart.
104104
[Exeunt]
105105
[Enter Helen and Desdemona]
106106
Desdemona:
107-
Speak your mind.
107+
Speak your mind.
108108
Helen:
109-
Speak your mind.
109+
Speak your mind.

ShakesCL/Program.cs

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
1+
#region Copyright & License summary
2+
/*
3+
Copyright 2013, James M. Curran, Novel Theory Software
64
7-
using Irony;
8-
using Irony.Parsing;
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
98
10-
using NConsoler;
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
*/
17+
#endregion
1118

19+
using Irony.Interpreter;
20+
using Irony.Interpreter.Ast;
21+
using Irony.Parsing;
22+
using NConsoler;
1223
using Shakespeare;
24+
using System;
1325
using System.IO;
14-
using Irony.Interpreter.Ast;
15-
using Irony.Interpreter;
1626

1727

1828
namespace ShakesCL
@@ -29,7 +39,7 @@ static void Main(string[] args)
2939
public static void Compile(
3040
[Required(Description="path to Shakespeare source code to compile")]
3141
string filename,
32-
[Optional("C","c", Description="Code generator to use ('C' for C code, 'CS' for C#, 'I' for MSIL")]
42+
[Optional("C","c", Description="Code generator: 'C' for C code, 'CS' for C#, 'I' for MSIL/EXE")]
3343
string compiler,
3444
[Optional(true, Description="Include Debug information in MSIL")]
3545
bool debug

Shakespeare.Grammar/AST/CharacterListNode.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
#region Copyright & License summary
2+
/*
3+
Copyright 2013, James M. Curran, Novel Theory Software
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
*/
17+
#endregion
18+
119
using System.Collections.Generic;
220

321
namespace Shakespeare.Ast

Shakespeare.Grammar/AST/CharacterNode.cs

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,25 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using Shakespeare.Utility;
1+
#region Copyright & License summary
2+
/*
3+
Copyright 2013, James M. Curran, Novel Theory Software
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
*/
17+
#endregion
18+
619
using Irony.Ast;
720
using Irony.Parsing;
21+
using Shakespeare.Utility;
22+
using System.Collections.Generic;
823

924
namespace Shakespeare.Ast
1025
{

Shakespeare.Grammar/AST/ListNode.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
#region Copyright & License summary
2+
/*
3+
Copyright 2013, James M. Curran, Novel Theory Software
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
*/
17+
#endregion
18+
119
namespace Shakespeare.Ast
220
{
321
/// <summary>

Shakespeare.Grammar/AST/MakerClasses.cs

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
1-
using Irony.Ast;
2-
using Irony.Parsing;
3-
using System.Linq;
1+
#region Copyright & License summary
2+
/*
3+
Copyright 2013, James M. Curran, Novel Theory Software
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
*/
17+
#endregion
418

519
namespace Shakespeare.Ast
620
{

Shakespeare.Grammar/AST/MultiWordTermialNode.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
#region Copyright & License summary
2+
/*
3+
Copyright 2013, James M. Curran, Novel Theory Software
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
*/
17+
#endregion
18+
119
using System.Linq;
220
using Irony.Ast;
321
using Irony.Parsing;

Shakespeare.Grammar/AST/RomanNumberNode.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
#region Copyright & License summary
2+
/*
3+
Copyright 2013, James M. Curran, Novel Theory Software
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
*/
17+
#endregion
18+
119
using Irony.Ast;
220
using Irony.Parsing;
321

Shakespeare.Grammar/AST/SelfNode.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
#region Copyright & License summary
2+
/*
3+
Copyright 2013, James M. Curran, Novel Theory Software
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
*/
17+
#endregion
18+
119
using Irony.Ast;
220

321
namespace Shakespeare.Ast

0 commit comments

Comments
 (0)