align with new moonbit release

Author: hackwaly

moon.mod.json

@@ -1,6 +1,6 @@
 {
   "name": "moonbitlang/yacc",
-  "version": "0.3.32",
+  "version": "0.3.33",
   "deps": {
     "moonbitlang/x": "0.4.23",
     "Yoorkin/ArgParser": "0.1.9"

src/lib/driver/driver.mbt

@@ -12,6 +12,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, see <https://www.gnu.org/licenses/>.
 
+///|
+fnalias @util.(println_to_stderr, exit, path_basename)
+
 ///|
 pub(all) enum Mode {
   Default
@@ -81,7 +84,7 @@ pub fn compile(
     @elab.elaborate_with_stdlib_rules!(
       spec,
       parser_spec_str,
-      @_driver_util.path_basename(filename),
+      path_basename(filename),
       json_cst=match mode {
         JsonCst => Yes
         Default | OnlyTokens => No
@@ -282,7 +285,7 @@ pub fn compile(
     meta,
     output,
     source_map_builder~,
-    grammar_filename=@_driver_util.path_basename(filename),
+    grammar_filename=path_basename(filename),
     mode=match mode {
       OnlyTokens => panic()
       Default => Default

src/lib/driver/moon.pkg.json

@@ -4,17 +4,10 @@
     "moonbitlang/yacc/lib/parser",
     "moonbitlang/yacc/lib/codegen",
     "moonbitlang/yacc/lib/lr1",
-    {
-      "path": "moonbitlang/yacc/lib/driver/util",
-      "alias": "_driver_util",
-      "value": [
-        "println_to_stderr",
-        "exit"
-      ]
-    },
     "moonbitlang/yacc/lib/util/logger_with_cursor",
     "moonbitlang/yacc/lib/elab",
     "moonbitlang/yacc/lib/util/array_multimap",
-    "moonbitlang/yacc/lib/desugar"
+    "moonbitlang/yacc/lib/desugar",
+    "moonbitlang/yacc/lib/driver/util"
   ]
 }

src/lib/driver/util/util.mbt

@@ -1,15 +1,11 @@
 ///|
 pub fn path_basename(path : String) -> String {
-  let lastSlashIndex = path.last_index_of("/")
-  if lastSlashIndex == -1 {
+  if path.rev_find("/") is Some(lastSlashIndex) {
+    path.substring(start=lastSlashIndex + 1)
     // Fallback to windows path separator
-    let lastBackslashIndex = path.last_index_of("\\")
-    if lastBackslashIndex == -1 {
-      return path
-    } else {
-      return path.substring(start=lastBackslashIndex + 1)
-    }
+  } else if path.rev_find("\\") is Some(lastBackslashIndex) {
+    return path.substring(start=lastBackslashIndex + 1)
   } else {
-    path.substring(start=lastSlashIndex + 1)
+    return path
   }
 }

src/lib/lr1/epsilon_lookahead_set.mbt

@@ -33,7 +33,7 @@ fn EpsilonLookaheadSet::union[T : AbstractLookaheadSet](
 
 ///|
 /// epsilon free first
-fn EpsilonLookaheadSet::op_add[T : AbstractLookaheadSet](
+impl[T : AbstractLookaheadSet] Add for EpsilonLookaheadSet[T] with op_add(
   set1 : EpsilonLookaheadSet[T],
   set2 : EpsilonLookaheadSet[T]
 ) -> EpsilonLookaheadSet[T] {

src/lib/parser/lexer.mbt

@@ -3656,7 +3656,7 @@ fn code_rbrace(
       let (_start_pos_of_t2, _end_pos_of_t2) = __mbtlex_captures[2]
       let t2 : String = lexbuf.substring(_start_pos_of_t2, _end_pos_of_t2)
       sb.write_string(t)
-      let arg : @ast.ClauseItemIdent = if t2.starts_with("$") {
+      let arg : @ast.ClauseItemIdent = if t2.has_prefix("$") {
         let index = try {
           @strconv.parse_int!(t2.substring(start=1), base=10)
         } catch {

src/lib/parser/lexer.mbtx

@@ -146,7 +146,7 @@ rule code_rbrace(sb : StringBuilder, subst: Array[@ast.SubstItem], base : Int) -
     }
     ("$" (("startpos" | "endpos" | "loc") as t1) "(" [' ' '\t']* (("$" ['0'-'9']+ | ['A'-'Z' 'a'-'z' '_'] ['A'-'Z' 'a'-'z' '0'-'9' '_']*) as t2) [' ' '\t']* ")") as t => {
       sb.write_string(t)
-      let arg : @ast.ClauseItemIdent = if t2.starts_with("$") {
+      let arg : @ast.ClauseItemIdent = if t2.has_prefix("$") {
         let index = try @strconv.parse_int!(t2.substring(start=1), base=10) catch { err => abort(Show::to_string(err)) }
         Dollar(index)
       } else {

src/main/main.mbt

@@ -12,6 +12,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, see <https://www.gnu.org/licenses/>.
 
+fnalias @util.(println_to_stderr, exit)
+
 ///|
 fn main {
   let usage =

src/main/moon.pkg.json

@@ -5,15 +5,9 @@
     "moonbitlang/x/sys",
     "Yoorkin/ArgParser",
     "moonbitlang/yacc/lib/driver",
-    {
-      "path": "moonbitlang/yacc/lib/driver/util",
-      "value": [
-        "println_to_stderr",
-        "exit"
-      ]
-    },
     "moonbitlang/yacc/lib/codegen",
-    "moonbitlang/yacc/lib/codegen/gen_mbt"
+    "moonbitlang/yacc/lib/codegen/gen_mbt",
+    "moonbitlang/yacc/lib/driver/util"
   ],
   "link": {
     "native": {