This is now a keyword

parapluu · Dec 10, 2014 · 26130e2 · 26130e2
1 parent f898b08
commit 26130e2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/emacs/encore-mode.el b/emacs/encore-mode.el
@@ -10,7 +10,7 @@
 ;; init-file. There is a hook to enable encore-mode for all files
 ;; with extension .enc.
 
-(setq encore-keywords '("class" "def" "else" "get" "if" "in" "let" "new" "passive" "print" "then" "unless" "while" "and" "or" "not"))
+(setq encore-keywords '("class" "def" "else" "get" "if" "in" "let" "new" "passive" "print" "then" "unless" "while" "and" "or" "not" "this"))
 (setq encore-danger-words '("embed" "body" "end"))
 (setq encore-constants '("true" "false" "null"))
 (setq encore-primitives '("int" "string" "void" "bool"))

diff --git a/src/parser/Parser/Parser.hs b/src/parser/Parser/Parser.hs
@@ -98,7 +98,7 @@ lexer =
                P.identStart = letter,
                P.reservedNames = ["passive", "class", "def", "let", "in", "if", "unless", "then", "else", 
 				  "and", "or", "not", "while", "get", "null", "true", "false", "new", "embed", 
-				  "body", "end", "Fut", "Par", "import", "qualified", "module"],
+				  "body", "end", "Fut", "Par", "import", "qualified", "module", "this"],
                P.reservedOpNames = [":", "=", "==", "!=", "<", ">", "<=", ">=", "+", "-", "*", "/", "%", "->", "\\", "()"]
              }
 
@@ -380,7 +380,7 @@ expr  =  unit
                    body <- expression
                    return $ Closure (meta pos) params body
       varAccess = do pos <- getPosition
-                     id <- identifier
+                     id <- (do reserved "this"; return "this") <|> identifier
                      return $ VarAccess (meta pos) $ Name id 
       null = do pos <- getPosition
                 reserved "null"

diff --git a/src/types/Typechecker/Typechecker.hs b/src/types/Typechecker/Typechecker.hs
@@ -291,18 +291,19 @@ instance Checkable Expr where
 
     typecheck let_@(Let {decls, body}) = 
         do eDecls <- typecheckDecls decls
-           let declTypes = map (AST.getType . snd) eDecls
-               declNames = map fst eDecls
+           let declNames = map fst eDecls
+               declTypes = map (AST.getType . snd) eDecls
            when (any isNullType declTypes) $ 
                 tcError $ "Cannot infer type of null-valued expression"
            eBody <- local (extendEnvironment (zip declNames declTypes)) $ pushTypecheck body
            return $ setType (AST.getType eBody) let_ {decls = eDecls, body = eBody}
         where
           typecheckDecls [] = return []
-          typecheckDecls ((name, expr):decls) = do eExpr <- pushTypecheck expr
-                                                   eDecls <- local (extendEnvironment [(name, AST.getType eExpr)]) 
-                                                                 $ typecheckDecls decls
-                                                   return $ (name, eExpr):eDecls
+          typecheckDecls ((name, expr):decls) = 
+              do eExpr <- pushTypecheck expr
+                 eDecls <- local (extendEnvironment [(name, AST.getType eExpr)]) $ typecheckDecls decls
+                 return $ (name, eExpr):eDecls
+
     typecheck seq@(Seq {eseq}) = 
         do eEseq <- mapM pushTypecheck eseq 
            let seqType = AST.getType (last eEseq)