fix

Author: myfreess

parser.mbt

@@ -3,7 +3,7 @@
 /// Simplified version based on js-yaml v3.13.1
 
 // Parser state
-struct ParserState {
+priv struct ParserState {
   input : String
   mut position : Int
   mut line : Int
@@ -69,12 +69,12 @@ fn ParserState::skip_whitespace(self : ParserState) -> Unit {
 fn ParserState::read_until(
   self : ParserState,
   predicate : (Int) -> Bool,
-) -> String {
+) -> String raise {
   let start = self.position
   while self.position < self.length && predicate(self.current_char()) {
     self.advance()
   }
-  self.input.substring(start~, end=self.position)
+  self.input[start:self.position].to_string()
 }
 
 ///|
@@ -92,7 +92,7 @@ fn sanitize_input_internal(input : String) -> String {
 
 ///|
 /// Parse a scalar value
-fn parse_scalar(state : ParserState) -> YamlValue raise YamlParseError {
+fn parse_scalar(state : ParserState) -> YamlValue raise {
   state.skip_whitespace()
   if state.current_char() == 0 {
     return YamlValue::Null
@@ -128,11 +128,11 @@ fn parse_double_quoted_string(
         0x09 => result += "\t" // \t
         _ => {
           result += "\\"
-          result += Char::from_int(escaped).to_string()
+          result += Int::unsafe_to_char(escaped).to_string()
         }
       }
     } else {
-      result += Char::from_int(ch).to_string()
+      result += Int::unsafe_to_char(ch).to_string()
     }
     state.advance()
   }
@@ -159,7 +159,7 @@ fn parse_single_quoted_string(
       state.advance()
       state.advance()
     } else {
-      result += Char::from_int(ch).to_string()
+      result += Int::unsafe_to_char(ch).to_string()
       state.advance()
     }
   }
@@ -173,7 +173,7 @@ fn parse_single_quoted_string(
 
 ///|
 /// Parse plain scalar (unquoted)
-fn parse_plain_scalar(state : ParserState) -> YamlValue {
+fn parse_plain_scalar(state : ParserState) -> YamlValue raise {
   let text = state.read_until(fn(ch) {
     !is_whitespace_or_eol(ch) &&
     !is_flow_indicator(ch) &&
@@ -247,7 +247,7 @@ fn contains_dot(text : String) -> Bool {
 
 ///|
 /// Simple integer parsing
-fn parse_int_simple(text : @string.View) -> Int {
+fn parse_int_simple(text : StringView) -> Int {
   let mut result = 0
   let mut negative = false
   let start = if text[0] == 45 { // 45 is '-'
@@ -295,7 +295,7 @@ fn power_of_10(n : Int) -> Int {
 
 ///|
 /// Parse array (sequence)
-fn parse_array(state : ParserState) -> YamlValue raise YamlParseError {
+fn parse_array(state : ParserState) -> YamlValue raise {
   state.advance() // Skip '['
   state.skip_whitespace()
   let result = []
@@ -325,7 +325,7 @@ fn parse_array(state : ParserState) -> YamlValue raise YamlParseError {
 
 ///|
 /// Parse object (mapping)
-fn parse_object(state : ParserState) -> YamlValue raise YamlParseError {
+fn parse_object(state : ParserState) -> YamlValue raise {
   state.advance() // Skip '{'
   state.skip_whitespace()
   let result = Map::new()
@@ -372,7 +372,7 @@ fn parse_object(state : ParserState) -> YamlValue raise YamlParseError {
 
 ///|
 /// Parse any YAML value
-fn parse_value(state : ParserState) -> YamlValue raise YamlParseError {
+fn parse_value(state : ParserState) -> YamlValue raise {
   state.skip_whitespace()
   let ch = state.current_char()
   if ch == 0 {
@@ -408,9 +408,7 @@ fn ParserState::skip_document_separator(self : ParserState) -> Unit {
 
 ///|
 /// Read all documents from the input
-fn ParserState::read_documents(
-  self : ParserState,
-) -> Array[YamlValue] raise YamlParseError {
+fn ParserState::read_documents(self : ParserState) -> Array[YamlValue] raise {
   let documents = []
   self.skip_whitespace()
 
@@ -439,7 +437,7 @@ fn ParserState::read_documents(
 pub fn parse(
   content : String,
   options? : ParseOptions = ParseOptions::new(),
-) -> YamlValue raise YamlParseError {
+) -> YamlValue raise {
   let state = ParserState::new(content, options)
 
   // Use read_documents to get all documents
@@ -461,7 +459,7 @@ pub fn parse(
 pub fn parse_all(
   content : String,
   options? : ParseOptions = ParseOptions::new(),
-) -> Array[YamlValue] raise YamlParseError {
+) -> Array[YamlValue] raise {
   let state = ParserState::new(content, options)
   state.read_documents()
 }

pkg.generated.mbti

@@ -148,13 +148,13 @@ fn pad_string(String, Int) -> String
 
 fn pairs_type() -> YamlType[Array[(String, YamlValue)]]
 
-fn parse(String, options? : ParseOptions) -> YamlValue raise YamlParseError
+fn parse(String, options? : ParseOptions) -> YamlValue raise
 
-fn parse_all(String, options? : ParseOptions) -> Array[YamlValue] raise YamlParseError
+fn parse_all(String, options? : ParseOptions) -> Array[YamlValue] raise
 
 fn process_folded_string(String) -> String
 
-fn process_literal_string(String) -> String
+fn process_literal_string(String) -> String raise
 
 fn resolve_scalar(String, Schema) -> YamlValue
 
@@ -221,6 +221,11 @@ pub enum KindType {
   Scalar
   Mapping
 }
+fn KindType::equal(Self, Self) -> Bool // from trait `Eq`
+#deprecated
+fn KindType::op_equal(Self, Self) -> Bool // from trait `Eq`
+fn KindType::output(Self, &Logger) -> Unit // from trait `Show`
+fn KindType::to_string(Self) -> String // from trait `Show`
 impl Eq for KindType
 impl Show for KindType
 
@@ -232,13 +237,16 @@ pub struct ParseOptions {
 fn ParseOptions::default() -> Self
 fn ParseOptions::new() -> Self
 
-type ParserState
-
 pub struct Position {
   line : Int
   column : Int
   index : Int
 }
+fn Position::equal(Self, Self) -> Bool // from trait `Eq`
+#deprecated
+fn Position::op_equal(Self, Self) -> Bool // from trait `Eq`
+fn Position::output(Self, &Logger) -> Unit // from trait `Show`
+fn Position::to_string(Self) -> String // from trait `Show`
 impl Eq for Position
 impl Show for Position
 
@@ -255,6 +263,11 @@ pub enum SchemaType {
   Default
   Extended
 }
+fn SchemaType::equal(Self, Self) -> Bool // from trait `Eq`
+#deprecated
+fn SchemaType::op_equal(Self, Self) -> Bool // from trait `Eq`
+fn SchemaType::output(Self, &Logger) -> Unit // from trait `Show`
+fn SchemaType::to_string(Self) -> String // from trait `Show`
 impl Eq for SchemaType
 impl Show for SchemaType
 
@@ -272,6 +285,8 @@ pub struct StringifyOptions {
   condense_flow : Bool
 }
 fn StringifyOptions::default() -> Self
+fn StringifyOptions::output(Self, &Logger) -> Unit // from trait `Show`
+fn StringifyOptions::to_string(Self) -> String // from trait `Show`
 impl Show for StringifyOptions
 
 pub enum StyleVariant {
@@ -288,6 +303,11 @@ pub enum StyleVariant {
   DoubleQuoted
   SingleQuoted
 }
+fn StyleVariant::equal(Self, Self) -> Bool // from trait `Eq`
+#deprecated
+fn StyleVariant::op_equal(Self, Self) -> Bool // from trait `Eq`
+fn StyleVariant::output(Self, &Logger) -> Unit // from trait `Show`
+fn StyleVariant::to_string(Self) -> String // from trait `Show`
 impl Eq for StyleVariant
 impl Show for StyleVariant
 
@@ -305,6 +325,11 @@ pub enum YamlError {
   ResolveError(String)
   ConstructError(String)
 }
+fn YamlError::equal(Self, Self) -> Bool // from trait `Eq`
+#deprecated
+fn YamlError::op_equal(Self, Self) -> Bool // from trait `Eq`
+fn YamlError::output(Self, &Logger) -> Unit // from trait `Show`
+fn YamlError::to_string(Self) -> String // from trait `Show`
 impl Eq for YamlError
 impl Show for YamlError
 
@@ -327,6 +352,11 @@ pub enum YamlValue {
   Array(Array[YamlValue])
   Object(Map[String, YamlValue])
 }
+fn YamlValue::equal(Self, Self) -> Bool // from trait `Eq`
+#deprecated
+fn YamlValue::op_equal(Self, Self) -> Bool // from trait `Eq`
+fn YamlValue::output(Self, &Logger) -> Unit // from trait `Show`
+fn YamlValue::to_string(Self) -> String // from trait `Show`
 impl Eq for YamlValue
 impl Show for YamlValue
 

schema.mbt

@@ -109,7 +109,7 @@ fn str_yaml_type() -> YamlType[YamlValue] {
       }
     }),
     default_style: None,
-    resolve: fn(value) {
+    resolve: fn(_) {
       true // Strings always resolve to themselves
     },
     construct: fn(value) {

utils.mbt

@@ -518,7 +518,7 @@ pub fn process_folded_string(s : String) -> String {
 ///|
 /// Process literal string (YAML |)
 /// Preserves line breaks exactly as written
-pub fn process_literal_string(s : String) -> String {
+pub fn process_literal_string(s : String) -> String raise {
   // Remove common leading indentation
   let lines = split_lines(s)
   if lines.length() == 0 {
@@ -548,7 +548,7 @@ pub fn process_literal_string(s : String) -> String {
       processed_lines.push("")
     } else {
       let spaces_to_remove = min_indent.min(count_leading_whitespace(line))
-      processed_lines.push(line.substring(start=spaces_to_remove))
+      processed_lines.push(line[spaces_to_remove:].to_string())
     }
   }
   processed_lines.join("\n")
@@ -1096,7 +1096,7 @@ pub fn is_yaml_empty(value : YamlValue) -> Bool {
     Null => true
     String(s) => s.length() == 0
     Array(arr) => arr.length() == 0
-    Object(obj) => obj.size() == 0
+    Object(obj) => obj.length() == 0
     _ => false
   }
 }