Merge remote-tracking branch 'upstream/trunk' into transcript-edit

unisonweb · Nov 26, 2024 · 7e26050 · 7e26050
2 parents b7edcd6 + 612756d
commit 7e26050
Show file tree

Hide file tree

Showing 58 changed files with 4,090 additions and 2,981 deletions.
diff --git a/.github/workflows/bundle-ucm.yaml b/.github/workflows/bundle-ucm.yaml
@@ -56,7 +56,7 @@ jobs:
           tries=5
           for (( i = 0; i < $tries; i++ )); do
               stack build :unison \
-                --flag unison-parser-typechecker:optimized \
+                --ghc-options='-O2' \
                 --local-bin-path ucm-bin \
                 --copy-bins \
                 && break;

diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,8 @@ dist-newstyle
 *.hie
 *.prof
 *.prof.html
+*.hp
+*.ps
 /.direnv/
 /.envrc
 

diff --git a/lib/unison-hash/package.yaml b/lib/unison-hash/package.yaml
@@ -2,7 +2,7 @@ name: unison-hash
 github: unisonweb/unison
 copyright: Copyright (C) 2013-2021 Unison Computing, PBC and contributors
 
-ghc-options: -Wall -O0 -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
+ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
 
 dependencies:
   - base

diff --git a/lib/unison-hash/unison-hash.cabal b/lib/unison-hash/unison-hash.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -49,7 +49,7 @@ library
       TypeApplications
       TypeFamilies
       ViewPatterns
-  ghc-options: -Wall -O0 -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
+  ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
   build-depends:
       base
     , bytestring

diff --git a/lib/unison-hashing/package.yaml b/lib/unison-hashing/package.yaml
@@ -2,7 +2,7 @@ name: unison-hashing
 github: unisonweb/unison
 copyright: Copyright (C) 2013-2021 Unison Computing, PBC and contributors
 
-ghc-options: -Wall -O0 -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
+ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
 
 dependencies:
   - base

diff --git a/lib/unison-hashing/unison-hashing.cabal b/lib/unison-hashing/unison-hashing.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -48,7 +48,7 @@ library
       TypeApplications
       TypeFamilies
       ViewPatterns
-  ghc-options: -Wall -O0 -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
+  ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
   build-depends:
       base
     , unison-hash

diff --git a/lib/unison-prelude/src/Unison/Debug.hs b/lib/unison-prelude/src/Unison/Debug.hs
@@ -36,6 +36,8 @@ data DebugFlag
   | -- | Useful for adding temporary debugging statements during development.
     -- Remove uses of Debug.Temp before merging to keep things clean for the next person :)
     Temp
+  | -- | Debugging the interpreter
+    Interpreter
   | -- | Shows Annotations when printing terms
     Annotations
   | -- | Debug endpoints of the local UI (or Share) server
@@ -65,6 +67,7 @@ debugFlags = case (unsafePerformIO (lookupEnv "UNISON_DEBUG")) of
       "LSP" -> pure LSP
       "TIMING" -> pure Timing
       "TEMP" -> pure Temp
+      "INTERPRETER" -> pure Interpreter
       "ANNOTATIONS" -> pure Annotations
       "SERVER" -> pure Server
       "PATTERN_COVERAGE" -> pure PatternCoverage
@@ -114,6 +117,10 @@ debugTemp :: Bool
 debugTemp = Temp `Set.member` debugFlags
 {-# NOINLINE debugTemp #-}
 
+debugInterpreter :: Bool
+debugInterpreter = Interpreter `Set.member` debugFlags
+{-# NOINLINE debugInterpreter #-}
+
 debugAnnotations :: Bool
 debugAnnotations = Annotations `Set.member` debugFlags
 {-# NOINLINE debugAnnotations #-}
@@ -187,6 +194,7 @@ shouldDebug = \case
   LSP -> debugLSP
   Timing -> debugTiming
   Temp -> debugTemp
+  Interpreter -> debugInterpreter
   Annotations -> debugAnnotations
   Server -> debugServer
   PatternCoverage -> debugPatternCoverage

diff --git a/lib/unison-pretty-printer/package.yaml b/lib/unison-pretty-printer/package.yaml
@@ -25,16 +25,7 @@ default-extensions:
   - TypeApplications
   - ViewPatterns
 
-ghc-options: -Wall -O0 -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
-
-flags:
-  optimized:
-    manual: true
-    default: true
-
-when:
-  - condition: flag(optimized)
-    ghc-options: -funbox-strict-fields -O2
+ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
 
 library:
   when:

diff --git a/lib/unison-pretty-printer/unison-pretty-printer.cabal b/lib/unison-pretty-printer/unison-pretty-printer.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -17,10 +17,6 @@ source-repository head
   type: git
   location: https://github.com/unisonweb/unison
 
-flag optimized
-  manual: True
-  default: True
-
 library
   exposed-modules:
       Unison.PrettyTerminal
@@ -54,7 +50,7 @@ library
       TupleSections
       TypeApplications
       ViewPatterns
-  ghc-options: -Wall -O0 -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
+  ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
   build-depends:
       ListLike
     , ansi-terminal
@@ -70,8 +66,6 @@ library
     , unison-syntax
     , unliftio
   default-language: Haskell2010
-  if flag(optimized)
-    ghc-options: -funbox-strict-fields -O2
 
 executable prettyprintdemo
   main-is: Main.hs
@@ -99,14 +93,12 @@ executable prettyprintdemo
       TupleSections
       TypeApplications
       ViewPatterns
-  ghc-options: -Wall -O0 -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
+  ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
   build-depends:
       base
     , text
     , unison-pretty-printer
   default-language: Haskell2010
-  if flag(optimized)
-    ghc-options: -funbox-strict-fields -O2
 
 test-suite pretty-printer-tests
   type: exitcode-stdio-1.0
@@ -139,7 +131,7 @@ test-suite pretty-printer-tests
       TupleSections
       TypeApplications
       ViewPatterns
-  ghc-options: -Wall -O0 -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures -W -threaded -rtsopts "-with-rtsopts=-N -T" -v0
+  ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures -W -threaded -rtsopts "-with-rtsopts=-N -T" -v0
   build-depends:
       base
     , code-page
@@ -149,5 +141,3 @@ test-suite pretty-printer-tests
     , unison-pretty-printer
     , unison-syntax
   default-language: Haskell2010
-  if flag(optimized)
-    ghc-options: -funbox-strict-fields -O2
diff --git a/parser-typechecker/package.yaml b/parser-typechecker/package.yaml
@@ -2,16 +2,7 @@ name: unison-parser-typechecker
 github: unisonweb/unison
 copyright: Copyright (C) 2013-2021 Unison Computing, PBC and contributors
 
-ghc-options: -Wall -O0 -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
-
-flags:
-  optimized:
-    manual: true
-    default: true
-
-when:
-  - condition: flag(optimized)
-    ghc-options: -funbox-strict-fields -O2
+ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
 
 library:
   source-dirs: src

diff --git a/parser-typechecker/src/Unison/Codebase/Runtime.hs b/parser-typechecker/src/Unison/Codebase/Runtime.hs
@@ -34,7 +34,7 @@ data CompileOpts = COpts
   }
 
 defaultCompileOpts :: CompileOpts
-defaultCompileOpts = COpts { profile = False }
+defaultCompileOpts = COpts {profile = False}
 
 data Runtime v = Runtime
   { terminate :: IO (),

diff --git a/parser-typechecker/src/Unison/Syntax/TermPrinter.hs b/parser-typechecker/src/Unison/Syntax/TermPrinter.hs
@@ -1285,7 +1285,6 @@ instance Monoid PrintAnnotation where
 
 suffixCounterTerm :: (Var v) => PrettyPrintEnv -> Set Name -> Set Name -> Term2 v at ap v a -> PrintAnnotation
 suffixCounterTerm n usedTm usedTy = \case
-  Var' v -> countHQ mempty $ HQ.unsafeFromVar v
   Ref' r -> countHQ usedTm $ PrettyPrintEnv.termName n (Referent.Ref r)
   Constructor' r | noImportRefs (r ^. ConstructorReference.reference_) -> mempty
   Constructor' r -> countHQ usedTm $ PrettyPrintEnv.termName n (Referent.Con r CT.Data)

diff --git a/parser-typechecker/src/Unison/Util/EnumContainers.hs b/parser-typechecker/src/Unison/Util/EnumContainers.hs
@@ -32,6 +32,7 @@ module Unison.Util.EnumContainers
 where
 
 import Data.Bifunctor
+import Data.Functor.Classes (Eq1, Ord1)
 import Data.IntMap.Strict qualified as IM
 import Data.IntSet qualified as IS
 import Data.Word (Word16, Word64)
@@ -60,7 +61,9 @@ newtype EnumMap k a = EM (IM.IntMap a)
     )
   deriving newtype
     ( Monoid,
-      Semigroup
+      Semigroup,
+      Eq1,
+      Ord1
     )
 
 newtype EnumSet k = ES IS.IntSet

diff --git a/parser-typechecker/unison-parser-typechecker.cabal b/parser-typechecker/unison-parser-typechecker.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -17,10 +17,6 @@ source-repository head
   type: git
   location: https://github.com/unisonweb/unison
 
-flag optimized
-  manual: True
-  default: True
-
 library
   exposed-modules:
       U.Codebase.Branch.Diff
@@ -195,7 +191,7 @@ library
       TypeApplications
       TypeFamilies
       ViewPatterns
-  ghc-options: -Wall -O0 -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
+  ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
   build-depends:
       ListLike
     , aeson
@@ -256,8 +252,6 @@ library
     , vector
     , witherable
   default-language: Haskell2010
-  if flag(optimized)
-    ghc-options: -funbox-strict-fields -O2
 
 test-suite parser-typechecker-tests
   type: exitcode-stdio-1.0
@@ -317,7 +311,7 @@ test-suite parser-typechecker-tests
       TypeApplications
       TypeFamilies
       ViewPatterns
-  ghc-options: -Wall -O0 -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures -W -threaded -rtsopts "-with-rtsopts=-N -T" -v0
+  ghc-options: -Wall -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures -W -threaded -rtsopts "-with-rtsopts=-N -T" -v0
   build-depends:
       base
     , code-page
@@ -339,5 +333,3 @@ test-suite parser-typechecker-tests
     , unison-util-relation
     , unison-util-rope
   default-language: Haskell2010
-  if flag(optimized)
-    ghc-options: -funbox-strict-fields -O2
diff --git a/stack.yaml b/stack.yaml
@@ -74,7 +74,7 @@ allow-newer-deps:
 
 ghc-options:
   # All packages
-  "$locals": -Wall -Werror -Wno-name-shadowing -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info -Wunused-packages #-freverse-errors
+  "$locals": -Wall -Werror -Wno-name-shadowing -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info -Wunused-packages -funbox-strict-fields #-freverse-errors
 
   # See https://github.com/haskell/haskell-language-server/issues/208
   "$everything": -haddock

diff --git a/unison-cli-integration/package.yaml b/unison-cli-integration/package.yaml
@@ -2,11 +2,6 @@ name: unison-cli-integration
 github: unisonweb/unison
 copyright: Copyright (C) 2013-2018 Unison Computing, PBC and contributors
 
-flags:
-  optimized:
-    manual: true
-    default: false
-
 ghc-options: -Wall
 
 executables:
@@ -28,10 +23,6 @@ executables:
     build-tools:
       - unison-cli-main:unison
 
-when:
-  - condition: flag(optimized)
-    ghc-options: -O2 -funbox-strict-fields
-
 default-extensions:
   - ApplicativeDo
   - BangPatterns

diff --git a/unison-cli-integration/unison-cli-integration.cabal b/unison-cli-integration/unison-cli-integration.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -15,10 +15,6 @@ source-repository head
   type: git
   location: https://github.com/unisonweb/unison
 
-flag optimized
-  manual: True
-  default: False
-
 executable cli-integration-tests
   main-is: Suite.hs
   other-modules:
@@ -70,5 +66,3 @@ executable cli-integration-tests
     , process
     , time
   default-language: Haskell2010
-  if flag(optimized)
-    ghc-options: -O2 -funbox-strict-fields
diff --git a/unison-cli-main/package.yaml b/unison-cli-main/package.yaml
@@ -2,11 +2,6 @@ name: unison-cli-main
 github: unisonweb/unison
 copyright: Copyright (C) 2013-2018 Unison Computing, PBC and contributors
 
-flags:
-  optimized:
-    manual: true
-    default: false
-
 ghc-options: -Wall
 
 executables:
@@ -24,10 +19,6 @@ executables:
       - text
       - unison-cli
 
-when:
-  - condition: flag(optimized)
-    ghc-options: -O2 -funbox-strict-fields
-
 default-extensions:
   - ApplicativeDo
   - BangPatterns
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,8 @@ dist-newstyle @@
     *.hie
     *.prof
     *.prof.html
+    *.hp
+    *.ps
     /.direnv/
     /.envrc
@@ Expand Down @@