Migrate old named application syntax

examples/demo/Package.juvix

@@ -3,5 +3,7 @@ module Package;
 import PackageDescription.V2 open;
 
 package : Package :=
-  defaultPackage
-    {name := "Demo"; version := mkVersion 0 1 0};
+  defaultPackage@?{
+    name := "Demo";
+    version := mkVersion 0 1 0
+  };

examples/midsquare/Package.juvix

@@ -3,5 +3,7 @@ module Package;
 import PackageDescription.V2 open;
 
 package : Package :=
-  defaultPackage
-    {name := "midsquare"; version := mkVersion 0 1 0};
+  defaultPackage@?{
+    name := "midsquare";
+    version := mkVersion 0 1 0
+  };

examples/milestone/Bank/Package.juvix

@@ -2,4 +2,7 @@ module Package;
 
 import PackageDescription.V2 open;
 
-package : Package := defaultPackage {name := "bank"};
+package : Package :=
+  defaultPackage@?{
+    name := "bank"
+  };

examples/milestone/Collatz/Package.juvix

@@ -3,7 +3,8 @@ module Package;
 import PackageDescription.V2 open;
 
 package : Package :=
-  defaultPackage
-    {name := "Collatz";
-     version := mkVersion 0 1 0;
-     main := just "Collatz.juvix"};
+  defaultPackage@?{
+    name := "Collatz";
+    version := mkVersion 0 1 0;
+    main := just "Collatz.juvix"
+  };

examples/milestone/Fibonacci/Package.juvix

@@ -3,7 +3,8 @@ module Package;
 import PackageDescription.V2 open;
 
 package : Package :=
-  defaultPackage
-    {name := "Fibonacci";
-     version := mkVersion 0 1 0;
-     main := just "Fibonacci.juvix"};
+  defaultPackage@?{
+    name := "Fibonacci";
+    version := mkVersion 0 1 0;
+    main := just "Fibonacci.juvix"
+  };

examples/milestone/Hanoi/Package.juvix

@@ -3,7 +3,8 @@ module Package;
 import PackageDescription.V2 open;
 
 package : Package :=
-  defaultPackage
-    {name := "Hanoi";
-     version := mkVersion 0 1 0;
-     main := just "Hanoi.juvix"};
+  defaultPackage@?{
+    name := "Hanoi";
+    version := mkVersion 0 1 0;
+    main := just "Hanoi.juvix"
+  };

examples/milestone/HelloWorld/Package.juvix

@@ -3,7 +3,8 @@ module Package;
 import PackageDescription.V2 open;
 
 package : Package :=
-  defaultPackage
-    {name := "HelloWorld";
-     version := mkVersion 0 1 0;
-     main := just "HelloWorld.juvix"};
+  defaultPackage@?{
+    name := "HelloWorld";
+    version := mkVersion 0 1 0;
+    main := just "HelloWorld.juvix"
+  };

examples/milestone/PascalsTriangle/Package.juvix

@@ -3,7 +3,8 @@ module Package;
 import PackageDescription.V2 open;
 
 package : Package :=
-  defaultPackage
-    {name := "PascalsTriangle";
-     version := mkVersion 0 1 0;
-     main := just "PascalsTriangle.juvix"};
+  defaultPackage@?{
+    name := "PascalsTriangle";
+    version := mkVersion 0 1 0;
+    main := just "PascalsTriangle.juvix"
+  };

examples/milestone/TicTacToe/Package.juvix

@@ -3,7 +3,8 @@ module Package;
 import PackageDescription.V2 open;
 
 package : Package :=
-  defaultPackage
-    {name := "TicTacToe";
-     version := mkVersion 0 1 0;
-     main := just "CLI/TicTacToe.juvix"};
+  defaultPackage@?{
+    name := "TicTacToe";
+    version := mkVersion 0 1 0;
+    main := just "CLI/TicTacToe.juvix"
+  };

examples/milestone/Tutorial/Package.juvix

@@ -3,5 +3,7 @@ module Package;
 import PackageDescription.V2 open;
 
 package : Package :=
-  defaultPackage
-    {name := "Tutorial"; version := mkVersion 0 1 0};
+  defaultPackage@?{
+    name := "Tutorial";
+    version := mkVersion 0 1 0
+  };

include/package/PackageDescription/V1.juvix

@@ -44,22 +44,28 @@ type Dependency :=
     defaultStdlib;
 
 --- Construct a ;Package; with useful default arguments.
-defaultPackage {name : String := "my-project"} {version : SemVer := defaultVersion} {dependencies : List
-  Dependency := [defaultStdlib]} {main : Maybe
-  String := nothing} {buildDir : Maybe String := nothing}
+defaultPackage
+  {name : String := "my-project"}
+  {version : SemVer := defaultVersion}
+  {dependencies : List Dependency := [defaultStdlib]}
+  {main : Maybe String := nothing}
+  {buildDir : Maybe String := nothing}
   : Package :=
   mkPackage name version dependencies main buildDir;
 
 --- Construct a ;SemVer; with useful default arguments.
-mkVersion (major minor patch : Nat) {release : Maybe
-  String := nothing} {meta : Maybe String := nothing}
+mkVersion
+  (major' minor' patch' : Nat)
+  {release' : Maybe String := nothing}
+  {meta' : Maybe String := nothing}
   : SemVer :=
-  mkSemVer
-    (major := major;
-    minor := minor;
-    patch := patch;
-    release := release;
-    meta := meta);
+  mkSemVer@?{
+    major := major';
+    minor := minor';
+    patch := patch';
+    release := release';
+    meta := meta'
+  };
 
 --- The default version used in `defaultPackage`.
 defaultVersion : SemVer := mkVersion 0 0 0;

include/package/PackageDescription/V2.juvix

@@ -44,22 +44,28 @@ type Dependency :=
     defaultStdlib;
 
 --- Construct a ;Package; with useful default arguments.
-defaultPackage {name : String := "my-project"} {version : SemVer := defaultVersion} {dependencies : List
-  Dependency := [defaultStdlib]} {main : Maybe
-  String := nothing} {buildDir : Maybe String := nothing}
+defaultPackage
+  {name : String := "my-project"}
+  {version : SemVer := defaultVersion}
+  {dependencies : List Dependency := [defaultStdlib]}
+  {main : Maybe String := nothing}
+  {buildDir : Maybe String := nothing}
   : Package :=
   mkPackage name version dependencies main buildDir;
 
 --- Construct a ;SemVer; with useful default arguments.
-mkVersion (major minor patch : Nat) {release : Maybe
-  String := nothing} {meta : Maybe String := nothing}
+mkVersion
+  (major' minor' patch' : Nat)
+  {release' : Maybe String := nothing}
+  {meta' : Maybe String := nothing}
   : SemVer :=
-  mkSemVer
-    (major := major;
-    minor := minor;
-    patch := patch;
-    release := release;
-    meta := meta);
+  mkSemVer@?{
+    major := major';
+    minor := minor';
+    patch := patch';
+    release := release';
+    meta := meta'
+  };
 
 --- The default version used in `defaultPackage`.
 defaultVersion : SemVer := mkVersion 0 0 0;

src/Juvix/Compiler/Concrete/Gen.hs

@@ -5,7 +5,7 @@ module Juvix.Compiler.Concrete.Gen
 where
 
 import Juvix.Compiler.Concrete.Keywords
-import Juvix.Compiler.Concrete.Language
+import Juvix.Compiler.Concrete.Language.Base
 import Juvix.Prelude
 
 kw :: (Members '[Reader Interval] r) => Keyword -> Sem r KeywordRef
@@ -18,6 +18,22 @@ kw k = do
         _keywordRefInterval = loc
       }
 
+simplestFunctionDef :: FunctionName s -> ExpressionType s -> FunctionDef s
+simplestFunctionDef funName funBody =
+  FunctionDef
+    { _signName = funName,
+      _signBody = SigBodyExpression funBody,
+      _signColonKw = Irrelevant Nothing,
+      _signArgs = [],
+      _signRetType = Nothing,
+      _signDoc = Nothing,
+      _signPragmas = Nothing,
+      _signBuiltin = Nothing,
+      _signTerminating = Nothing,
+      _signInstance = Nothing,
+      _signCoercion = Nothing
+    }
+
 smallUniverseExpression :: forall s r. (SingI s) => (Members '[Reader Interval] r) => Sem r (ExpressionType s)
 smallUniverseExpression = do
   loc <- ask @Interval
@@ -29,6 +45,16 @@ smallUniverseExpression = do
           _expressionAtoms = pure (AtomUniverse (smallUniverse loc))
         }
 
+isExhaustive :: (Member (Reader Interval) r) => Bool -> Sem r IsExhaustive
+isExhaustive _isExhaustive = do
+  _isExhaustiveKw <-
+    Irrelevant
+      <$> if
+          | _isExhaustive -> kw kwAt
+          | otherwise -> kw kwAtQuestion
+
+  return IsExhaustive {..}
+
 symbol :: (Member (Reader Interval) r) => Text -> Sem r Symbol
 symbol t = do
   l <- ask
@@ -39,12 +65,12 @@ expressionAtoms' _expressionAtoms = do
   _expressionAtomsLoc <- Irrelevant <$> ask
   return ExpressionAtoms {..}
 
-namedArgument :: (Member (Reader Interval) r) => Text -> NonEmpty (ExpressionAtom 'Parsed) -> Sem r (NamedArgument 'Parsed)
+namedArgument :: (Member (Reader Interval) r) => Text -> NonEmpty (ExpressionAtom 'Parsed) -> Sem r (NamedArgumentAssign 'Parsed)
 namedArgument n as = do
   _namedArgValue <- expressionAtoms' as
   _namedArgName <- symbol n
   _namedArgAssignKw <- Irrelevant <$> kw kwAssign
-  return NamedArgument {..}
+  return NamedArgumentAssign {..}
 
 literalString :: (Member (Reader Interval) r) => Text -> Sem r (ExpressionAtom s)
 literalString t = do
@@ -59,7 +85,7 @@ braced a = do
   l <- ask
   AtomBraces . WithLoc l <$> expressionAtoms' a
 
-argumentBlock :: (Member (Reader Interval) r) => IsImplicit -> NonEmpty (NamedArgument 'Parsed) -> Sem r (ArgumentBlock 'Parsed)
+argumentBlock :: (Member (Reader Interval) r) => IsImplicit -> NonEmpty (NamedArgumentAssign 'Parsed) -> Sem r (ArgumentBlock 'Parsed)
 argumentBlock i as = do
   parenL <- kw delimL
   parenR <- kw delimR
@@ -109,5 +135,8 @@ mkList as = do
           }
     )
 
-functionDefExpression :: (Member (Reader Interval) r) => NonEmpty (ExpressionAtom 'Parsed) -> Sem r (FunctionDefBody 'Parsed)
+functionDefExpression ::
+  (Member (Reader Interval) r) =>
+  NonEmpty (ExpressionAtom 'Parsed) ->
+  Sem r (FunctionDefBody 'Parsed)
 functionDefExpression exp = SigBodyExpression <$> expressionAtoms' exp