src/emacs/flyparse/FlyparseErrorNode.java
@@ -1,5 +1,6 @@
*.zip
*.elc
+*~
*/*.tokens
.gitignore
@@ -21,30 +21,31 @@ require 'fileutils'
require 'date'
ARCHIVE_NAME = "flyparse_#{Date.today}.zip"
+RAKE = PLATFORM =~ /linux/ ? "rake" : "rake.bat"
task :clean => [] do
FileUtils.rm_rf Dir.glob('bin/*')
end
task :compile_common => [] do
- system "javac src/emacs/flyparse/FlyparseTreeAdaptor.java src/emacs/flyparse/FlyparseTree.java src/emacs/flyparse/SanitizedFileStream.java -d bin"
+ sh "javac src/emacs/flyparse/FlyparseTreeAdaptor.java src/emacs/flyparse/FlyparseErrorNode.java src/emacs/flyparse/FlyparseTree.java src/emacs/flyparse/SanitizedFileStream.java -d bin"
end
task :as3 => [] do
Dir.chdir("as3"){
- system "rake.bat"
+ sh "#{RAKE}"
}
end
task :css => [] do
Dir.chdir("css"){
- system "rake.bat"
+ sh "#{RAKE}"
}
end
task :javascript => [] do
Dir.chdir("javascript"){
- system "rake.bat"
+ sh "#{RAKE}"
}
end
@@ -53,7 +54,7 @@ end
task :make_jar => [] do
Dir.chdir("bin"){
- system "jar cf ../lib/flyparse_parsers.jar emacs"
+ sh "jar cf ../lib/flyparse_parsers.jar emacs"
if $?.success?; puts "Created jar successfully."; end
}
end
@@ -66,7 +67,7 @@ task :make_archive => [:make_jar] do
"css/css-flyparse-extensions.el",
"javascript/javascript-flyparse-extensions.el"]
- system "7z a -r -tZip -x!*.svn #{ARCHIVE_NAME} #{archive_files.join(" ")}"
+ sh "7z a -r -tZip -x!*.svn #{ARCHIVE_NAME} #{archive_files.join(" ")}"
if $?.success? and File.exist? ARCHIVE_NAME
puts "Created deployment archive successfully."
else
@@ -76,21 +77,24 @@ end
task :test => [] do
Dir.chdir("as3"){
- system "rake.bat test"
+ sh "#{RAKE} test"
}
Dir.chdir("css"){
- system "rake.bat test"
+ sh "#{RAKE} test"
}
Dir.chdir("javascript"){
- system "rake.bat test"
+ sh "#{RAKE} test"
}
end
-task :deploy => [:clean, :compile_common, :all_languages, :make_archive] do
+task :deploy => [:build, :make_archive] do
+end
+
+task :build => [:clean, :compile_common, :all_languages] do
end
-task :default => [:deploy]
+task :default => [:build]
Rakefile
@@ -316,7 +316,7 @@ variableDefinition
declaration
: varOrConst variableDeclarator declarationTail
- -> ^(DECLARATION varOrConst variableDeclarator declarationTail)
+ -> ^(DECLARATION varOrConst variableDeclarator declarationTail?)
;
varOrConst
@@ -391,7 +391,7 @@ statement
| ifStatement
- | forEachStatement
+ | (FOR EACH) => forEachStatement
| forStatement
as3/AS3.g
@@ -97,15 +97,15 @@ public class AS3Driver{
CommonTokenStream tokens = new CommonTokenStream(lex);
AS3Parser parser = new AS3Parser(tokens);
parser.setTreeAdaptor(new FlyparseTreeAdaptor());
- try{
+// try{
AS3Parser.compilationUnit_return ret = parser.compilationUnit();
FlyparseTree tree = (FlyparseTree)ret.getTree();
tree.prepareTree();
tree.writeTo(bout);
- }
- catch(Exception e){
- bout.write("()");
- }
+// }
+// catch(Exception e){
+// bout.write("()");
+// }
}
}
\ No newline at end of file
as3/src/emacs/flyparse/as3/AS3Driver.java
@@ -60,6 +60,14 @@ public class FlyparseTreeAdaptor extends CommonTreeAdaptor {
public Token createToken(Token fromToken) {
return new CommonToken(fromToken);
}
+
+
+ public Object errorNode(TokenStream input, Token start, Token stop,
+ RecognitionException e)
+ {
+ FlyparseErrorNode t = new FlyparseErrorNode(input, start, stop, e);
+ return t;
+ }
src/emacs/flyparse/FlyparseTreeAdaptor.java
@@ -16,6 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
require 'find'
+require 'rubygems'
require 'platform'
require 'popen4'
test_helper.rb
f8baebe06774ab25c9df2dc636ca3142b145cf29
Aemon Cannon
aemoncannon@gmail.com
http://github.com/aemoncannon/flyparse-mode/commit/69c88707e6722dffd2a1ca327e396acc1768e4cb
69c88707e6722dffd2a1ca327e396acc1768e4cb
2008-09-06T14:04:17-07:00
2008-09-06T14:04:17-07:00
Update flyparse to work with linux and antlr version 3.1.
b4a760a6806caa900727930697fa4fc123331436
Aemon Cannon
aemoncannon@gmail.com