From b47154b15eb696c5a0e05ba0d95e2330837411da Mon Sep 17 00:00:00 2001
From: Troels Henriksen <athas@sigkill.dk>
Date: Mon, 24 Dec 2018 00:09:33 +0100
Subject: [PATCH] Fix #685.

---
 src/Futhark/Test/Values.hs           |  8 ++++----
 src/Language/Futhark/Parser/Lexer.x  |  7 +++++--
 src/Language/Futhark/Parser/Parser.y | 10 ++++++----
 tests/proj3.fut                      |  2 +-
 tests/proj4.fut                      |  7 +++++++
 5 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 tests/proj4.fut

diff --git a/src/Futhark/Test/Values.hs b/src/Futhark/Test/Values.hs
index 5330597ca1..0f5fad531a 100644
--- a/src/Futhark/Test/Values.hs
+++ b/src/Futhark/Test/Values.hs
@@ -358,15 +358,15 @@ readFloat f t = do
 readFloat32 :: ReadValue Float
 readFloat32 = readFloat lexFloat32
   where lexFloat32 [F32LIT x] = Just x
-        lexFloat32 [ID "f32", DOT, ID "inf"] = Just $ 1/0
-        lexFloat32 [ID "f32", DOT, ID "nan"] = Just $ 0/0
+        lexFloat32 [ID "f32", PROJ_FIELD "inf"] = Just $ 1/0
+        lexFloat32 [ID "f32", PROJ_FIELD "nan"] = Just $ 0/0
         lexFloat32 _ = Nothing
 
 readFloat64 :: ReadValue Double
 readFloat64 = readFloat lexFloat64
   where lexFloat64 [F64LIT x] = Just x
-        lexFloat64 [ID "f64", DOT, ID "inf"] = Just $ 1/0
-        lexFloat64 [ID "f64", DOT, ID "nan"] = Just $ 0/0
+        lexFloat64 [ID "f64", PROJ_FIELD "inf"] = Just $ 1/0
+        lexFloat64 [ID "f64", PROJ_FIELD "nan"] = Just $ 0/0
         lexFloat64 _          = Nothing
 
 readBool :: ReadValue Bool
diff --git a/src/Language/Futhark/Parser/Lexer.x b/src/Language/Futhark/Parser/Lexer.x
index d9941a607c..f72347e4fd 100644
--- a/src/Language/Futhark/Parser/Lexer.x
+++ b/src/Language/Futhark/Parser/Lexer.x
@@ -77,7 +77,6 @@ tokens :-
   "_"                      { tokenC UNDERSCORE }
   "->"                     { tokenC RIGHT_ARROW }
   ":"                      { tokenC COLON }
-  "."                      { tokenC DOT }
   "\"                      { tokenC BACKSLASH }
   "'"                      { tokenC APOSTROPHE }
   "'^"                     { tokenC APOSTROPHE_THEN_HAT }
@@ -118,6 +117,9 @@ tokens :-
 
   @binop                   { tokenM $ return . symbol [] . nameFromText }
   @qualbinop               { tokenM $ \s -> do (qs,k) <- mkQualId s; return (symbol qs k) }
+
+  "." (@identifier|[0-9]+) { tokenM $ return . PROJ_FIELD . nameFromText . T.drop 1 }
+  "." "["                  { tokenC PROJ_INDEX }
 {
 
 keyword :: T.Text -> Token
@@ -298,6 +300,8 @@ data Token = ID Name
            | QUALUNOP [Name] Name
            | SYMBOL BinOp [Name] Name
            | CONSTRUCTOR Name
+           | PROJ_FIELD Name
+           | PROJ_INDEX
 
            | INTLIT Integer
            | STRINGLIT String
@@ -319,7 +323,6 @@ data Token = ID Name
            | APOSTROPHE
            | APOSTROPHE_THEN_HAT
            | BACKTICK
-           | DOT
            | TWO_DOTS
            | TWO_DOTS_LT
            | TWO_DOTS_GT
diff --git a/src/Language/Futhark/Parser/Parser.y b/src/Language/Futhark/Parser/Parser.y
index 38a343bb60..601a3b920a 100644
--- a/src/Language/Futhark/Parser/Parser.y
+++ b/src/Language/Futhark/Parser/Parser.y
@@ -71,6 +71,9 @@ import Language.Futhark.Parser.Lexer
 
       constructor     { L _ (CONSTRUCTOR _) }
 
+      '.field'        { L _ (PROJ_FIELD _) }
+      '.['            { L _ PROJ_INDEX }
+
       intlit          { L _ (INTLIT _) }
       i8lit           { L _ (I8LIT _) }
       i16lit          { L _ (I16LIT _) }
@@ -138,7 +141,6 @@ import Language.Futhark.Parser.Lexer
       entry           { L $$ ENTRY }
       '->'            { L $$ RIGHT_ARROW }
       ':'             { L $$ COLON }
-      '.'             { L $$ DOT }
       for             { L $$ FOR }
       do              { L $$ DO }
       with            { L $$ WITH }
@@ -634,8 +636,8 @@ Atom : PrimLit        { Literal (fst $1) (snd $1) }
      | '(' FieldAccess FieldAccesses ')'
        { ProjectSection (map fst ($2:$3)) NoInfo (srcspan $1 $>) }
 
-     | '(' '.' '[' DimIndices ']' ')'
-       { IndexSection $4 NoInfo (srcspan $1 $>) }
+     | '(' '.[' DimIndices ']' ')'
+       { IndexSection $3 NoInfo (srcspan $1 $>) }
 
 
 PrimLit :: { (PrimValue, SrcLoc) }
@@ -668,7 +670,7 @@ Exps1_ :: { ([UncheckedExp], UncheckedExp) }
         | Exp            { ([], $1) }
 
 FieldAccess :: { (Name, SrcLoc) }
-             : '.' FieldId { (fst $2, srcspan $1 (snd $>)) }
+             : '.field' { let L loc (PROJ_FIELD f) = $1 in (f, loc) }
 
 FieldAccesses :: { [(Name, SrcLoc)] }
                : FieldAccess FieldAccesses { $1 : $2 }
diff --git a/tests/proj3.fut b/tests/proj3.fut
index 4b66aa3baf..493349ceb6 100644
--- a/tests/proj3.fut
+++ b/tests/proj3.fut
@@ -1,4 +1,4 @@
--- Can we map a deeper tuple projection?
+-- Can we map a deeper record projection?
 -- ==
 -- input { [1,2] [3,4] }
 -- output { [1,2] }
diff --git a/tests/proj4.fut b/tests/proj4.fut
new file mode 100644
index 0000000000..2d8e5f0379
--- /dev/null
+++ b/tests/proj4.fut
@@ -0,0 +1,7 @@
+-- Can we map a deeper tuple projection?
+-- ==
+-- input { [1,2] [3,4] }
+-- output { [1,2] }
+
+let main (xs: []i32) (ys: []i32): []i32 =
+  map (.1.1) (map2 (\x y -> ((x,x), y)) xs ys)