rbs 3.10.0 → 4.0.0.dev.1

data/src/util/rbs_unescape.c

@@ -1,5 +1,4 @@
 #include "rbs/util/rbs_unescape.h"
-#include "rbs/util/rbs_encoding.h"
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -7,26 +6,26 @@
 // Define the escape character mappings
 // TODO: use a switch instead
 static const struct {
-    const char *from;
-    const char *to;
+    const char* from;
+    const char* to;
 } TABLE[] = {
-    { "\\a", "\a" },
-    { "\\b", "\b" },
-    { "\\e", "\033" },
-    { "\\f", "\f" },
-    { "\\n", "\n" },
-    { "\\r", "\r" },
-    { "\\s", " " },
-    { "\\t", "\t" },
-    { "\\v", "\v" },
-    { "\\\"", "\"" },
-    { "\\'", "'" },
-    { "\\\\", "\\" },
-    { "\\", "" }
+    {"\\a", "\a"},
+    {"\\b", "\b"},
+    {"\\e", "\033"},
+    {"\\f", "\f"},
+    {"\\n", "\n"},
+    {"\\r", "\r"},
+    {"\\s", " "},
+    {"\\t", "\t"},
+    {"\\v", "\v"},
+    {"\\\"", "\""},
+    {"\\'", "'"},
+    {"\\\\", "\\"},
+    {"\\", ""}
 };
 
 // Helper function to convert hex string to integer
-static int hex_to_int(const char *hex, int length) {
+static int hex_to_int(const char* hex, int length) {
     int result = 0;
     for (int i = 0; i < length; i++) {
         result = result * 16 + (isdigit(hex[i]) ? hex[i] - '0' : tolower(hex[i]) - 'a' + 10);
@@ -35,7 +34,7 @@ static int hex_to_int(const char *hex, int length) {
 }
 
 // Helper function to convert octal string to integer
-static int octal_to_int(const char *octal, int length) {
+static int octal_to_int(const char* octal, int length) {
     int result = 0;
     for (int i = 0; i < length; i++) {
         result = result * 8 + (octal[i] - '0');
@@ -43,82 +42,45 @@ static int octal_to_int(const char *octal, int length) {
     return result;
 }
 
-// Fills buf starting at index 'start' with the UTF-8 encoding of 'codepoint'.
-// Returns the number of bytes written, or 0 when the output is not changed.
-//
-size_t rbs_utf8_fill_codepoint(char *buf, size_t start, size_t end, unsigned int codepoint) {
-    if (start + 4 > end) {
-        return 0;
-    }
-
-    if (codepoint <= 0x7F) {
-        buf[start] = codepoint & 0x7F;
-        return 1;
-    } else if (codepoint <= 0x7FF) {
-        buf[start + 0] = 0xC0 | ((codepoint >> 6) & 0x1F);
-        buf[start + 1] = 0x80 | (codepoint & 0x3F);
-        return 2;
-    } else if (codepoint <= 0xFFFF) {
-        buf[start + 0] = 0xE0 | ((codepoint >> 12) & 0x0F);
-        buf[start + 1] = 0x80 | ((codepoint >> 6) & 0x3F);
-        buf[start + 2] = 0x80 | (codepoint & 0x3F);
-        return 3;
-    } else if (codepoint <= 0x10FFFF) {
-        buf[start + 0] = 0xF0 | ((codepoint >> 18) & 0x07);
-        buf[start + 1] = 0x80 | ((codepoint >> 12) & 0x3F);
-        buf[start + 2] = 0x80 | ((codepoint >> 6) & 0x3F);
-        buf[start + 3] = 0x80 | (codepoint & 0x3F);
-        return 4;
-    } else {
-        return 0;
-    }
+int rbs_utf8_codelen(unsigned int c) {
+    if (c <= 0x7F) return 1;
+    if (c <= 0x7FF) return 2;
+    if (c <= 0xFFFF) return 3;
+    if (c <= 0x10FFFF) return 4;
+    return 1; // Invalid Unicode codepoint, treat as 1 byte
 }
 
-rbs_string_t unescape_string(rbs_allocator_t *allocator, const rbs_string_t string, bool is_double_quote, bool is_unicode) {
+rbs_string_t unescape_string(rbs_allocator_t *allocator, const rbs_string_t string, bool is_double_quote) {
     if (!string.start) return RBS_STRING_NULL;
 
     size_t len = string.end - string.start;
-    const char *input = string.start;
+    const char* input = string.start;
 
-    // The output cannot be longer than the input even after unescaping.
-    char *output = rbs_allocator_alloc_many(allocator, len + 1, char);
+    char* output = rbs_allocator_alloc_many(allocator, len + 1, char);
     if (!output) return RBS_STRING_NULL;
 
     size_t i = 0, j = 0;
     while (i < len) {
         if (input[i] == '\\' && i + 1 < len) {
             if (is_double_quote) {
-                if (isdigit(input[i + 1])) {
+                if (isdigit(input[i+1])) {
                     // Octal escape
                     int octal_len = 1;
-                    while (octal_len < 3 && i + 1 + octal_len < len && isdigit(input[i + 1 + octal_len]))
-                        octal_len++;
+                    while (octal_len < 3 && i + 1 + octal_len < len && isdigit(input[i + 1 + octal_len])) octal_len++;
                     int value = octal_to_int(input + i + 1, octal_len);
-                    output[j++] = (char) value;
+                    output[j++] = (char)value;
                     i += octal_len + 1;
-                } else if (input[i + 1] == 'x' && i + 3 < len) {
+                } else if (input[i+1] == 'x' && i + 3 < len) {
                     // Hex escape
-                    int hex_len = isxdigit(input[i + 3]) ? 2 : 1;
+                    int hex_len = isxdigit(input[i+3]) ? 2 : 1;
                     int value = hex_to_int(input + i + 2, hex_len);
-                    output[j++] = (char) value;
+                    output[j++] = (char)value;
                     i += hex_len + 2;
-                } else if (input[i + 1] == 'u' && i + 5 < len) {
+                } else if (input[i+1] == 'u' && i + 5 < len) {
                     // Unicode escape
-
-                    if (is_unicode) {
-                        // The UTF-8 representation is at most 4 bytes, shorter than the input length.
-                        int value = hex_to_int(input + i + 2, 4);
-                        j += rbs_utf8_fill_codepoint(output, j, len + 1, value);
-                        i += 6;
-                    } else {
-                        // Copy the escape sequence as-is
-                        output[j++] = input[i++];
-                        output[j++] = input[i++];
-                        output[j++] = input[i++];
-                        output[j++] = input[i++];
-                        output[j++] = input[i++];
-                        output[j++] = input[i++];
-                    }
+                    int value = hex_to_int(input + i + 2, 4);
+                    output[j++] = (char)value;
+                    i += 6;
                 } else {
                     // Other escapes
                     int found = 0;
@@ -136,8 +98,8 @@ rbs_string_t unescape_string(rbs_allocator_t *allocator, const rbs_string_t stri
                 }
             } else {
                 /* Single quote: only escape ' and \ */
-                if (input[i + 1] == '\'' || input[i + 1] == '\\') {
-                    output[j++] = input[i + 1];
+                if (input[i+1] == '\'' || input[i+1] == '\\') {
+                    output[j++] = input[i+1];
                     i += 2;
                 } else {
                     output[j++] = input[i++];
@@ -151,17 +113,18 @@ rbs_string_t unescape_string(rbs_allocator_t *allocator, const rbs_string_t stri
     return rbs_string_new(output, output + j);
 }
 
-rbs_string_t rbs_unquote_string(rbs_allocator_t *allocator, rbs_string_t input, const rbs_encoding_t *encoding) {
-    unsigned int first_char = input.start[0];
-
-    const char *new_start = input.start;
-    const char *new_end = input.end;
+rbs_string_t rbs_unquote_string(rbs_allocator_t *allocator, rbs_string_t input) {
+    unsigned int first_char = rbs_utf8_string_to_codepoint(input);
+    size_t byte_length = rbs_string_len(input);
 
+    ptrdiff_t start_offset = 0;
     if (first_char == '"' || first_char == '\'' || first_char == '`') {
-        new_start += 1;
-        new_end -= 1;
+      int bs = rbs_utf8_codelen(first_char);
+      start_offset += bs;
+      byte_length -= 2 * bs;
     }
 
-    rbs_string_t string = rbs_string_new(new_start, new_end);
-    return unescape_string(allocator, string, first_char == '"', encoding == RBS_ENCODING_UTF_8_ENTRY);
+    const char *new_start = input.start + start_offset;
+    rbs_string_t string = rbs_string_new(new_start, new_start + byte_length);
+    return unescape_string(allocator, string, first_char == '"');
 }

data/stdlib/bigdecimal/0/big_decimal.rbs

@@ -609,7 +609,7 @@ class BigDecimal < Numeric
   # The quotient q is (a/b).floor, and the modulus is the amount that must be
   # added to q * b to get a.
   #
-  def divmod: (Numeric) -> [ Integer, BigDecimal ]
+  def divmod: (Numeric) -> [ BigDecimal, BigDecimal ]
 
   # <!--
   #   rdoc-file=ext/bigdecimal/bigdecimal.c
@@ -783,6 +783,20 @@ class BigDecimal < Numeric
   #
   def power: (Numeric n, int prec) -> BigDecimal
 
+  # <!--
+  #   rdoc-file=ext/bigdecimal/bigdecimal.c
+  #   - precs -> array
+  # -->
+  # Returns an Array of two Integer values that represent platform-dependent
+  # internal storage properties.
+  #
+  # This method is deprecated and will be removed in the future. Instead, use
+  # BigDecimal#n_significant_digits for obtaining the number of significant digits
+  # in scientific notation, and BigDecimal#precision for obtaining the number of
+  # digits in decimal notation.
+  #
+  def precs: () -> [ Integer, Integer ]
+
   # <!--
   #   rdoc-file=ext/bigdecimal/bigdecimal.c
   #   - quo(value)  -> bigdecimal
@@ -1260,35 +1274,33 @@ class Integer
 
   # <!--
   #   rdoc-file=numeric.c
-  #   - self / other -> numeric
+  #   - self / numeric -> numeric_result
   # -->
-  # Returns the quotient of `self` and `other`.
-  #
-  # For integer `other`, truncates the result to an integer:
+  # Performs division; for integer `numeric`, truncates the result to an integer:
   #
-  #     4 / 3              # => 1
-  #     4 / -3             # => -2
-  #     -4 / 3             # => -2
-  #     -4 / -3            # => 1
+  #      4 / 3              # => 1
+  #      4 / -3             # => -2
+  #      -4 / 3             # => -2
+  #      -4 / -3            # => 1
   #
-  # For non-integer `other`, returns a non-integer result:
+  #     For other +numeric+, returns non-integer result:
   #
-  #     4 / 3.0            # => 1.3333333333333333
-  #     4 / Rational(3, 1) # => (4/3)
-  #     4 / Complex(3, 0)  # => ((4/3)+0i)
+  #      4 / 3.0            # => 1.3333333333333333
+  #      4 / Rational(3, 1) # => (4/3)
+  #      4 / Complex(3, 0)  # => ((4/3)+0i)
   #
   def /: (BigDecimal) -> BigDecimal
     | ...
 
   # <!--
   #   rdoc-file=numeric.c
-  #   - self * other -> numeric
+  #   - self * numeric -> numeric_result
   # -->
-  # Returns the numeric product of `self` and `other`:
+  # Performs multiplication:
   #
   #     4 * 2              # => 8
-  #     -4 * 2             # => -8
   #     4 * -2             # => -8
+  #     -4 * 2             # => -8
   #     4 * 2.0            # => 8.0
   #     4 * Rational(1, 3) # => (4/3)
   #     4 * Complex(2, 0)  # => (8+0i)
@@ -1298,29 +1310,25 @@ class Integer
 
   # <!--
   #   rdoc-file=numeric.c
-  #   - self + other -> numeric
+  #   - self + numeric -> numeric_result
   # -->
-  # Returns the sum of `self` and `other`:
-  #
-  #     1 + 1               # => 2
-  #     1 + -1             # => 0
-  #     1 + 0              # => 1
-  #     1 + -2             # => -1
-  #     1 + Complex(1, 0)  # => (2+0i)
-  #     1 + Rational(1, 1) # => (2/1)
+  # Performs addition:
   #
-  # For a computation involving Floats, the result may be inexact (see Float#+):
-  #
-  #     1 + 3.14           # => 4.140000000000001
+  #     2 + 2              # => 4
+  #     -2 + 2             # => 0
+  #     -2 + -2            # => -4
+  #     2 + 2.0            # => 4.0
+  #     2 + Rational(2, 1) # => (4/1)
+  #     2 + Complex(2, 0)  # => (4+0i)
   #
   def +: (BigDecimal) -> BigDecimal
     | ...
 
   # <!--
   #   rdoc-file=numeric.c
-  #   - self - other -> numeric
+  #   - self - numeric -> numeric_result
   # -->
-  # Returns the difference of `self` and `other`:
+  # Performs subtraction:
   #
   #     4 - 2              # => 2
   #     -4 - 2             # => -6
@@ -1360,7 +1368,7 @@ class Float
   #   rdoc-file=numeric.c
   #   - self / other -> numeric
   # -->
-  # Returns the quotient of `self` and `other`:
+  # Returns a new Float which is the result of dividing `self` by `other`:
   #
   #     f = 3.14
   #     f / 2              # => 1.57
@@ -1375,7 +1383,7 @@ class Float
   #   rdoc-file=numeric.c
   #   - self * other -> numeric
   # -->
-  # Returns the numeric product of `self` and `other`:
+  # Returns a new Float which is the product of `self` and `other`:
   #
   #     f = 3.14
   #     f * 2              # => 6.28
@@ -1388,20 +1396,15 @@ class Float
 
   # <!--
   #   rdoc-file=numeric.c
-  #   - self + other -> float or complex
+  #   - self + other -> numeric
   # -->
-  # Returns the sum of `self` and `other`; the result may be inexact (see Float):
-  #
-  #     3.14 + 0              # => 3.14
-  #     3.14 + 1              # => 4.140000000000001
-  #     -3.14 + 0             # => -3.14
-  #     -3.14 + 1             # => -2.14
+  # Returns a new Float which is the sum of `self` and `other`:
   #
-  #     3.14 + -3.14          # => 0.0
-  #     -3.14 + -3.14         # => -6.28
-  #
-  #     3.14 + Complex(1, 0)   # => (4.140000000000001+0i)
-  #     3.14 + Rational(1, 1)  # => 4.140000000000001
+  #     f = 3.14
+  #     f + 1                 # => 4.140000000000001
+  #     f + 1.0               # => 4.140000000000001
+  #     f + Rational(1, 1)    # => 4.140000000000001
+  #     f + Complex(1, 0)     # => (4.140000000000001+0i)
   #
   def +: (BigDecimal) -> BigDecimal
     | ...
@@ -1410,7 +1413,7 @@ class Float
   #   rdoc-file=numeric.c
   #   - self - other -> numeric
   # -->
-  # Returns the difference of `self` and `other`:
+  # Returns a new Float which is the difference of `self` and `other`:
   #
   #     f = 3.14
   #     f - 1                 # => 2.14
@@ -1465,9 +1468,10 @@ class Rational
 
   # <!--
   #   rdoc-file=rational.c
-  #   - self / other -> numeric
+  #   - rat / numeric     ->  numeric
+  #   - rat.quo(numeric)  ->  numeric
   # -->
-  # Returns the quotient of `self` and `other`:
+  # Performs division.
   #
   #     Rational(2, 3)  / Rational(2, 3)   #=> (1/1)
   #     Rational(900)   / Rational(1)      #=> (900/1)
@@ -1480,50 +1484,39 @@ class Rational
 
   # <!--
   #   rdoc-file=rational.c
-  #   - self * other -> numeric
+  #   - rat * numeric  ->  numeric
   # -->
-  # Returns the numeric product of `self` and `other`:
+  # Performs multiplication.
   #
-  #     Rational(9, 8)  * 4               #=> (9/2)
-  #     Rational(20, 9) * 9.8             #=> 21.77777777777778
-  #     Rational(9, 8)  * Complex(1, 2)   # => ((9/8)+(9/4)*i)
-  #     Rational(2, 3)  * Rational(2, 3)  #=> (4/9)
-  #     Rational(900)   * Rational(1)     #=> (900/1)
-  #     Rational(-2, 9) * Rational(-9, 2) #=> (1/1)
+  #     Rational(2, 3)  * Rational(2, 3)   #=> (4/9)
+  #     Rational(900)   * Rational(1)      #=> (900/1)
+  #     Rational(-2, 9) * Rational(-9, 2)  #=> (1/1)
+  #     Rational(9, 8)  * 4                #=> (9/2)
+  #     Rational(20, 9) * 9.8              #=> 21.77777777777778
   #
   def *: (BigDecimal) -> BigDecimal
     | ...
 
   # <!--
   #   rdoc-file=rational.c
-  #   - self + other -> numeric
+  #   - rat + numeric  ->  numeric
   # -->
-  # Returns the sum of `self` and `other`:
-  #
-  #     Rational(2, 3) + 0  # => (2/3)
-  #     Rational(2, 3) + 1  # => (5/3)
-  #     Rational(2, 3) + -1 # => (-1/3)
-  #
-  #     Rational(2, 3) + Complex(1, 0)     # => ((5/3)+0i)
+  # Performs addition.
   #
-  #     Rational(2, 3) + Rational(1, 1)     # => (5/3)
-  #     Rational(2, 3) + Rational(3, 2)     # => (13/6)
-  #     Rational(2, 3) + Rational(3.0, 2.0) # => (13/6)
-  #     Rational(2, 3) + Rational(3.1, 2.1) # => (30399297484750849/14186338826217063)
-  #
-  # For a computation involving Floats, the result may be inexact (see Float#+):
-  #
-  #     Rational(2, 3) + 1.0 # => 1.6666666666666665
-  #     Rational(2, 3) + Complex(1.0, 0.0) # => (1.6666666666666665+0.0i)
+  #     Rational(2, 3)  + Rational(2, 3)   #=> (4/3)
+  #     Rational(900)   + Rational(1)      #=> (901/1)
+  #     Rational(-2, 9) + Rational(-9, 2)  #=> (-85/18)
+  #     Rational(9, 8)  + 4                #=> (41/8)
+  #     Rational(20, 9) + 9.8              #=> 12.022222222222222
   #
   def +: (BigDecimal) -> BigDecimal
     | ...
 
   # <!--
   #   rdoc-file=rational.c
-  #   - self - other -> numeric
+  #   - rat - numeric  ->  numeric
   # -->
-  # Returns the difference of `self` and `other`:
+  # Performs subtraction.
   #
   #     Rational(2, 3)  - Rational(2, 3)   #=> (0/1)
   #     Rational(900)   - Rational(1)      #=> (899/1)
@@ -1560,9 +1553,9 @@ class Complex
 
   # <!--
   #   rdoc-file=complex.c
-  #   - self / other -> complex
+  #   - complex / numeric -> new_complex
   # -->
-  # Returns the quotient of `self` and `other`:
+  # Returns the quotient of `self` and `numeric`:
   #
   #     Complex.rect(2, 3)  / Complex.rect(2, 3)  # => (1+0i)
   #     Complex.rect(900)   / Complex.rect(1)     # => (900+0i)
@@ -1575,50 +1568,39 @@ class Complex
 
   # <!--
   #   rdoc-file=complex.c
-  #   - self * other -> numeric
+  #   - complex * numeric -> new_complex
   # -->
-  # Returns the numeric product of `self` and `other`:
+  # Returns the product of `self` and `numeric`:
   #
-  #     Complex.rect(9, 8)  * 4                   # => (36+32i)
-  #     Complex.rect(20, 9) * 9.8                 # => (196.0+88.2i)
   #     Complex.rect(2, 3)  * Complex.rect(2, 3)  # => (-5+12i)
   #     Complex.rect(900)   * Complex.rect(1)     # => (900+0i)
   #     Complex.rect(-2, 9) * Complex.rect(-9, 2) # => (0-85i)
-  #     Complex.rect(9, 8)  * Rational(2, 3)      # => ((6/1)+(16/3)*i)
+  #     Complex.rect(9, 8)  * 4                   # => (36+32i)
+  #     Complex.rect(20, 9) * 9.8                 # => (196.0+88.2i)
   #
   def *: (BigDecimal) -> Complex
     | ...
 
   # <!--
   #   rdoc-file=complex.c
-  #   - self + other -> numeric
+  #   - complex + numeric -> new_complex
   # -->
-  # Returns the sum of `self` and `other`:
-  #
-  #     Complex(1, 2) + 0  # => (1+2i)
-  #     Complex(1, 2) + 1  # => (2+2i)
-  #     Complex(1, 2) + -1 # => (0+2i)
-  #
-  #     Complex(1, 2) + 1.0  # => (2.0+2i)
-  #
-  #     Complex(1, 2) + Complex(2, 1)     # => (3+3i)
-  #     Complex(1, 2) + Complex(2.0, 1.0) # => (3.0+3.0i)
-  #
-  #     Complex(1, 2) + Rational(1, 1) # => ((2/1)+2i)
-  #     Complex(1, 2) + Rational(1, 2) # => ((3/2)+2i)
-  #
-  # For a computation involving Floats, the result may be inexact (see Float#+):
+  # Returns the sum of `self` and `numeric`:
   #
-  #     Complex(1, 2) + 3.14 # => (4.140000000000001+2i)
+  #     Complex.rect(2, 3)  + Complex.rect(2, 3)  # => (4+6i)
+  #     Complex.rect(900)   + Complex.rect(1)     # => (901+0i)
+  #     Complex.rect(-2, 9) + Complex.rect(-9, 2) # => (-11+11i)
+  #     Complex.rect(9, 8)  + 4                   # => (13+8i)
+  #     Complex.rect(20, 9) + 9.8                 # => (29.8+9i)
   #
   def +: (BigDecimal) -> Complex
     | ...
 
   # <!--
   #   rdoc-file=complex.c
-  #   - self - other -> complex
+  #   - complex - numeric -> new_complex
   # -->
-  # Returns the difference of `self` and `other`:
+  # Returns the difference of `self` and `numeric`:
   #
   #     Complex.rect(2, 3)  - Complex.rect(2, 3)  # => (0+0i)
   #     Complex.rect(900)   - Complex.rect(1)     # => (899+0i)