Merge branch 'WIP-happy1.9.6'

Author: harpocrates

language-rust.cabal

@@ -38,7 +38,7 @@ library
                        -Wincomplete-uni-patterns
                        -Wmissing-signatures
 
-  build-tools:         alex, happy
+  build-tools:         alex, happy >= 1.19.8
   default-language:    Haskell2010
 
   exposed-modules:     Language.Rust.Syntax
@@ -133,10 +133,10 @@ test-suite rustc-tests
 
   type:                exitcode-stdio-1.0
   default-language:    Haskell2010
-
-  build-depends:       base >=4.8 && <5.0
-                     , process >= 1.4.3
-                     , prettyprinter >=1.0
+  
+  build-depends:       base >=4.9 && <5.0
+                     , process >= 1.3
+                     , prettyprinter >=1.1
                      , bytestring >=0.10
                      , aeson >= 0.11.0.0
                      , directory >= 1.2.5.0

sample-sources/expressions.rs

@@ -23,7 +23,8 @@ fn main() {
   loop { break; }
   'l: loop { break 'l 1; }
   match x { _ => () }
-  let x = move |a,b,c| { a + b + c }; 
+  let x = move |a,b,c| { a + b + c };
+  let f = |_||x, y| x+y;
   let x = { 1 };
   let x = unsafe { 1 };
   a = 1;

src/Language/Rust/Parser.hs

@@ -56,12 +56,10 @@ parse' is = case execParser parser is initPos of
               Left (pos, msg) -> throw (ParseFail pos msg)
               Right x -> x
 
-
 execParserTokens :: P a -> [Spanned Token] -> Position -> Either (Position,String) a
-execParserTokens p toks pos = execParser (pushTokens toks *> p) (inputStreamFromString "") pos
+execParserTokens p toks = execParser (pushTokens toks *> p) (inputStreamFromString "")
   where pushTokens = traverse_ pushToken . reverse
 
-
 -- | Given a path pointing to a Rust source file, read that file and parse it into a 'SourceFile'
 readSourceFile :: FilePath -> IO (SourceFile Span)
 readSourceFile fileName = parse' <$> readInputStream fileName

src/Language/Rust/Parser/Internal.y

@@ -0,0 +1,38 @@
+{-# LANGUAGE TemplateHaskellQuotes #-}
+
+module Language.Rust.QuasiQuote (
+  expr 
+) where
+
+import Language.Rust.Parser.ParseMonad
+import Language.Rust.Parser.Internal
+import Language.Rust.Data.InputStream (inputStreamFromString)
+import Language.Rust.Data.Position (Position(..))
+
+import Language.Haskell.TH
+import Language.Haskell.TH.Quote (QuasiQuoter(..), dataToExpQ, dataToPatQ)
+
+import Data.Data (Data)
+
+expr :: QuasiQuoter
+expr = QuasiQuoter { quoteExp = expr' 
+                   , quotePat = notExprFail
+                   , quoteType = noExprFail
+                   , quoteDec = notExprFail
+                   }
+  where
+  notExprFail :: String -> Q a
+  notExprFail _ = fail "This quasiquoter only works for expressions"
+
+  exprParser 
+
+  expr' :: String -> Q Exp
+  expr' s =
+    case parsePartial (inputStreamFromString s) of
+      Left (pos,msg) -> fail $ "Could not parse the type in the quasiquote 
+    let inp = inputStreamFromString s
+        ty_either = parsePartial inp
+    in 
+
+
+

src/Language/Rust/QuasiQuote.hs

@@ -0,0 +1,9 @@
+{
+{-# OPTIONS_HADDOCK hide, not-home #-}
+{-# LANGUAGE OverloadedStrings, OverloadedLists, PartialTypeSignatures #-}
+
+module Language.Rust.QuasiQuoteParser (
+  
+) where
+
+

src/Language/Rust/QuasiQuoteParser.y

@@ -92,8 +92,8 @@ data Token
   | Underscore            -- ^ @_@ token
   | LifetimeTok Ident     -- ^ a lifetime (something like @\'a@ or @\'static@)
   | Space Space Name      -- ^ whitespace
-  -- ^ doc comment with its contents, whether it is outer/inner, and whether it is inline or not
   | Doc String !AttrStyle !Bool
+  -- ^ doc comment with its contents, whether it is outer/inner, and whether it is inline or not
   | Shebang               -- ^ @#!@ shebang token
   | Eof                   -- ^ end of file token
 

src/Language/Rust/Syntax/Token.hs

@@ -33,7 +33,7 @@ import Test.Framework.Providers.API
 main :: IO ()
 main = do
   -- Check last time `rustc` version was bumped
-  let lastDay = fromGregorian 2017 8 21
+  let lastDay = fromGregorian 2017 9 25
   today <- utctDay <$> getCurrentTime
   when (diffDays today lastDay > 32) $
     putStrLn $ "\x1b[33m" ++ "\nThe version of `rustc' the tests will try to use is older than 1 month" ++ "\x1b[0m"