Merge pull request #38 from DzmingLi/main

Fix compilation and add Nix flake.

Author: mengzhuo

README.md

@@ -27,8 +27,6 @@ Building a programming language is a long journey. It took Rust 9 years and Go 5
 - OCaml 4.14.2
 - [OPAM](https://opam.ocaml.org/)
 
-You must update or revert MoonBit to [this version](https://github.com/moonbitlang/core/commit/4660d8b3da6ed79e47462d66d40feff177060699), as the syntax of the language has changed since.
-
 ### Build
 
 Build with following scripts:
@@ -57,9 +55,8 @@ To set up the environment, execute these commands (you only need to do it once):
 # Remove currently installed MoonBit version
 rm -rf $core
 
-# Install the specific version required by the compiler
+# Install the latest version of core library
 git clone https://github.com/moonbitlang/core.git $core
-git checkout 4660d8b
 
 # Compile the core library
 moon bundle --source-dir $core

README.zh.md

@@ -27,7 +27,6 @@
 - OCaml 4.14.2
 - [OPAM](https://opam.ocaml.org/)
 
-MoonBit 必须升级/降级到[特定版本](https://github.com/moonbitlang/core/commit/4660d8b3da6ed79e47462d66d40feff177060699)，因为语言的语法已经改变。
 
 ### 构建
 

flake.lock

@@ -0,0 +1,119 @@
+{
+  description = "MoonBit compiler with latest moon and current moonc";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      {
+        packages.default = pkgs.stdenv.mkDerivation rec {
+          pname = "moonbit-hybrid";
+          version = "latest-moon-plctlab-moonc";
+
+          # Use latest moon binary
+          moonSrc = pkgs.fetchzip {
+            url = "https://cli.moonbitlang.com/binaries/latest/moonbit-linux-x86_64.tar.gz";
+            sha256 = "sha256-8AwukSHQ9NlFncAJAdM3ZJOYHWMqzw39L6bcYWw+0rM=";
+            stripRoot = false;
+          };
+
+          # Use current GitHub repo for moonc
+          src = ./.;
+
+          nativeBuildInputs = with pkgs; [
+            autoPatchelfHook
+            patchelf
+            makeWrapper
+            dune_3
+            ocaml
+            pkg-config
+            libffi
+            gmp
+          ];
+
+          buildInputs = with pkgs; [
+            stdenv.cc.cc.lib
+          ];
+
+          buildPhase = ''
+            runHook preBuild
+
+            # Build moonc from current repo
+            dune build --root .
+
+            # Prepare moon from latest release
+            cp -r ${moonSrc}/* ./
+            chmod -R u+w ./bin || echo "Failed to set write permissions on bin"
+            chmod +x ./bin/moon || echo "moon binary not found"
+            patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./bin/moon || echo "Failed to patch moon"
+            [ -f ./bin/internal/tcc ] && patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./bin/internal/tcc || echo "tcc not found or failed to patch"
+
+            # Replace moonc with our built version
+            cp _build/install/default/bin/moonc ./bin/moonc
+            chmod +x ./bin/moonc
+
+            runHook postBuild
+          '';
+
+          installPhase = ''
+            runHook preInstall
+
+            mkdir -p $out/bin
+            mkdir -p $out/lib
+
+            # Install binaries
+            cp ./bin/moon $out/bin/
+            cp ./bin/moonc $out/bin/
+            cp -r ./bin/internal $out/bin/
+
+            # Install lib files if they exist
+            if [ -d "./lib" ]; then
+              cp -r ./lib/* $out/lib/
+            fi
+
+            runHook postInstall
+          '';
+
+          postFixup = ''
+            wrapProgram $out/bin/moon --set MOON_HOME $out
+          '';
+
+          meta = with pkgs.lib; {
+            description = "MoonBit toolchain with latest moon and current moonc";
+            homepage = "https://www.moonbitlang.com";
+            license = licenses.asl20;
+            mainProgram = "moon";
+            platforms = platforms.linux;
+          };
+        };
+
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            ocaml
+            dune_3
+            ocamlPackages.findlib
+            ocamlPackages.menhir
+            ocamlPackages.sedlex
+            ocamlPackages.cmdliner
+            ocamlPackages.yojson
+            ocamlPackages.ppx_deriving_yojson
+            ocamlPackages.zarith
+            pkg-config
+            libffi
+            gmp
+          ];
+
+          shellHook = ''
+            echo "MoonBit development shell"
+            echo "OCaml version: $(ocaml -version)"
+            echo "Dune version: $(dune --version)"
+          '';
+        };
+      });
+}

flake.nix

@@ -43,12 +43,12 @@ let encode s =
   let get = Bytes.get_uint8 arr in
   let add c =
     Bytes.unsafe_blit alphabet c ret !pos 1;
-    (incr [@inlined always]) pos
+    incr pos
       [@@inline always]
   in
   let padding () =
     Bytes.unsafe_fill ret !pos 1 pad;
-    (incr [@inlined always]) pos
+    incr pos
       [@@inline always]
   in
   while !l > 2 do
@@ -96,7 +96,7 @@ let decode s =
     let get i = inv s.![i] [@@inline always] in
     let add c =
       Bytes.unsafe_set ret !iter (Char.unsafe_chr c);
-      (incr [@inlined always]) iter
+      incr iter
         [@@inline always]
     in
     while !pos < len - 4 do

src/basic_base64.ml

@@ -26,6 +26,7 @@ end
 type attribute =
   | Tattr_alert of { loc_ : location; category : string; message : string }
   | Tattr_intrinsic of { loc_ : location; intrinsic : string }
+  | Tattr_alias of { loc_ : location; alias_name : string }
 
 include struct
   let _ = fun (_ : attribute) -> ()
@@ -66,6 +67,18 @@ include struct
            (S.List [ S.Atom "loc_"; arg__010_ ] :: bnds__008_ : _ Stdlib.List.t)
          in
          S.List (S.Atom "Tattr_intrinsic" :: bnds__008_)
+     | Tattr_alias { loc_ = loc___014_; alias_name = alias_name__016_ } ->
+         let bnds__013_ = ([] : _ Stdlib.List.t) in
+         let bnds__013_ =
+           let arg__017_ = Moon_sexp_conv.sexp_of_string alias_name__016_ in
+           (S.List [ S.Atom "alias_name"; arg__017_ ] :: bnds__013_
+             : _ Stdlib.List.t)
+         in
+         let bnds__013_ =
+           let arg__015_ = sexp_of_location loc___014_ in
+           (S.List [ S.Atom "loc_"; arg__015_ ] :: bnds__013_ : _ Stdlib.List.t)
+         in
+         S.List (S.Atom "Tattr_alias" :: bnds__013_)
       : attribute -> S.t)
 
   let _ = sexp_of_attribute
@@ -131,6 +144,14 @@ let check ~local_diagnostics
                 | `TopFun ->
                     Tattr_alert { loc_; category; message = message.string_val }
                     :: acc)
+            | Apply
+                ( { qual = None; name = "alias" },
+                  Expr (String { string_val = alias_name; _ }) :: [] ) -> (
+                match context with
+                | `TopLet | `TopTypeDecl | `Impl | `Trait ->
+                    warn_unused_attribute "alias";
+                    acc
+                | `TopFun -> Tattr_alias { loc_; alias_name } :: acc)
             | _ -> acc)
         | _ -> acc)
     : t)

src/checked_attributes.ml

@@ -15,7 +15,7 @@
 (env
  (_
   (flags
-   (:standard -w -9-30))))
+   (:standard -w -6-8-9-26-27-30-32-33-35-50))))
 
 (executables
  (names moon0_main)

src/dune

@@ -3174,7 +3174,7 @@ module Map = struct
                loc_ = _visitors_r3;
              }
 
-        method visit_To_result : _ -> handle_kind = fun env -> To_result
+        method visit_To_result : _ -> handle_kind = fun _env -> To_result
 
         method visit_Joinapply : _ -> var -> handle_kind =
           fun env ->
@@ -3646,7 +3646,7 @@ module Map = struct
                  let _visitors_r4 = self#visit_location env _visitors_floc_ in
                  (fun cond ->
                    fun ifso ->
-                    fun ifnot -> fun ty -> fun loc -> if_ ~loc cond ~ifso ?ifnot)
+                    fun ifnot -> fun _ty -> fun loc -> if_ ~loc cond ~ifso ?ifnot)
                    _visitors_r0 _visitors_r1 _visitors_r2 _visitors_r3
                    _visitors_r4
 
@@ -3695,7 +3695,7 @@ module Map = struct
                  (fun obj ->
                    fun cases ->
                     fun default ->
-                     fun ty -> fun loc -> switch_constr ~loc obj cases ~default)
+                     fun _ty -> fun loc -> switch_constr ~loc obj cases ~default)
                    _visitors_r0 _visitors_r1 _visitors_r2 _visitors_r3
                    _visitors_r4
 
@@ -3731,7 +3731,7 @@ module Map = struct
                  (fun obj ->
                    fun cases ->
                     fun default ->
-                     fun ty ->
+                     fun _ty ->
                       fun loc -> switch_constant ~loc obj cases ~default)
                    _visitors_r0 _visitors_r1 _visitors_r2 _visitors_r3
                    _visitors_r4
@@ -4183,7 +4183,7 @@ module Map = struct
              let _visitors_r0 = self#visit_typ env _visitors_ffunc_ty in
              Normal { func_ty = _visitors_r0 }
 
-        method visit_Join : _ -> apply_kind = fun env -> Join
+        method visit_Join : _ -> apply_kind = fun _env -> Join
 
         method visit_apply_kind : _ -> apply_kind -> apply_kind =
           fun env ->

src/mcore.ml

@@ -21,7 +21,7 @@ fn unsafe_bytes_blit (dst, dst_offset, src, src_offset, length) {
   return %3
 }
 *)
-let unsafe_bytes_blit fn =
+let unsafe_bytes_blit _fn =
   (* Construct arguments *)
   let dst = new_temp T_bytes in
   let dst_offset = new_temp T_int in
@@ -66,7 +66,7 @@ fn unsafe_bytes_sub_string (src, offset, length) {
   return %3
 }
 *)
-let unsafe_bytes_sub_string fn =
+let unsafe_bytes_sub_string _fn =
   (* Arguments *)
   let src = new_temp T_bytes in
   let offset = new_temp T_int in

src/riscv_internals.ml

@@ -152,7 +152,7 @@ let iter_fn2 f ssa =
 let map_fn f ssa =
   let map_aux (toplevel: instruction) = 
     match toplevel with
-    | FnDecl { fn; body; args; } -> Riscv_ssa.FnDecl { fn; body = f fn; args }
+    | FnDecl { fn; body = _body; args; } -> Riscv_ssa.FnDecl { fn; body = f fn; args }
     | x -> x
   in
   List.map map_aux ssa
@@ -240,7 +240,7 @@ let liveness_analysis fn =
     let last_item = Vec.pop_opt worklist in
     match last_item with
     | None -> ()
-    | Some fn ->
+    | Some _fn ->
         List.iter (fun name ->
           let block = block_of name in
           let old_live_in = Hashtbl.find live_in name in