3c80158 · project-m36 · git.iko.soy

git.iko.soy/project-m36

don't parse ":showexprx" (with missing space)

commit3c801587edce8e74dbed3b16e76b5fcbea7dc295 authorAgentM <agentm@themactionfaction.com> dateWed 28 Oct 2020, 00:45 (6 years ago) parentef2978d

2 files changed+17−11

compare with master

unifiedsplit

src/bin/TutorialD/Interpreter/Base.hs+6 src/bin/TutorialD/Interpreter/RODatabaseContextOperator.hs+11−11

src/bin/TutorialD/Interpreter/Base.hs+6

@@ -222,3 +222,9 @@ utcTimeP = do

222222 case parseTimeM True defaultTimeLocale "%Y-%m-%d %H:%M:%S" (T.unpack timeStr) of

223223 Nothing -> fail "invalid datetime input, use \"YYYY-MM-DD HH:MM:SS\""

224224 Just stamp' -> pure stamp'

225+

226+

227+colonOp :: Text -> Parser ()

228+colonOp opStr = do

229+ _ <- chunk opStr <* spaceChar <* spaceConsumer

230+ pure ()

src/bin/TutorialD/Interpreter/RODatabaseContextOperator.hs+11−11

@@ -31,44 +31,44 @@ data RODatabaseContextOperator where

3131

3232typeP :: Parser RODatabaseContextOperator

3333typeP = do

34− reservedOp ":type"

34+ colonOp ":type"

3535 ShowRelationType <$> relExprP

3636

3737showRelP :: Parser RODatabaseContextOperator

3838showRelP = do

39− reservedOp ":showexpr"

39+ colonOp ":showexpr"

4040 ShowRelation <$> relExprP

4141

4242showPlanP :: Parser RODatabaseContextOperator

4343showPlanP = do

44− reservedOp ":showplan"

44+ colonOp ":showplan"

4545 ShowPlan <$> databaseContextExprP

4646

4747showTypesP :: Parser RODatabaseContextOperator

48−showTypesP = reserved ":showtypes" >> pure ShowTypes

48+showTypesP = colonOp ":showtypes" >> pure ShowTypes

4949

5050showRelationVariables :: Parser RODatabaseContextOperator

51−showRelationVariables = reserved ":showrelvars" >> pure ShowRelationVariables

51+showRelationVariables = colonOp ":showrelvars" >> pure ShowRelationVariables

5252

5353showAtomFunctionsP :: Parser RODatabaseContextOperator

54−showAtomFunctionsP = reserved ":showatomfunctions" >> pure ShowAtomFunctions

54+showAtomFunctionsP = colonOp ":showatomfunctions" >> pure ShowAtomFunctions

5555

5656showDatabaseContextFunctionsP :: Parser RODatabaseContextOperator

57−showDatabaseContextFunctionsP = reserved ":showdatabasecontextfunctions" >> pure ShowDatabaseContextFunctions

57+showDatabaseContextFunctionsP = colonOp ":showdatabasecontextfunctions" >> pure ShowDatabaseContextFunctions

5858

5959quitP :: Parser RODatabaseContextOperator

6060quitP = do

61− reservedOp ":quit"

61+ colonOp ":quit"

6262 return Quit

6363

6464showConstraintsP :: Parser RODatabaseContextOperator

6565showConstraintsP = do

66− reservedOp ":constraints"

66+ colonOp ":constraints"

6767 ShowConstraint <$> option "" identifier

6868

6969plotRelExprP :: Parser RODatabaseContextOperator

7070plotRelExprP = do

71− reserved ":plotexpr"

71+ colonOp ":plotexpr"

7272 PlotRelation <$> relExprP

7373

7474roDatabaseContextOperatorP :: Parser RODatabaseContextOperator

@@ -164,7 +164,7 @@ interpretRODatabaseContextOp sessionId conn tutdstring = case parse roDatabaseCo

164164

165165showDataFrameP :: Parser RODatabaseContextOperator

166166showDataFrameP = do

167− reservedOp ":showdataframe"

167+ colonOp ":showdataframe"

168168 relExpr <- relExprP

169169 reservedOp "orderby"

170170 attrOrdersExpr <- attrOrdersExprP