Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jcodings
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d664e34de181
Choose a base ref
...
head repository: jruby/jcodings
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1e4e293cd76c
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Dec 21, 2015

  1. remove intermediate transcoder array

    @lopex
    lopex committed Dec 21, 2015
    Copy the full SHA
    2c94b0f View commit details

  2. synchronize scripts

    @lopex
    lopex committed Dec 21, 2015
    Copy the full SHA
    1e4e293 View commit details
Showing with 513 additions and 518 deletions.
  1. +1 −1 scripts/ExtractTranscoders.rb
  2. +2 −2 scripts/TranscoderListTemplate.java
  3. +313 −318 src/org/jcodings/transcode/TranscoderDB.java
  4. +197 −197 src/org/jcodings/transcode/TranscoderList.java
2 changes: 1 addition & 1 deletion scripts/ExtractTranscoders.rb
View file
Original file line number Diff line number Diff line change
@@ -207,7 +207,7 @@ def assert
end
end
open("#{trans_dir}/TranscoderList.java", "wb") << open("TranscoderListTemplate.java").read.
sub(/%\{list\}/, transcoder_list.map{|src, dst, cls, specific| "#{INDENT*2}{#{src}, #{dst}, #{specific ? '"' + cls + '"' : 'null /*' + cls + '*/'}}"}.join(",\n")).
sub(/%\{list\}/, transcoder_list.map{|src, dst, cls, specific| "#{INDENT*2}TranscoderDB.declare(#{src}, #{dst}, #{specific ? '"' + cls + '"' : 'null /*' + cls + '*/'});"}.join("\n")).
sub(/%\{generic\}/, generic_list.map{|g| "#{INDENT*2}new GenericTranscoderEntry(#{g.join(', ')})"}.join(",\n"))


4 changes: 2 additions & 2 deletions scripts/TranscoderListTemplate.java
View file
Original file line number Diff line number Diff line change
@@ -22,11 +22,11 @@
import org.jcodings.transcode.Transcoder.GenericTranscoderEntry;

final class TranscoderList {
static final String[][] LIST = new String[][] {
static void load() {
%{list}
};

static final GenericTranscoderEntry[] GENERIC_LIST = new GenericTranscoderEntry[] {
%{generic}
};
}
}
Loading