Add Regex to syntax, fix ruby regex fixtures

src/Data/Syntax/Literal.hs

@@ -95,9 +95,14 @@ newtype Symbol a = Symbol { symbolContent :: ByteString }
 instance Eq1 Symbol where liftEq = genericLiftEq
 instance Show1 Symbol where liftShowsPrec = genericLiftShowsPrec
 
+newtype Regex a = Regex { regexContent :: ByteString }
+  deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Show, Traversable)
+
+instance Eq1 Regex where liftEq = genericLiftEq
+instance Show1 Regex where liftShowsPrec = genericLiftShowsPrec
+
 -- TODO: Heredoc-style string literals?
 -- TODO: Character literals.
--- TODO: Regular expressions.
 
 
 -- Collections

src/Language/Ruby/Syntax.hs

@@ -49,6 +49,7 @@ type Syntax = '[
   , Literal.KeyValue
   , Literal.Null
   , Literal.Rational
+  , Literal.Regex
   , Literal.String
   , Literal.Symbol
   , Literal.TextElement
@@ -171,7 +172,7 @@ literal =
   <|> makeTerm <$> symbol Subshell <*> (Literal.TextElement <$> source)
   <|> makeTerm <$> symbol String <*> (Literal.TextElement <$> source)
   <|> makeTerm <$> symbol ChainedString <*> children (many (term (makeTerm <$> symbol String <*> (Literal.TextElement <$> source))))
-  <|> makeTerm <$> symbol Regex <*> (Literal.TextElement <$> source)
+  <|> makeTerm <$> symbol Regex <*> (Literal.Regex <$> source)
   <|> makeTerm <$> symbol Symbol <*> (Literal.Symbol <$> source)
 
 heredoc :: Assignment

test/fixtures/ruby/regex.diffA-B.txt

@@ -1,4 +1,4 @@
 (Program
-{ (Regex)
-->(Regex) }
-{+(Regex)+})
+{+(Regex)+}
+{+(Regex)+}
+{-(Regex)-})

test/fixtures/ruby/regex.diffB-A.txt

@@ -1,4 +1,4 @@
 (Program
-{ (Regex)
-->(Regex) }
+{+(Regex)+}
+{-(Regex)-}
 {-(Regex)-})