Skip to content

Commit

Permalink
Added support for type level strings to grammar
Browse files Browse the repository at this point in the history 
Referencing integer literals in type signature include patterns already need to adjust patterns for `type` and `class` etc

Closes #50
See #51
  • Loading branch information
@JustusAdam
JustusAdam committed Dec 21, 2017
1 parent 195d9bf commit eb2806f
Show file tree
Hide file tree
Showing 2 changed files with 140 additions and 86 deletions.
205 changes: 119 additions & 86 deletions syntaxes/haskell.tmLanguage
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,18 +338,8 @@
<string>keyword.control.haskell</string>
</dict>
<dict>
<key>comment</key>
<string>Floats are decimal or hexadecimal</string>
<key>match</key>
<string>\b([0-9](_*[0-9])*\.[0-9](_*[0-9])*(_*[eE][-+]?[0-9](_*[0-9])*)?|[0-9](_*[0-9])*_*[eE][-+]?[0-9](_*[0-9])*|0[xX]_*[0-9a-fA-F](_*[0-9a-fA-F])*\.[0-9a-fA-F](_*[0-9a-fA-F])*(_*[pP][-+]?[0-9](_*[0-9])*)?|0[xX]_*[0-9a-fA-F](_*[0-9a-fA-F])*_*[pP][-+]?[0-9](_*[0-9])*)\b</string>
<key>name</key>
<string>constant.numeric.float.haskell</string>
</dict>
<dict>
<key>match</key>
<string>\b([0-9](_*[0-9])*|0([xX]_*[0-9a-fA-F](_*[0-9a-fA-F])*|[oO]_*[0-7](_*[0-7])*|[bB]_*[01](_*[01])*))\b</string>
<key>name</key>
<string>constant.numeric.haskell</string>
<key>include</key>
<string>#numeric_literals</string>
</dict>
<dict>
<key>captures</key>
Expand All @@ -372,80 +362,8 @@
<string>#pragma</string>
</dict>
<dict>
<key>begin</key>
<string>"</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.definition.string.begin.haskell</string>
</dict>
</dict>
<key>end</key>
<string>"</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.definition.string.end.haskell</string>
</dict>
</dict>
<key>name</key>
<string>string.quoted.double.haskell</string>
<key>patterns</key>
<array>
<dict>
<key>match</key>
<string>\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\"'\&amp;])</string>
<key>name</key>
<string>constant.character.escape.haskell</string>
</dict>
<dict>
<key>match</key>
<string>\\o[0-7]+|\\x[0-9A-Fa-f]+|\\[0-9]+</string>
<key>name</key>
<string>constant.character.escape.octal.haskell</string>
</dict>
<dict>
<key>match</key>
<string>\\\^[A-Z@\[\]\\\^_]</string>
<key>name</key>
<string>constant.character.escape.control.haskell</string>
</dict>
<dict>
<key>begin</key>
<string>\\\s</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>constant.character.escape.begin.haskell</string>
</dict>
</dict>
<key>end</key>
<string>\\</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>constant.character.escape.end.haskell</string>
</dict>
</dict>
<key>patterns</key>
<array>
<dict>
<key>match</key>
<string>\S+</string>
<key>name</key>
<string>invalid.illegal.character-not-allowed-here.haskell</string>
</dict>
</array>
</dict>
</array>
<key>include</key>
<string>#string_literal</string>
</dict>
<dict>
<key>captures</key>
Expand Down Expand Up @@ -916,6 +834,121 @@
<key>include</key>
<string>#comments</string>
</dict>
<dict>
<key>include</key>
<string>#string_literal</string>
</dict>
<dict>
<key>include</key>
<string>#integer_literal</string>
</dict>
</array>
</dict>
<key>string_literal</key>
<dict>
<key>begin</key>
<string>"</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.definition.string.begin.haskell</string>
</dict>
</dict>
<key>end</key>
<string>"</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>punctuation.definition.string.end.haskell</string>
</dict>
</dict>
<key>name</key>
<string>string.quoted.double.haskell</string>
<key>patterns</key>
<array>
<dict>
<key>match</key>
<string>\\(NUL|SOH|STX|ETX|EOT|ENQ|ACK|BEL|BS|HT|LF|VT|FF|CR|SO|SI|DLE|DC1|DC2|DC3|DC4|NAK|SYN|ETB|CAN|EM|SUB|ESC|FS|GS|RS|US|SP|DEL|[abfnrtv\\\"'\&amp;])</string>
<key>name</key>
<string>constant.character.escape.haskell</string>
</dict>
<dict>
<key>match</key>
<string>\\o[0-7]+|\\x[0-9A-Fa-f]+|\\[0-9]+</string>
<key>name</key>
<string>constant.character.escape.octal.haskell</string>
</dict>
<dict>
<key>match</key>
<string>\\\^[A-Z@\[\]\\\^_]</string>
<key>name</key>
<string>constant.character.escape.control.haskell</string>
</dict>
<dict>
<key>begin</key>
<string>\\\s</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>constant.character.escape.begin.haskell</string>
</dict>
</dict>
<key>end</key>
<string>\\</string>
<key>endCaptures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>constant.character.escape.end.haskell</string>
</dict>
</dict>
<key>patterns</key>
<array>
<dict>
<key>match</key>
<string>\S+</string>
<key>name</key>
<string>invalid.illegal.character-not-allowed-here.haskell</string>
</dict>
</array>
</dict>
</array>
</dict>
<key>integer_literals</key>
<dict>
<key>comment</key>
<string>Floats are decimal or hexadecimal</string>
<key>match</key>
<string>\b([0-9](_*[0-9])*\.[0-9](_*[0-9])*(_*[eE][-+]?[0-9](_*[0-9])*)?|[0-9](_*[0-9])*_*[eE][-+]?[0-9](_*[0-9])*|0[xX]_*[0-9a-fA-F](_*[0-9a-fA-F])*\.[0-9a-fA-F](_*[0-9a-fA-F])*(_*[pP][-+]?[0-9](_*[0-9])*)?|0[xX]_*[0-9a-fA-F](_*[0-9a-fA-F])*_*[pP][-+]?[0-9](_*[0-9])*)\b</string>
<key>name</key>
<string>constant.numeric.float.haskell</string>
</dict>
<key>float_literals</key>
<dict>
<key>match</key>
<string>\b([0-9](_*[0-9])*|0([xX]_*[0-9a-fA-F](_*[0-9a-fA-F])*|[oO]_*[0-7](_*[0-7])*|[bB]_*[01](_*[01])*))\b</string>
<key>name</key>
<string>constant.numeric.haskell</string>
</dict>
<key>numeric_literals</key>
<dict>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#integer_literals</string>
</dict>
<dict>
<key>include</key>
<string>#float_literals</string>
</dict>
</array>
</dict>
</dict>
Expand Down
21 changes: 21 additions & 0 deletions test/syntax-examples/TypeLevelStrings.hs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FunctionalDependencies #-}
{-# LANGUAGE KindSignatures #-}
{-# LANGUAGE MultiParamTypeClasses #-}

import GHC.TypeLits

data Label (l :: Symbol) = Get

class Has a l b | a l -> b where
from :: a -> Label l -> b

data Point = Point Int Int deriving Show

instance Has Point "of" Int where from (Point x _) _ = x

example = from (Point 1 2) (Get :: Label "of")

main :: IO ()
main = undefined

0 comments on commit eb2806f

Please sign in to comment.