Merge pull request #2971 from onflow/feature/stable-cadence

Merge Stable Cadence branch into master
onflow · Dec 11, 2023 · 0a5bb7d · 0a5bb7d
2 parents c966069 + d4069ce
commit 0a5bb7d
Show file tree

Hide file tree

Showing 471 changed files with 83,997 additions and 57,723 deletions.
diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
@@ -28,6 +28,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: 'onflow/flow-go'
+          ref: ${{ github.base_ref == 'feature/stable-cadence' && 'feature/stable-cadence' || 'master' }}
 
       - name: Setup Go
         uses: actions/setup-go@v3
@@ -55,6 +56,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: 'onflow/flow-emulator'
+          ref: ${{ github.base_ref == 'feature/stable-cadence' && 'feature/stable-cadence' || 'master' }}
 
       - name: Setup Go
         uses: actions/setup-go@v3

diff --git a/ROADMAP.md b/ROADMAP.md
@@ -79,11 +79,6 @@ listed in no particular order.
 
   Cadence should provide a way to define type aliases.
 
-  For example, if a contract interface might declare a type requirement `NFT`,
-  then all concrete conforming types must provide a concrete type `NFT`.
-
-  However, it would be nice to give the type an additional, more useful name.
-
 - `Word128` and `Word256` types
 
   Cadence should provide `Word128` and `Word256` types, just like it provides `UInt128` and `UInt256`

diff --git a/docs/cadence.ebnf b/docs/cadence.ebnf
@@ -197,6 +197,7 @@ fullType
     : ( Auth? Ampersand (* followed by no whitespace *) )?
       innerType
       ( (* no whitespace *) Optional)*
+    | '(' fullType ')'
     ;
 
 
@@ -223,10 +224,10 @@ nominalType
     ;
 
 functionType
-    : '('
-        '(' ( typeAnnotation ( ',' typeAnnotation )* )? ')'
-        ':' typeAnnotation
+    : Fun '(' 
+        ( typeAnnotation ( ',' typeAnnotation )* )?
       ')'
+      ( ':' typeAnnotation )?
     ;
 
 variableSizedType

diff --git a/docs/language/references.md → docs/language/references.mdx b/docs/language/references.md → docs/language/references.mdx
diff --git a/docs/subtyping.md b/docs/subtyping.md