msyds/gyehoek-hs
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix all the reader tests lol

Browse Source
This commit is contained in:
msyds
2026-08-22 18:13:04 -06:00
parent 73063d2b2c
commit bbcc924b34
13 changed files with 499 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
golden/read/bool/read
+40 -4
View File
@@ -1,5 +1,41 @@
[ SynNone :< SimpleF ( SimpleBoolean True ) [ MkAnn
, SynNone :< SimpleF ( SimpleBoolean True ) { syntax = SynNone
, SynNone :< SimpleF ( SimpleBoolean False ) , position = Just
, SynNone :< SimpleF ( SimpleBoolean False ) ( SourcePos
{ sourceName = "golden/read/bool/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 1
}
)
} :< SimpleF ( SimpleBoolean True )
, MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/bool/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 4
}
)
} :< SimpleF ( SimpleBoolean True )
, MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/bool/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 10
}
)
} :< SimpleF ( SimpleBoolean False )
, MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/bool/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 13
}
)
} :< SimpleF ( SimpleBoolean False )
] ]
golden/read/datum-comment/source.scm
+4
View File
@@ -0,0 +1,4 @@
#;(a datum comment can
span multiple lines)
(but it ends here)
golden/read/decimal/read
+30 -3
View File
@@ -1,8 +1,35 @@
[ SynNone :< SimpleF [ MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/decimal/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 1
}
)
} :< SimpleF
( SimpleNumber 45.0 ) ( SimpleNumber 45.0 )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/decimal/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 4
}
)
} :< SimpleF
( SimpleNumber 5667.0 ) ( SimpleNumber 5667.0 )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/decimal/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 10
}
)
} :< SimpleF
( SimpleNumber ( SimpleNumber
( -123.0 ) ( -123.0 )
) )
golden/read/list-dot-flat/read
+50 -5
View File
@@ -1,16 +1,61 @@
[ SynNone :< CompoundF [ MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list-dot-flat/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 1
}
)
} :< CompoundF
( DotListF ( DotListF
( (
( SynNone :< SimpleF ( MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list-dot-flat/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 2
}
)
} :< SimpleF
( SimpleSymbol "가" ) ( SimpleSymbol "가" )
) :| ) :|
[ SynNone :< SimpleF [ MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list-dot-flat/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 5
}
)
} :< SimpleF
( SimpleSymbol "나" ) ( SimpleSymbol "나" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list-dot-flat/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 8
}
)
} :< SimpleF
( SimpleSymbol "다" ) ( SimpleSymbol "다" )
] ]
) )
( SynNone :< SimpleF ( MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list-dot-flat/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 13
}
)
} :< SimpleF
( SimpleSymbol "라" ) ( SimpleSymbol "라" )
) )
) )
golden/read/list-flat/read
+80 -8
View File
@@ -1,18 +1,90 @@
[ SynNone :< CompoundF [ MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list-flat/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 1
}
)
} :< CompoundF
( ListF Ordinary ( ListF Ordinary
[ SynNone :< SimpleF [ MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list-flat/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 2
}
)
} :< SimpleF
( SimpleSymbol "가" ) ( SimpleSymbol "가" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list-flat/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 5
}
)
} :< SimpleF
( SimpleSymbol "나" ) ( SimpleSymbol "나" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list-flat/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 8
}
)
} :< SimpleF
( SimpleSymbol "다" ) ( SimpleSymbol "다" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list-flat/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 11
}
)
} :< SimpleF
( SimpleSymbol "라" ) ( SimpleSymbol "라" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list-flat/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 14
}
)
} :< SimpleF
( SimpleNumber 1.0 ) ( SimpleNumber 1.0 )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list-flat/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 16
}
)
} :< SimpleF
( SimpleNumber 2.0 ) ( SimpleNumber 2.0 )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list-flat/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 18
}
)
} :< SimpleF
( SimpleNumber 3.0 ) ( SimpleNumber 3.0 )
] ]
) )
golden/read/list/read
+120 -12
View File
@@ -1,37 +1,145 @@
[ SynNone :< CompoundF [ MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 1
}
)
} :< CompoundF
( DotListF ( DotListF
( (
( SynNone :< SimpleF ( MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 2
}
)
} :< SimpleF
( SimpleSymbol "a" ) ( SimpleSymbol "a" )
) :| ) :|
[ SynNone :< SimpleF [ MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 4
}
)
} :< SimpleF
( SimpleSymbol "b" ) ( SimpleSymbol "b" )
, SynNone :< CompoundF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 6
}
)
} :< CompoundF
( ListF Ordinary ( ListF Ordinary
[ SynNone :< SimpleF [ MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 7
}
)
} :< SimpleF
( SimpleSymbol "c" ) ( SimpleSymbol "c" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 9
}
)
} :< SimpleF
( SimpleSymbol "d" ) ( SimpleSymbol "d" )
] ]
) )
] ]
) )
( SynNone :< CompoundF ( MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 14
}
)
} :< CompoundF
( ListF Ordinary ( ListF Ordinary
[ SynNone :< SimpleF [ MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 15
}
)
} :< SimpleF
( SimpleSymbol "가" ) ( SimpleSymbol "가" )
, SynNone :< CompoundF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 18
}
)
} :< CompoundF
( DotListF ( DotListF
( (
( SynNone :< SimpleF ( MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 19
}
)
} :< SimpleF
( SimpleSymbol "나" ) ( SimpleSymbol "나" )
) :| [] ) :| []
) )
( SynNone :< SimpleF ( MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 24
}
)
} :< SimpleF
( SimpleSymbol "다" ) ( SimpleSymbol "다" )
) )
) )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/list/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 28
}
)
} :< SimpleF
( SimpleSymbol "라" ) ( SimpleSymbol "라" )
] ]
) )
golden/read/meta-splice-expression-interior-brace/source.scm
+2
View File
@@ -0,0 +1,2 @@
##{case 123 of { 123 -> blah
; xyz -> flah }}
golden/read/peculiar-identifier-sign/read
+20 -2
View File
@@ -1,5 +1,23 @@
[ SynNone :< SimpleF [ MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/peculiar-identifier-sign/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 1
}
)
} :< SimpleF
( SimpleSymbol "+" ) ( SimpleSymbol "+" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/peculiar-identifier-sign/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 3
}
)
} :< SimpleF
( SimpleSymbol "-" ) ( SimpleSymbol "-" )
] ]
golden/read/string/read
+10 -1
View File
@@ -1,3 +1,12 @@
[ SynNone :< SimpleF [ MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/string/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 1
}
)
} :< SimpleF
( SimpleString "가나다라" ) ( SimpleString "가나다라" )
] ]
golden/read/typical-identifier-token/read
+50 -5
View File
@@ -1,12 +1,57 @@
[ SynNone :< SimpleF [ MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/typical-identifier-token/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 1
}
)
} :< SimpleF
( SimpleSymbol "abc" ) ( SimpleSymbol "abc" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/typical-identifier-token/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 4
}
)
} :< SimpleF
( SimpleString "xyz" ) ( SimpleString "xyz" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/typical-identifier-token/source.scm"
, sourceLine = Pos 2
, sourceColumn = Pos 1
}
)
} :< SimpleF
( SimpleSymbol "수학" ) ( SimpleSymbol "수학" )
, SynNone :< CompoundF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/typical-identifier-token/source.scm"
, sourceLine = Pos 2
, sourceColumn = Pos 5
}
)
} :< CompoundF
( ListF Ordinary ( ListF Ordinary
[ SynNone :< SimpleF [ MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/typical-identifier-token/source.scm"
, sourceLine = Pos 2
, sourceColumn = Pos 6
}
)
} :< SimpleF
( SimpleSymbol "數學" ) ( SimpleSymbol "數學" )
] ]
) )
golden/read/typical-identifier/read
+90 -9
View File
@@ -1,19 +1,100 @@
[ SynNone :< SimpleF [ MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/typical-identifier/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 1
}
)
} :< SimpleF
( SimpleSymbol "abc" ) ( SimpleSymbol "abc" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/typical-identifier/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 5
}
)
} :< SimpleF
( SimpleSymbol "bala-hwa$" ) ( SimpleSymbol "bala-hwa$" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/typical-identifier/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 15
}
)
} :< SimpleF
( SimpleSymbol "x!!!" ) ( SimpleSymbol "x!!!" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/typical-identifier/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 20
}
)
} :< SimpleF
( SimpleSymbol "z" ) ( SimpleSymbol "z" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/typical-identifier/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 22
}
)
} :< SimpleF
( SimpleSymbol "z123" ) ( SimpleSymbol "z123" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/typical-identifier/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 27
}
)
} :< SimpleF
( SimpleSymbol "나는너무졸리다" ) ( SimpleSymbol "나는너무졸리다" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/typical-identifier/source.scm"
, sourceLine = Pos 1
, sourceColumn = Pos 42
}
)
} :< SimpleF
( SimpleSymbol "學" ) ( SimpleSymbol "學" )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/typical-identifier/source.scm"
, sourceLine = Pos 3
, sourceColumn = Pos 1
}
)
} :< SimpleF
( SimpleSymbol "車室." ) ( SimpleSymbol "車室." )
, SynNone :< SimpleF , MkAnn
{ syntax = SynNone
, position = Just
( SourcePos
{ sourceName = "golden/read/typical-identifier/source.scm"
, sourceLine = Pos 5
, sourceColumn = Pos 1
}
)
} :< SimpleF
( SimpleSymbol "三個女人一臺戲。" ) ( SimpleSymbol "三個女人一臺戲。" )
] ]
src/Gyehoek/Jalmot.hs
+1 -1
View File
@@ -57,4 +57,4 @@ instance Exception AJalmot where
instance Exception AJalmotCS where instance Exception AJalmotCS where
backtraceDesired = const False backtraceDesired = const False
displayException (MkAJalmotCS cs jm) = displayException (MkAJalmotCS cs jm) =
"\n" <> displayException jm <> "\n\n" <> prettyCallStack cs "\n" <> displayException jm <> "\n\n" <> prettyCallStack cs <> "\n"
test/Gyehoek/Test/Sexp/Read.hs
+2
View File
@@ -21,6 +21,8 @@ brokenReaderTests =
[ "delimited-identifier" [ "delimited-identifier"
, "string-line-continuation" , "string-line-continuation"
, "peculiar-identifier-dot" , "peculiar-identifier-dot"
, "meta-splice-expression-interior-brace"
, "datum-comment"
] ]
test_golden :: IO TestTree test_golden :: IO TestTree