feat(Tuples): add tuple elements of unlimited length#50

Merged

emqplus merged 2 commits intohamler-lang:hamlerfrom

Jun 23, 2020

Collaborator

sdzx-1 commented Jun 23, 2020

No description provided.


          feat(Tuples): add tuple elements of unlimited length

a5eb8e1

sdzx-1 requested a review from emqplus

June 23, 2020 10:13

emqplus commented Jun 23, 2020

Rename TuplesLiteral to TupleLiteral

emqplus requested changes

View reviewed changes

src/Language/PureScript/AST/Binders.hs Outdated

-                lit ns (TupleLiteral6 a b c d e f) = foldl go ns [a,b,c,d,e,f]
-                lit ns (TupleLiteral7 a b c d e f g) = foldl go ns [a,b,c,d,e,f,g]
+                lit ns (TuplesLiteral xs) = foldl go ns xs

emqplus Jun 23, 2020

TuplesLiteral -> TupleLiteral

src/Language/PureScript/AST/Declarations.hs Outdated

                 | CannotDefinePrimModules ModuleName
                 | MixedAssociativityError (NEL.NonEmpty (Qualified (OpName 'AnyOpName), Associativity))
                 | NonAssociativeError (NEL.NonEmpty (Qualified (OpName 'AnyOpName)))
+                | TuplesLengthDifferent Int Int

emqplus Jun 23, 2020

TuplesLengthDifferent -> TupleLengthDifferent

src/Language/PureScript/AST/Literals.hs Outdated

-                | TupleLiteral6 a a a a a a
-                | TupleLiteral7 a a a a a a a
+                | TuplesLiteral [a]

emqplus Jun 23, 2020

TupleLiteral

src/Language/PureScript/AST/Literals.hs Outdated

-                show (TupleLiteral6 a b c d e f) = "(" <> show a <> "," <> show b <> "," <> show c <> "," <> show d <> "," <> show e <> "," <> show f <> ")"
-                show (TupleLiteral7 a b c d e f g) = "(" <> show a <> "," <> show b <> "," <> show c <> "," <> show d <> "," <> show e <> "," <> show f <> "," <> show g <> ")"
+                show (TuplesLiteral xs) = "(" <> show xs <> ")"

emqplus Jun 23, 2020

TupleLiteral

src/Language/PureScript/AST/Traversals.hs Outdated

-                f' <- go f
-                g' <- go g
-                return $ TupleLiteral7 a' b' c' d' e' f' g'
+              litM go (TuplesLiteral xs) = TuplesLiteral <$> traverse go xs

emqplus Jun 23, 2020

TupleLiteral

src/Language/PureScript/Types.hs Outdated

                 go bound (ForAll _ v _ t _) = go (v : bound) t
                 go bound (ConstrainedType _ c t) = concatMap (go bound) (constraintArgs c) ++ go bound t
                 go bound (RCons _ _ t r) = go bound t ++ go bound r
+                go bound (Tuples _  t r) = go bound t ++ go bound r

emqplus Jun 23, 2020

Tuples -> Tuple

src/Language/PureScript/Types.hs Outdated

                 go (ForAll ann arg mbK ty sco) = f (ForAll ann arg mbK (go ty) sco)
                 go (ConstrainedType ann c ty) = f (ConstrainedType ann (mapConstraintArgs (map go) c) (go ty))
                 go (RCons ann name ty rest) = f (RCons ann name (go ty) (go rest))
+                go (Tuples ann ty rest) = f (Tuples ann (go ty) (go rest))

emqplus Jun 23, 2020

Tuples -> Tuple

src/Language/PureScript/Types.hs Outdated

                 go (ForAll ann arg mbK ty sco) = ForAll ann arg mbK (go (f ty)) sco
                 go (ConstrainedType ann c ty) = ConstrainedType ann (mapConstraintArgs (map (go . f)) c) (go (f ty))
                 go (RCons ann name ty rest) = RCons ann name (go (f ty)) (go (f rest))
+                go (Tuples ann ty rest) = Tuples ann (go (f ty)) (go (f rest))

emqplus Jun 23, 2020

Tuples -> Tuple

src/Language/PureScript/Types.hs Outdated

                 go (ForAll ann arg mbK ty sco) = (ForAll ann arg mbK <$> go ty <*> pure sco) >>= f
                 go (ConstrainedType ann c ty) = (ConstrainedType ann <$> overConstraintArgs (mapM go) c <*> go ty) >>= f
                 go (RCons ann name ty rest) = (RCons ann name <$> go ty <*> go rest) >>= f
+                go (Tuples ann ty rest) = (Tuples ann <$> go ty <*> go rest) >>= f

emqplus Jun 23, 2020

Tuples -> Tuple

src/Language/PureScript/Types.hs Outdated

+              compareType (Tuples _ b c) (Tuples _ b' c') = compareType b b' <> compareType c c'
+              compareType (Tuples {}) _ = LT
+              compareType _ (Tuples {}) = GT

emqplus Jun 23, 2020

Rename all the Tuples to Tuple


          feat(Tuple): rename "Tuples" to "Tuple"

d38fbc7

emqplus approved these changes

View reviewed changes

emqplus merged commit 07633b6 into hamler-lang:hamler

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet