Use name_base in plval base.

3 files changed, 10 insertions, 13 deletions

diff --git a/src/boot/me/resolve.ml b/src/boot/me/resolve.ml
index 3c355c1c..cb40dfc9 100644
--- a/src/boot/me/resolve.ml
+++ b/src/boot/me/resolve.ml
@@ -492,9 +492,9 @@ let type_resolving_visitor
     inner.Walk.visit_pexp_post p;
     let rebuild_plval pl =
       match pl with
-          Ast.PLVAL_ident _ -> pl
-        | Ast.PLVAL_app (id, tys) ->
-            Ast.PLVAL_app (id, Array.map resolve_ty tys)
+          Ast.PLVAL_base (Ast.BASE_app (id, tys)) ->
+            Ast.PLVAL_base (Ast.BASE_app (id, Array.map resolve_ty tys))
+        | Ast.PLVAL_base _ -> pl
         | Ast.PLVAL_ext_name (pexp, nc) ->
             let pexp = get_rebuilt_pexp pexp in
             let nc =
@@ -668,8 +668,8 @@ let lval_base_resolving_visitor
         Ast.PEXP_lval pl ->
           begin
             match pl with
-                (Ast.PLVAL_ident ident)
-              | (Ast.PLVAL_app (ident, _)) ->
+                (Ast.PLVAL_base (Ast.BASE_ident ident))
+              | (Ast.PLVAL_base (Ast.BASE_app (ident, _))) ->
                   let id = lookup_defn_by_ident p.id ident in
 
                     iflog cx
diff --git a/src/boot/me/semant.ml b/src/boot/me/semant.ml
index 01457454..0d350bc5 100644
--- a/src/boot/me/semant.ml
+++ b/src/boot/me/semant.ml
@@ -579,10 +579,8 @@ let rec lval_to_name (lv:Ast.lval) : Ast.name =
 
 let rec plval_to_name (pl:Ast.plval) : Ast.name =
   match pl with
-      Ast.PLVAL_ident ident ->
-        Ast.NAME_base (Ast.BASE_ident ident)
-    | Ast.PLVAL_app (ident, tys) ->
-        Ast.NAME_base (Ast.BASE_app (ident, tys))
+      Ast.PLVAL_base nb ->
+        Ast.NAME_base nb
     | Ast.PLVAL_ext_name ({node = Ast.PEXP_lval pl}, nc) ->
         Ast.NAME_ext (plval_to_name pl, nc)
     | _ -> bug () "plval_to_name with plval that contains non-name components"
@@ -1431,8 +1429,7 @@ let rec pexp_is_const (cx:ctxt) (pexp:Ast.pexp) : bool =
 
 and plval_is_const (cx:ctxt) (plval:Ast.plval) : bool =
   match plval with
-    Ast.PLVAL_ident _
-  | Ast.PLVAL_app _ ->
+    Ast.PLVAL_base _ ->
       bug () "Semant.plval_is_const on plval base"
 
   | Ast.PLVAL_ext_name (pexp, _) ->
diff --git a/src/boot/me/walk.ml b/src/boot/me/walk.ml
index 73bb3dff..eb469dfb 100644
--- a/src/boot/me/walk.ml
+++ b/src/boot/me/walk.ml
@@ -631,9 +631,9 @@ and walk_plval
     : unit =
   let children _ =
     match p with
-        Ast.PLVAL_ident _ -> ()
-      | Ast.PLVAL_app (_, tys) ->
+      | Ast.PLVAL_base (Ast.BASE_app (_, tys)) ->
           Array.iter (walk_ty v) tys
+      | Ast.PLVAL_base _ -> ()
       | Ast.PLVAL_ext_name (pexp, _) ->
           walk_pexp v pexp
       | Ast.PLVAL_ext_pexp (a, b) ->