Skip to content

[Java Extension] Ported the C extension parser to the Java and remove ragel generated parser. #1004

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

Open
samyron wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Java Extension] Ported the C extension parser to the Java and remove ragel generated parser. #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 2 additions & 32 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ namespace :ci do
end

JAVA_DIR = "java/src/json/ext"
JAVA_RAGEL_PATH = "#{JAVA_DIR}/ParserConfig.rl"
JAVA_PARSER_SRC = "#{JAVA_DIR}/ParserConfig.java"
JAVA_SOURCES = FileList["#{JAVA_DIR}/*.java"].exclude("#{JAVA_DIR}/Vectorized*.java")
JAVA_VEC_SOURCES = FileList["#{JAVA_DIR}/Vectorized*.java"]
JAVA_CLASSES = []
Expand All @@ -96,35 +94,6 @@ CLEAN.concat FileList["java/src/**/*.class"]
CLEAN << JRUBY_PARSER_JAR
CLEAN << JRUBY_GENERATOR_JAR

CLOBBER << JAVA_PARSER_SRC

which = lambda { |c|
w = `which #{c}`
break w.chomp unless w.empty?
}

if RUBY_PLATFORM =~ /mingw|mswin/
# cleans up Windows CI output
RAGEL_CODEGEN = %w[ragel].find(&which)
RAGEL_DOTGEN = %w[ragel].find(&which)
else
RAGEL_CODEGEN = %w[rlcodegen rlgen-cd ragel].find(&which)
RAGEL_DOTGEN = %w[rlgen-dot rlgen-cd ragel].find(&which)
end

file JAVA_PARSER_SRC => JAVA_RAGEL_PATH do
cd JAVA_DIR do
if RAGEL_CODEGEN == 'ragel'
sh "ragel ParserConfig.rl -J -o ParserConfig.java"
else
sh "ragel -x ParserConfig.rl | #{RAGEL_CODEGEN} -J"
end
end
end

desc "Generate parser with ragel"
task :ragel => [JAVA_PARSER_SRC]

if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
path_separator = File::PATH_SEPARATOR
ENV['JAVA_HOME'] ||= [
Expand Down Expand Up @@ -174,7 +143,7 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
end

desc "Compiling jruby extension"
task :compile => [:ragel] + JAVA_CLASSES
task :compile => JAVA_CLASSES

desc "Package the jruby gem"
task :jruby_gem => :create_jar do
Expand All @@ -199,6 +168,7 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
"json/ext/Parser*.class",
"json/ext/RuntimeInfo*.class",
"json/ext/StringDecoder*.class",
"json/ext/*StringScanner*.class",
"json/ext/Utils*.class"
]
sh 'jar', 'cf', File.basename(JRUBY_PARSER_JAR), *parser_classes
Expand Down
Loading
Loading