Don't include redundant locs in wf-errors

Fixes brownplt#1436
BenMusch · May 23, 2019 · 47464f0 · 47464f0
1 parent 5c5720b
commit 47464f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/arr/compiler/compile-structs.arr b/src/arr/compiler/compile-structs.arr
@@ -428,8 +428,7 @@ data CompileError:
     method render-reason(self):
       [ED.error:
         ED.paragraph([list: ED.highlight(ED.text("Well-formedness:"), [list: self.loc], 0), ED.text(" ")]
-            + self.msg),
-        ED.cmcode(self.loc)]
+            + self.msg)]
     end
   | wf-empty-block(loc :: A.Loc) with:
     method render-fancy-reason(self):

diff --git a/src/scripts/run-phase b/src/scripts/run-phase
@@ -7,7 +7,10 @@ set -o nounset
 NODE="node -max-old-space-size=8192"
 
 SYMLINK_NAME=`basename "$0"`
-SELF_NAME=`basename $(readlink -f $0)`
+case "$(uname -s)" in
+    Darwin)    SELF_NAME=`basename $(readlink $0)`;;
+    *)          SELF_NAME=`basename $(readlink -f $0)`
+esac
 
 if [ "$SYMLINK_NAME" = "$SELF_NAME" ]
 then