Skip to content

Stabilizing Jison in Php #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
robertleeplummerjr wants to merge 43 commits into from
Closed

Stabilizing Jison in Php #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
5c4164f
Buffer was overflowing, switched to spawn for more stability
Oct 31, 2013
c202cf3
Merge remote-tracking branch 'origin/master'
Oct 31, 2013
d7df0c8
Cleanup
Oct 31, 2013
e8dd75c
Merge remote-tracking branch 'upstream/master'
robertleeplummerjr Feb 4, 2014
c5c86f6
Creation on InputReader, making reading of inputs using offsets
Feb 19, 2014
70489d1
extends in wrong place
robertleeplummerjr Feb 19, 2014
e68a4c5
\G in c# for regex
robertleeplummerjr Feb 19, 2014
b8c8213
Merge remote-tracking branch 'upstream/master'
Feb 20, 2014
0094e4d
logic fixes
Feb 22, 2014
29c899c
Add extends
robertleeplummerjr Apr 2, 2014
bc5fae3
Merge remote-tracking branch 'origin/master'
robertleeplummerjr Apr 2, 2014
62cbbb5
When EOF, and there is an error, handle correctly.
robertleeplummerjr Apr 30, 2014
3bf0e99
Cleanup of __clone methods.
robertleeplummerjr Jun 10, 2014
77377c1
Fix the ability to use unput
robertleeplummerjr Jun 25, 2014
aff3102
Working well with jQuery.sheet formula parser in C#
robertleeplummerjr Jul 8, 2014
17dfa3e
Removing files not needed
robertleeplummerjr Jul 8, 2014
e203af3
Implement the unput fix defined in php port
robertleeplummerjr Jul 8, 2014
f1e0862
Merge remote-tracking branch 'upstream/master'
robertleeplummerjr Jul 8, 2014
9dc6f37
Make c# entity a bit cleaner
robertleeplummerjr Aug 5, 2014
49c624a
Buffer was overflowing, switched to spawn for more stability
Oct 31, 2013
6316d85
Cleanup
Oct 31, 2013
7c89f94
Creation on InputReader, making reading of inputs using offsets
Feb 19, 2014
4ab63ea
extends in wrong place
robertleeplummerjr Feb 19, 2014
13350ef
\G in c# for regex
robertleeplummerjr Feb 19, 2014
35a7ac7
logic fixes
Feb 22, 2014
d8cc272
When EOF, and there is an error, handle correctly.
robertleeplummerjr Apr 30, 2014
30b76c9
Cleanup of __clone methods.
robertleeplummerjr Jun 10, 2014
d556119
Fix the ability to use unput
robertleeplummerjr Jun 25, 2014
4fafb24
Working well with jQuery.sheet formula parser in C#
robertleeplummerjr Jul 8, 2014
9712146
Removing files not needed
robertleeplummerjr Jul 8, 2014
6fcb318
Implement the unput fix defined in php port
robertleeplummerjr Jul 8, 2014
5c8c9f1
Make c# entity a bit cleaner
robertleeplummerjr Aug 5, 2014
1a31184
Upstream
Sep 8, 2014
5ddd7aa
More info on why script may be failing
Sep 8, 2014
00823d9
Fix for implementing options, better notifications
Sep 9, 2014
08e1a82
Make error handling fully override-able.
Sep 29, 2014
73aa05e
Whitespace cleanup
Sep 29, 2014
3d35ae6
Rollback on jison.js
robertleeplummerjr Oct 20, 2014
4707f2d
Merge https://github.com/zaach/jison
robertleeplummerjr Oct 20, 2014
d8bfd6a
Fix from index to property
robertleeplummerjr Oct 20, 2014
7901621
Create readme.md
flip111 Oct 21, 2014
396e7a2
delete old readme
flip111 Oct 21, 2014
58861f7
Merge pull request #1 from flip111/patch-1
robertleeplummerjr Oct 21, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,14 @@ cli.processGrammars = function processGrammars(file, lexFile, jsonMode) {
grammar = ebnfParser.parse(file);
}
} catch (e) {
throw new Error('Could not parse jison grammar');
throw new Error('Could not parse jison grammar\nError: ' + e);
}
try {
if (lexFile) {
grammar.lex = require('lex-parser').parse(lexFile);
}
} catch (e) {
throw new Error('Could not parse lex grammar');
throw new Error('Could not parse lex grammar\nError: ' + e);
}
return grammar;
};
Expand Down
Binary file added ports/csharp/Jison/Jison.v12.suo
View file
Open in desktop
Binary file not shown.
13 changes: 6 additions & 7 deletions ports/csharp/Jison/Jison/Jison.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,19 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<None Include="Template.cs" />
<Compile Include="Template.cs" />
<Compile Include="Test\Formula.cs" />
<None Include="build.bat" />
<None Include="Test\formula.jison" />
<Compile Include="Test\FormulaBase.cs" />
<Compile Include="Test\Row.cs" />
<Compile Include="Test\Spreadsheet.cs" />
<Compile Include="Test\Cell.cs" />
<Compile Include="Test\Expression.cs" />
<Compile Include="Test\Location.cs" />
<Compile Include="Test\Functions.cs" />
<Compile Include="Test.cs" />
<Compile Include="Test\RowDictionary.cs" />
<Compile Include="Test\SpreadsheetDictionary.cs" />
<Compile Include="Test\SpreadsheetsDictionary.cs" />
<Compile Include="Test\Spreadsheets.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config">
Expand Down Expand Up @@ -122,7 +123,5 @@
<PreBuildEvent>
</PreBuildEvent>
</PropertyGroup>
<ItemGroup>
<Folder Include="Test\" />
</ItemGroup>
<ItemGroup />
</Project>
Loading