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: opal/opal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8acef558986d
Choose a base ref
...
head repository: opal/opal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 812eedd6d2a5
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 18, 2015

  1. String#count fully compliant with rubyspec

    @vais
    vais committed Mar 18, 2015
    Copy the full SHA
    29f5d39 View commit details

Commits on Mar 19, 2015

  1. Moved shared js helper function to bottom of class definition

    @vais
    vais committed Mar 19, 2015
    Copy the full SHA
    652d2e2 View commit details

  2. Merge pull request #766 from vais/string 

    String#count fully compliant with rubyspec
    @meh
    meh committed Mar 19, 2015
    Copy the full SHA
    812eedd View commit details
Showing with 101 additions and 89 deletions.
  1. +101 −82 opal/corelib/string.rb
  2. +0 −7 spec/filters/bugs/string.rb
183 changes: 101 additions & 82 deletions opal/corelib/string.rb
View file
Original file line number Diff line number Diff line change
@@ -299,8 +299,17 @@ def dup
copy
end

def count(str)
`(self.length - self.replace(new RegExp(str, 'g'), '').length) / str.length`
def count(*sets)
%x{
if (sets.length === 0) {
#{raise ArgumentError, "ArgumentError: wrong number of arguments (0 for 1+)"}
}
var char_class = char_class_from_char_sets(sets);
if (char_class === null) {
return 0;
}
return self.length - self.replace(new RegExp(char_class, 'g'), '').length;
}
end

alias dup clone
@@ -856,90 +865,14 @@ def split(pattern = $; || ' ', limit = undefined)

def squeeze(*sets)
%x{
function explode_sequences_in_character_set(set) {
var result = '',
i, len = set.length,
curr_char,
skip_next_dash,
char_code_from,
char_code_upto,
char_code;
for (i = 0; i < len; i++) {
curr_char = set.charAt(i);
if (curr_char === '-' && i > 0 && i < (len - 1) && !skip_next_dash) {
char_code_from = set.charCodeAt(i - 1);
char_code_upto = set.charCodeAt(i + 1);
if (char_code_from > char_code_upto) {
#{raise ArgumentError, "invalid range \"#{`char_code_from`}-#{`char_code_upto`}\" in string transliteration"}
}
for (char_code = char_code_from + 1; char_code < char_code_upto + 1; char_code++) {
result += String.fromCharCode(char_code);
}
skip_next_dash = true;
i++;
} else {
skip_next_dash = false;
result += curr_char;
}
}
return result;
}
function intersection(setA, setB) {
if (setA.length === 0) {
return setB;
}
var result = '',
i, len = setA.length,
chr;
for (i = 0; i < len; i++) {
chr = setA.charAt(i);
if (setB.indexOf(chr) !== -1) {
result += chr;
}
}
return result;
}
if (sets.length === 0) {
return self.replace(/(.)\1+/g, '$1');
}
var i, len, set, neg, chr, tmp,
pos_intersection = '',
neg_intersection = '';
for (i = 0, len = sets.length; i < len; i++) {
set = #{Opal.coerce_to(`sets[i]`, String, :to_str)};
neg = (set.charAt(0) === '^');
set = explode_sequences_in_character_set(neg ? set.slice(1) : set);
if (neg) {
neg_intersection = intersection(neg_intersection, set);
} else {
pos_intersection = intersection(pos_intersection, set);
}
}
if (pos_intersection.length > 0 && neg_intersection.length > 0) {
tmp = '';
for (i = 0, len = pos_intersection.length; i < len; i++) {
chr = pos_intersection.charAt(i);
if (neg_intersection.indexOf(chr) === -1) {
tmp += chr;
}
}
pos_intersection = tmp;
}
if (pos_intersection.length > 0) {
return self.replace(new RegExp('([' + #{Regexp.escape(`pos_intersection`)} + '])\\1+', 'g'), '$1');
}
if (neg_intersection.length > 0) {
return self.replace(new RegExp('([^' + #{Regexp.escape(`neg_intersection`)} + '])\\1+', 'g'), '$1');
var char_class = char_class_from_char_sets(sets);
if (char_class === null) {
return self;
}
return self;
return self.replace(new RegExp('(' + char_class + ')\\1+', 'g'), '$1');
}
end

@@ -1425,6 +1358,92 @@ def freeze
def frozen?
true
end

%x{
function char_class_from_char_sets(sets) {
function explode_sequences_in_character_set(set) {
var result = '',
i, len = set.length,
curr_char,
skip_next_dash,
char_code_from,
char_code_upto,
char_code;
for (i = 0; i < len; i++) {
curr_char = set.charAt(i);
if (curr_char === '-' && i > 0 && i < (len - 1) && !skip_next_dash) {
char_code_from = set.charCodeAt(i - 1);
char_code_upto = set.charCodeAt(i + 1);
if (char_code_from > char_code_upto) {
#{raise ArgumentError, "invalid range \"#{`char_code_from`}-#{`char_code_upto`}\" in string transliteration"}
}
for (char_code = char_code_from + 1; char_code < char_code_upto + 1; char_code++) {
result += String.fromCharCode(char_code);
}
skip_next_dash = true;
i++;
} else {
skip_next_dash = false;
result += curr_char;
}
}
return result;
}
function intersection(setA, setB) {
if (setA.length === 0) {
return setB;
}
var result = '',
i, len = setA.length,
chr;
for (i = 0; i < len; i++) {
chr = setA.charAt(i);
if (setB.indexOf(chr) !== -1) {
result += chr;
}
}
return result;
}
var i, len, set, neg, chr, tmp,
pos_intersection = '',
neg_intersection = '';
for (i = 0, len = sets.length; i < len; i++) {
set = #{Opal.coerce_to(`sets[i]`, String, :to_str)};
neg = (set.charAt(0) === '^' && set.length > 1);
set = explode_sequences_in_character_set(neg ? set.slice(1) : set);
if (neg) {
neg_intersection = intersection(neg_intersection, set);
} else {
pos_intersection = intersection(pos_intersection, set);
}
}
if (pos_intersection.length > 0 && neg_intersection.length > 0) {
tmp = '';
for (i = 0, len = pos_intersection.length; i < len; i++) {
chr = pos_intersection.charAt(i);
if (neg_intersection.indexOf(chr) === -1) {
tmp += chr;
}
}
pos_intersection = tmp;
neg_intersection = '';
}
if (pos_intersection.length > 0) {
return '[' + #{Regexp.escape(`pos_intersection`)} + ']';
}
if (neg_intersection.length > 0) {
return '[^' + #{Regexp.escape(`neg_intersection`)} + ']';
}
return null;
}
}
end

Symbol = String
7 changes: 0 additions & 7 deletions spec/filters/bugs/string.rb
View file
Original file line number Diff line number Diff line change
@@ -162,13 +162,6 @@
fails "String#byteslice with Range works with Range subclasses"
fails "String#byteslice with Range handles repeated application"

fails "String#count counts occurrences of chars from the intersection of the specified sets"
fails "String#count negates sets starting with ^"
fails "String#count counts all chars in a sequence"
fails "String#count raises if the given sequences are invalid"
fails "String#count calls #to_str to convert each set arg to a String"
fails "String#count raises a TypeError when a set arg can't be converted to a string"

fails "String#delete returns a new string with the chars from the intersection of sets removed"
fails "String#delete raises an ArgumentError when given no arguments"
fails "String#delete negates sets starting with ^"