Index: include/llvm/Support/YAMLParser.h =================================================================== --- include/llvm/Support/YAMLParser.h +++ include/llvm/Support/YAMLParser.h @@ -76,9 +76,9 @@ class Stream { public: /// \brief This keeps a reference to the string referenced by \p Input. - Stream(StringRef Input, SourceMgr &); + Stream(StringRef Input, SourceMgr &, bool ShowColors = true); - Stream(MemoryBufferRef InputBuffer, SourceMgr &); + Stream(MemoryBufferRef InputBuffer, SourceMgr &, bool ShowColors = true); ~Stream(); document_iterator begin(); Index: lib/Support/YAMLParser.cpp =================================================================== --- lib/Support/YAMLParser.cpp +++ lib/Support/YAMLParser.cpp @@ -260,8 +260,8 @@ /// @brief Scans YAML tokens from a MemoryBuffer. class Scanner { public: - Scanner(StringRef Input, SourceMgr &SM); - Scanner(MemoryBufferRef Buffer, SourceMgr &SM_); + Scanner(StringRef Input, SourceMgr &SM, bool ShowColors = true); + Scanner(MemoryBufferRef Buffer, SourceMgr &SM_, bool ShowColors = true); /// @brief Parse the next token and return it without popping it. Token &peekNext(); @@ -271,7 +271,7 @@ void printError(SMLoc Loc, SourceMgr::DiagKind Kind, const Twine &Message, ArrayRef Ranges = None) { - SM.PrintMessage(Loc, Kind, Message, Ranges); + SM.PrintMessage(Loc, Kind, Message, Ranges, /* FixIts= */ None, ShowColors); } void setError(const Twine &Message, StringRef::iterator Position) { @@ -501,6 +501,9 @@ /// @brief True if an error has occurred. bool Failed; + /// @brief Should colors be used when printing out the diagnostic messages? + bool ShowColors; + /// @brief Queue of tokens. This is required to queue up tokens while looking /// for the end of a simple key. And for cases where a single character /// can produce multiple tokens (e.g. BlockEnd). @@ -702,11 +705,13 @@ return EscapedInput; } -Scanner::Scanner(StringRef Input, SourceMgr &sm) : SM(sm) { +Scanner::Scanner(StringRef Input, SourceMgr &sm, bool ShowColors) + : SM(sm), ShowColors(ShowColors) { init(MemoryBufferRef(Input, "YAML")); } -Scanner::Scanner(MemoryBufferRef Buffer, SourceMgr &SM_) : SM(SM_) { +Scanner::Scanner(MemoryBufferRef Buffer, SourceMgr &SM_, bool ShowColors) + : SM(SM_), ShowColors(ShowColors) { init(Buffer); } @@ -1518,11 +1523,11 @@ return false; } -Stream::Stream(StringRef Input, SourceMgr &SM) - : scanner(new Scanner(Input, SM)), CurrentDoc() {} +Stream::Stream(StringRef Input, SourceMgr &SM, bool ShowColors) + : scanner(new Scanner(Input, SM, ShowColors)), CurrentDoc() {} -Stream::Stream(MemoryBufferRef InputBuffer, SourceMgr &SM) - : scanner(new Scanner(InputBuffer, SM)), CurrentDoc() {} +Stream::Stream(MemoryBufferRef InputBuffer, SourceMgr &SM, bool ShowColors) + : scanner(new Scanner(InputBuffer, SM, ShowColors)), CurrentDoc() {} Stream::~Stream() {} Index: test/YAMLParser/bool.data =================================================================== --- test/YAMLParser/bool.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- yes -- NO -- True -- on Index: test/YAMLParser/bool.test =================================================================== --- /dev/null +++ test/YAMLParser/bool.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +- yes +- NO +- True +- on Index: test/YAMLParser/construct-bool.data =================================================================== --- test/YAMLParser/construct-bool.data +++ /dev/null @@ -1,11 +0,0 @@ -# RUN: yaml-bench -canonical %s - -canonical: yes -answer: NO -logical: True -option: on - - -but: - y: is a string - n: is a string Index: test/YAMLParser/construct-bool.test =================================================================== --- /dev/null +++ test/YAMLParser/construct-bool.test @@ -0,0 +1,11 @@ +# RUN: yaml-bench -canonical %s + +canonical: yes +answer: NO +logical: True +option: on + + +but: + y: is a string + n: is a string Index: test/YAMLParser/construct-custom.data =================================================================== --- test/YAMLParser/construct-custom.data +++ /dev/null @@ -1,28 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -- !tag1 - x: 1 -- !tag1 - x: 1 - 'y': 2 - z: 3 -- !tag2 - 10 -- !tag2 - =: 10 - 'y': 20 - z: 30 -- !tag3 - x: 1 -- !tag3 - x: 1 - 'y': 2 - z: 3 -- !tag3 - =: 1 - 'y': 2 - z: 3 -- !foo - my-parameter: foo - my-another-parameter: [1,2,3] Index: test/YAMLParser/construct-custom.test =================================================================== --- /dev/null +++ test/YAMLParser/construct-custom.test @@ -0,0 +1,28 @@ +# RUN: yaml-bench -canonical %s + +--- +- !tag1 + x: 1 +- !tag1 + x: 1 + 'y': 2 + z: 3 +- !tag2 + 10 +- !tag2 + =: 10 + 'y': 20 + z: 30 +- !tag3 + x: 1 +- !tag3 + x: 1 + 'y': 2 + z: 3 +- !tag3 + =: 1 + 'y': 2 + z: 3 +- !foo + my-parameter: foo + my-another-parameter: [1,2,3] Index: test/YAMLParser/construct-float.data =================================================================== --- test/YAMLParser/construct-float.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - -canonical: 6.8523015e+5 -exponential: 685.230_15e+03 -fixed: 685_230.15 -sexagesimal: 190:20:30.15 -negative infinity: -.inf -not a number: .NaN Index: test/YAMLParser/construct-float.test =================================================================== --- /dev/null +++ test/YAMLParser/construct-float.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +canonical: 6.8523015e+5 +exponential: 685.230_15e+03 +fixed: 685_230.15 +sexagesimal: 190:20:30.15 +negative infinity: -.inf +not a number: .NaN Index: test/YAMLParser/construct-int.data =================================================================== --- test/YAMLParser/construct-int.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - -canonical: 685230 -decimal: +685_230 -octal: 02472256 -hexadecimal: 0x_0A_74_AE -binary: 0b1010_0111_0100_1010_1110 -sexagesimal: 190:20:30 Index: test/YAMLParser/construct-int.test =================================================================== --- /dev/null +++ test/YAMLParser/construct-int.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +canonical: 685230 +decimal: +685_230 +octal: 02472256 +hexadecimal: 0x_0A_74_AE +binary: 0b1010_0111_0100_1010_1110 +sexagesimal: 190:20:30 Index: test/YAMLParser/construct-map.data =================================================================== --- test/YAMLParser/construct-map.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Unordered set of key: value pairs. -Block style: !!map - Clark : Evans - Brian : Ingerson - Oren : Ben-Kiki -Flow style: !!map { Clark: Evans, Brian: Ingerson, Oren: Ben-Kiki } Index: test/YAMLParser/construct-map.test =================================================================== --- /dev/null +++ test/YAMLParser/construct-map.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +# Unordered set of key: value pairs. +Block style: !!map + Clark : Evans + Brian : Ingerson + Oren : Ben-Kiki +Flow style: !!map { Clark: Evans, Brian: Ingerson, Oren: Ben-Kiki } Index: test/YAMLParser/construct-merge.data =================================================================== --- test/YAMLParser/construct-merge.data +++ /dev/null @@ -1,29 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -- &CENTER { x: 1, 'y': 2 } -- &LEFT { x: 0, 'y': 2 } -- &BIG { r: 10 } -- &SMALL { r: 1 } - -# All the following maps are equal: - -- # Explicit keys - x: 1 - 'y': 2 - r: 10 - label: center/big - -- # Merge one map - << : *CENTER - r: 10 - label: center/big - -- # Merge multiple maps - << : [ *CENTER, *BIG ] - label: center/big - -- # Override - << : [ *BIG, *LEFT, *SMALL ] - x: 1 - label: center/big Index: test/YAMLParser/construct-merge.test =================================================================== --- /dev/null +++ test/YAMLParser/construct-merge.test @@ -0,0 +1,29 @@ +# RUN: yaml-bench -canonical %s + +--- +- &CENTER { x: 1, 'y': 2 } +- &LEFT { x: 0, 'y': 2 } +- &BIG { r: 10 } +- &SMALL { r: 1 } + +# All the following maps are equal: + +- # Explicit keys + x: 1 + 'y': 2 + r: 10 + label: center/big + +- # Merge one map + << : *CENTER + r: 10 + label: center/big + +- # Merge multiple maps + << : [ *CENTER, *BIG ] + label: center/big + +- # Override + << : [ *BIG, *LEFT, *SMALL ] + x: 1 + label: center/big Index: test/YAMLParser/construct-null.data =================================================================== --- test/YAMLParser/construct-null.data +++ /dev/null @@ -1,20 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# A document may be null. ---- ---- -# This mapping has four keys, -# one has a value. -empty: -canonical: ~ -english: null -~: null key ---- -# This sequence has five -# entries, two have values. -sparse: - - ~ - - 2nd entry - - - - 4th entry - - Null Index: test/YAMLParser/construct-null.test =================================================================== --- /dev/null +++ test/YAMLParser/construct-null.test @@ -0,0 +1,20 @@ +# RUN: yaml-bench -canonical %s + +# A document may be null. +--- +--- +# This mapping has four keys, +# one has a value. +empty: +canonical: ~ +english: null +~: null key +--- +# This sequence has five +# entries, two have values. +sparse: + - ~ + - 2nd entry + - + - 4th entry + - Null Index: test/YAMLParser/construct-omap.data =================================================================== --- test/YAMLParser/construct-omap.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Explicitly typed ordered map (dictionary). -Bestiary: !!omap - - aardvark: African pig-like ant eater. Ugly. - - anteater: South-American ant eater. Two species. - - anaconda: South-American constrictor snake. Scaly. - # Etc. -# Flow style -Numbers: !!omap [ one: 1, two: 2, three : 3 ] Index: test/YAMLParser/construct-omap.test =================================================================== --- /dev/null +++ test/YAMLParser/construct-omap.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +# Explicitly typed ordered map (dictionary). +Bestiary: !!omap + - aardvark: African pig-like ant eater. Ugly. + - anteater: South-American ant eater. Two species. + - anaconda: South-American constrictor snake. Scaly. + # Etc. +# Flow style +Numbers: !!omap [ one: 1, two: 2, three : 3 ] Index: test/YAMLParser/construct-pairs.data =================================================================== --- test/YAMLParser/construct-pairs.data +++ /dev/null @@ -1,9 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Explicitly typed pairs. -Block tasks: !!pairs - - meeting: with team. - - meeting: with boss. - - break: lunch. - - meeting: with client. -Flow tasks: !!pairs [ meeting: with team, meeting: with boss ] Index: test/YAMLParser/construct-pairs.test =================================================================== --- /dev/null +++ test/YAMLParser/construct-pairs.test @@ -0,0 +1,9 @@ +# RUN: yaml-bench -canonical %s + +# Explicitly typed pairs. +Block tasks: !!pairs + - meeting: with team. + - meeting: with boss. + - break: lunch. + - meeting: with client. +Flow tasks: !!pairs [ meeting: with team, meeting: with boss ] Index: test/YAMLParser/construct-seq.data =================================================================== --- test/YAMLParser/construct-seq.data +++ /dev/null @@ -1,17 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Ordered sequence of nodes -Block style: !!seq -- Mercury # Rotates - no light/dark sides. -- Venus # Deadliest. Aptly named. -- Earth # Mostly dirt. -- Mars # Seems empty. -- Jupiter # The king. -- Saturn # Pretty. -- Uranus # Where the sun hardly shines. -- Neptune # Boring. No rings. -- Pluto # You call this a planet? -Flow style: !!seq [ Mercury, Venus, Earth, Mars, # Rocks - Jupiter, Saturn, Uranus, Neptune, # Gas - Pluto ] # Overrated - Index: test/YAMLParser/construct-seq.test =================================================================== --- /dev/null +++ test/YAMLParser/construct-seq.test @@ -0,0 +1,17 @@ +# RUN: yaml-bench -canonical %s + +# Ordered sequence of nodes +Block style: !!seq +- Mercury # Rotates - no light/dark sides. +- Venus # Deadliest. Aptly named. +- Earth # Mostly dirt. +- Mars # Seems empty. +- Jupiter # The king. +- Saturn # Pretty. +- Uranus # Where the sun hardly shines. +- Neptune # Boring. No rings. +- Pluto # You call this a planet? +Flow style: !!seq [ Mercury, Venus, Earth, Mars, # Rocks + Jupiter, Saturn, Uranus, Neptune, # Gas + Pluto ] # Overrated + Index: test/YAMLParser/construct-set.data =================================================================== --- test/YAMLParser/construct-set.data +++ /dev/null @@ -1,9 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Explicitly typed set. -baseball players: !!set - ? Mark McGwire - ? Sammy Sosa - ? Ken Griffey -# Flow style -baseball teams: !!set { Boston Red Sox, Detroit Tigers, New York Yankees } Index: test/YAMLParser/construct-set.test =================================================================== --- /dev/null +++ test/YAMLParser/construct-set.test @@ -0,0 +1,9 @@ +# RUN: yaml-bench -canonical %s + +# Explicitly typed set. +baseball players: !!set + ? Mark McGwire + ? Sammy Sosa + ? Ken Griffey +# Flow style +baseball teams: !!set { Boston Red Sox, Detroit Tigers, New York Yankees } Index: test/YAMLParser/construct-str-ascii.data =================================================================== --- test/YAMLParser/construct-str-ascii.data +++ /dev/null @@ -1,3 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- !!str "ascii string" Index: test/YAMLParser/construct-str-ascii.test =================================================================== --- /dev/null +++ test/YAMLParser/construct-str-ascii.test @@ -0,0 +1,3 @@ +# RUN: yaml-bench -canonical %s + +--- !!str "ascii string" Index: test/YAMLParser/construct-str.data =================================================================== --- test/YAMLParser/construct-str.data +++ /dev/null @@ -1,3 +0,0 @@ -# RUN: yaml-bench -canonical %s - -string: abcd Index: test/YAMLParser/construct-str.test =================================================================== --- /dev/null +++ test/YAMLParser/construct-str.test @@ -0,0 +1,3 @@ +# RUN: yaml-bench -canonical %s + +string: abcd Index: test/YAMLParser/construct-timestamp.data =================================================================== --- test/YAMLParser/construct-timestamp.data +++ /dev/null @@ -1,7 +0,0 @@ -# RUN: yaml-bench -canonical %s - -canonical: 2001-12-15T02:59:43.1Z -valid iso8601: 2001-12-14t21:59:43.10-05:00 -space separated: 2001-12-14 21:59:43.10 -5 -no time zone (Z): 2001-12-15 2:59:43.10 -date (00:00:00Z): 2002-12-14 Index: test/YAMLParser/construct-timestamp.test =================================================================== --- /dev/null +++ test/YAMLParser/construct-timestamp.test @@ -0,0 +1,7 @@ +# RUN: yaml-bench -canonical %s + +canonical: 2001-12-15T02:59:43.1Z +valid iso8601: 2001-12-14t21:59:43.10-05:00 +space separated: 2001-12-14 21:59:43.10 -5 +no time zone (Z): 2001-12-15 2:59:43.10 +date (00:00:00Z): 2002-12-14 Index: test/YAMLParser/construct-value.data =================================================================== --- test/YAMLParser/construct-value.data +++ /dev/null @@ -1,12 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- # Old schema -link with: - - library1.dll - - library2.dll ---- # New schema -link with: - - = : library1.dll - version: 1.2 - - = : library2.dll - version: 2.3 Index: test/YAMLParser/construct-value.test =================================================================== --- /dev/null +++ test/YAMLParser/construct-value.test @@ -0,0 +1,12 @@ +# RUN: yaml-bench -canonical %s + +--- # Old schema +link with: + - library1.dll + - library2.dll +--- # New schema +link with: + - = : library1.dll + version: 1.2 + - = : library2.dll + version: 2.3 Index: test/YAMLParser/duplicate-key.former-loader-error.data =================================================================== --- test/YAMLParser/duplicate-key.former-loader-error.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -foo: bar -foo: baz Index: test/YAMLParser/duplicate-key.former-loader-error.test =================================================================== --- /dev/null +++ test/YAMLParser/duplicate-key.former-loader-error.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + +--- +foo: bar +foo: baz Index: test/YAMLParser/duplicate-mapping-key.former-loader-error.data =================================================================== --- test/YAMLParser/duplicate-mapping-key.former-loader-error.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -&anchor foo: - foo: bar - *anchor: duplicate key - baz: bat - *anchor: duplicate key Index: test/YAMLParser/duplicate-mapping-key.former-loader-error.test =================================================================== --- /dev/null +++ test/YAMLParser/duplicate-mapping-key.former-loader-error.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +--- +&anchor foo: + foo: bar + *anchor: duplicate key + baz: bat + *anchor: duplicate key Index: test/YAMLParser/duplicate-merge-key.former-loader-error.data =================================================================== --- test/YAMLParser/duplicate-merge-key.former-loader-error.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -<<: {x: 1, y: 2} -foo: bar -<<: {z: 3, t: 4} Index: test/YAMLParser/duplicate-merge-key.former-loader-error.test =================================================================== --- /dev/null +++ test/YAMLParser/duplicate-merge-key.former-loader-error.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +--- +<<: {x: 1, y: 2} +foo: bar +<<: {z: 3, t: 4} Index: test/YAMLParser/duplicate-value-key.former-loader-error.data =================================================================== --- test/YAMLParser/duplicate-value-key.former-loader-error.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -=: 1 -foo: bar -=: 2 Index: test/YAMLParser/duplicate-value-key.former-loader-error.test =================================================================== --- /dev/null +++ test/YAMLParser/duplicate-value-key.former-loader-error.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +--- +=: 1 +foo: bar +=: 2 Index: test/YAMLParser/emit-block-scalar-in-simple-key-context-bug.data =================================================================== --- test/YAMLParser/emit-block-scalar-in-simple-key-context-bug.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -? |- - foo -: |- - bar Index: test/YAMLParser/emit-block-scalar-in-simple-key-context-bug.test =================================================================== --- /dev/null +++ test/YAMLParser/emit-block-scalar-in-simple-key-context-bug.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +? |- + foo +: |- + bar Index: test/YAMLParser/empty-document-bug.data =================================================================== --- test/YAMLParser/empty-document-bug.data +++ /dev/null @@ -1,2 +0,0 @@ -# RUN: yaml-bench -canonical %s - Index: test/YAMLParser/empty-document-bug.test =================================================================== --- /dev/null +++ test/YAMLParser/empty-document-bug.test @@ -0,0 +1,2 @@ +# RUN: yaml-bench -canonical %s + Index: test/YAMLParser/float.data =================================================================== --- test/YAMLParser/float.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- 6.8523015e+5 -- 685.230_15e+03 -- 685_230.15 -- 190:20:30.15 -- -.inf -- .NaN Index: test/YAMLParser/float.test =================================================================== --- /dev/null +++ test/YAMLParser/float.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +- 6.8523015e+5 +- 685.230_15e+03 +- 685_230.15 +- 190:20:30.15 +- -.inf +- .NaN Index: test/YAMLParser/int.data =================================================================== --- test/YAMLParser/int.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- 685230 -- +685_230 -- 02472256 -- 0x_0A_74_AE -- 0b1010_0111_0100_1010_1110 -- 190:20:30 Index: test/YAMLParser/int.test =================================================================== --- /dev/null +++ test/YAMLParser/int.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +- 685230 +- +685_230 +- 02472256 +- 0x_0A_74_AE +- 0b1010_0111_0100_1010_1110 +- 190:20:30 Index: test/YAMLParser/invalid-single-quote-bug.data =================================================================== --- test/YAMLParser/invalid-single-quote-bug.data +++ /dev/null @@ -1,4 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- "foo 'bar'" -- "foo\n'bar'" Index: test/YAMLParser/invalid-single-quote-bug.test =================================================================== --- /dev/null +++ test/YAMLParser/invalid-single-quote-bug.test @@ -0,0 +1,4 @@ +# RUN: yaml-bench -canonical %s + +- "foo 'bar'" +- "foo\n'bar'" Index: test/YAMLParser/merge.data =================================================================== --- test/YAMLParser/merge.data +++ /dev/null @@ -1,3 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- << Index: test/YAMLParser/merge.test =================================================================== --- /dev/null +++ test/YAMLParser/merge.test @@ -0,0 +1,3 @@ +# RUN: yaml-bench -canonical %s + +- << Index: test/YAMLParser/more-floats.data =================================================================== --- test/YAMLParser/more-floats.data +++ /dev/null @@ -1,3 +0,0 @@ -# RUN: yaml-bench -canonical %s - -[0.0, +1.0, -1.0, +.inf, -.inf, .nan, .nan] Index: test/YAMLParser/more-floats.test =================================================================== --- /dev/null +++ test/YAMLParser/more-floats.test @@ -0,0 +1,3 @@ +# RUN: yaml-bench -canonical %s + +[0.0, +1.0, -1.0, +.inf, -.inf, .nan, .nan] Index: test/YAMLParser/negative-float-bug.data =================================================================== --- test/YAMLParser/negative-float-bug.data +++ /dev/null @@ -1,3 +0,0 @@ -# RUN: yaml-bench -canonical %s - --1.0 Index: test/YAMLParser/negative-float-bug.test =================================================================== --- /dev/null +++ test/YAMLParser/negative-float-bug.test @@ -0,0 +1,3 @@ +# RUN: yaml-bench -canonical %s + +-1.0 Index: test/YAMLParser/null.data =================================================================== --- test/YAMLParser/null.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- -- ~ -- null Index: test/YAMLParser/null.test =================================================================== --- /dev/null +++ test/YAMLParser/null.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + +- +- ~ +- null Index: test/YAMLParser/resolver.data =================================================================== --- test/YAMLParser/resolver.data +++ /dev/null @@ -1,32 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -"this scalar should be selected" ---- -key11: !foo - key12: - is: [selected] - key22: - key13: [not, selected] - key23: [not, selected] - key32: - key31: [not, selected] - key32: [not, selected] - key33: {not: selected} -key21: !bar - - not selected - - selected - - not selected -key31: !baz - key12: - key13: - key14: {selected} - key23: - key14: [not, selected] - key33: - key14: {selected} - key24: {not: selected} - key22: - - key14: {selected} - key24: {not: selected} - - key14: {selected} Index: test/YAMLParser/resolver.test =================================================================== --- /dev/null +++ test/YAMLParser/resolver.test @@ -0,0 +1,32 @@ +# RUN: yaml-bench -canonical %s + +--- +"this scalar should be selected" +--- +key11: !foo + key12: + is: [selected] + key22: + key13: [not, selected] + key23: [not, selected] + key32: + key31: [not, selected] + key32: [not, selected] + key33: {not: selected} +key21: !bar + - not selected + - selected + - not selected +key31: !baz + key12: + key13: + key14: {selected} + key23: + key14: [not, selected] + key33: + key14: {selected} + key24: {not: selected} + key22: + - key14: {selected} + key24: {not: selected} + - key14: {selected} Index: test/YAMLParser/run-parser-crash-bug.data =================================================================== --- test/YAMLParser/run-parser-crash-bug.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -- Harry Potter and the Prisoner of Azkaban -- Harry Potter and the Goblet of Fire -- Harry Potter and the Order of the Phoenix ---- -- Memoirs Found in a Bathtub -- Snow Crash -- Ghost World Index: test/YAMLParser/run-parser-crash-bug.test =================================================================== --- /dev/null +++ test/YAMLParser/run-parser-crash-bug.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +--- +- Harry Potter and the Prisoner of Azkaban +- Harry Potter and the Goblet of Fire +- Harry Potter and the Order of the Phoenix +--- +- Memoirs Found in a Bathtub +- Snow Crash +- Ghost World Index: test/YAMLParser/scan-document-end-bug.data =================================================================== --- test/YAMLParser/scan-document-end-bug.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Ticket #4 ---- -... Index: test/YAMLParser/scan-document-end-bug.test =================================================================== --- /dev/null +++ test/YAMLParser/scan-document-end-bug.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + +# Ticket #4 +--- +... Index: test/YAMLParser/scan-line-break-bug.data =================================================================== --- test/YAMLParser/scan-line-break-bug.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - -foo: - bar - baz Index: test/YAMLParser/scan-line-break-bug.test =================================================================== --- /dev/null +++ test/YAMLParser/scan-line-break-bug.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + +foo: + bar + baz Index: test/YAMLParser/single-dot-is-not-float-bug.data =================================================================== --- test/YAMLParser/single-dot-is-not-float-bug.data +++ /dev/null @@ -1,3 +0,0 @@ -# RUN: yaml-bench -canonical %s - -. Index: test/YAMLParser/single-dot-is-not-float-bug.test =================================================================== --- /dev/null +++ test/YAMLParser/single-dot-is-not-float-bug.test @@ -0,0 +1,3 @@ +# RUN: yaml-bench -canonical %s + +. Index: test/YAMLParser/sloppy-indentation.data =================================================================== --- test/YAMLParser/sloppy-indentation.data +++ /dev/null @@ -1,19 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -in the block context: - indentation should be kept: { - but in the flow context: [ -it may be violated] -} ---- -the parser does not require scalars -to be indented with at least one space -... ---- -"the parser does not require scalars -to be indented with at least one space" ---- -foo: - bar: 'quoted scalars -may not adhere indentation' Index: test/YAMLParser/sloppy-indentation.test =================================================================== --- /dev/null +++ test/YAMLParser/sloppy-indentation.test @@ -0,0 +1,19 @@ +# RUN: yaml-bench -canonical %s + +--- +in the block context: + indentation should be kept: { + but in the flow context: [ +it may be violated] +} +--- +the parser does not require scalars +to be indented with at least one space +... +--- +"the parser does not require scalars +to be indented with at least one space" +--- +foo: + bar: 'quoted scalars +may not adhere indentation' Index: test/YAMLParser/spec-02-01.data =================================================================== --- test/YAMLParser/spec-02-01.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- Mark McGwire -- Sammy Sosa -- Ken Griffey Index: test/YAMLParser/spec-02-01.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-01.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + +- Mark McGwire +- Sammy Sosa +- Ken Griffey Index: test/YAMLParser/spec-02-02.data =================================================================== --- test/YAMLParser/spec-02-02.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - -hr: 65 # Home runs -avg: 0.278 # Batting average -rbi: 147 # Runs Batted In Index: test/YAMLParser/spec-02-02.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-02.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + +hr: 65 # Home runs +avg: 0.278 # Batting average +rbi: 147 # Runs Batted In Index: test/YAMLParser/spec-02-03.data =================================================================== --- test/YAMLParser/spec-02-03.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - -american: - - Boston Red Sox - - Detroit Tigers - - New York Yankees -national: - - New York Mets - - Chicago Cubs - - Atlanta Braves Index: test/YAMLParser/spec-02-03.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-03.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +american: + - Boston Red Sox + - Detroit Tigers + - New York Yankees +national: + - New York Mets + - Chicago Cubs + - Atlanta Braves Index: test/YAMLParser/spec-02-04.data =================================================================== --- test/YAMLParser/spec-02-04.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- - name: Mark McGwire - hr: 65 - avg: 0.278 -- - name: Sammy Sosa - hr: 63 - avg: 0.288 Index: test/YAMLParser/spec-02-04.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-04.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +- + name: Mark McGwire + hr: 65 + avg: 0.278 +- + name: Sammy Sosa + hr: 63 + avg: 0.288 Index: test/YAMLParser/spec-02-05.data =================================================================== --- test/YAMLParser/spec-02-05.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- [name , hr, avg ] -- [Mark McGwire, 65, 0.278] -- [Sammy Sosa , 63, 0.288] Index: test/YAMLParser/spec-02-05.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-05.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + +- [name , hr, avg ] +- [Mark McGwire, 65, 0.278] +- [Sammy Sosa , 63, 0.288] Index: test/YAMLParser/spec-02-06.data =================================================================== --- test/YAMLParser/spec-02-06.data +++ /dev/null @@ -1,7 +0,0 @@ -# RUN: yaml-bench -canonical %s - -Mark McGwire: {hr: 65, avg: 0.278} -Sammy Sosa: { - hr: 63, - avg: 0.288 - } Index: test/YAMLParser/spec-02-06.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-06.test @@ -0,0 +1,7 @@ +# RUN: yaml-bench -canonical %s + +Mark McGwire: {hr: 65, avg: 0.278} +Sammy Sosa: { + hr: 63, + avg: 0.288 + } Index: test/YAMLParser/spec-02-07.data =================================================================== --- test/YAMLParser/spec-02-07.data +++ /dev/null @@ -1,12 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Ranking of 1998 home runs ---- -- Mark McGwire -- Sammy Sosa -- Ken Griffey - -# Team ranking ---- -- Chicago Cubs -- St Louis Cardinals Index: test/YAMLParser/spec-02-07.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-07.test @@ -0,0 +1,12 @@ +# RUN: yaml-bench -canonical %s + +# Ranking of 1998 home runs +--- +- Mark McGwire +- Sammy Sosa +- Ken Griffey + +# Team ranking +--- +- Chicago Cubs +- St Louis Cardinals Index: test/YAMLParser/spec-02-08.data =================================================================== --- test/YAMLParser/spec-02-08.data +++ /dev/null @@ -1,12 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -time: 20:03:20 -player: Sammy Sosa -action: strike (miss) -... ---- -time: 20:03:47 -player: Sammy Sosa -action: grand slam -... Index: test/YAMLParser/spec-02-08.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-08.test @@ -0,0 +1,12 @@ +# RUN: yaml-bench -canonical %s + +--- +time: 20:03:20 +player: Sammy Sosa +action: strike (miss) +... +--- +time: 20:03:47 +player: Sammy Sosa +action: grand slam +... Index: test/YAMLParser/spec-02-09.data =================================================================== --- test/YAMLParser/spec-02-09.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -hr: # 1998 hr ranking - - Mark McGwire - - Sammy Sosa -rbi: - # 1998 rbi ranking - - Sammy Sosa - - Ken Griffey Index: test/YAMLParser/spec-02-09.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-09.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +--- +hr: # 1998 hr ranking + - Mark McGwire + - Sammy Sosa +rbi: + # 1998 rbi ranking + - Sammy Sosa + - Ken Griffey Index: test/YAMLParser/spec-02-10.data =================================================================== --- test/YAMLParser/spec-02-10.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -hr: - - Mark McGwire - # Following node labeled SS - - &SS Sammy Sosa -rbi: - - *SS # Subsequent occurrence - - Ken Griffey Index: test/YAMLParser/spec-02-10.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-10.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +--- +hr: + - Mark McGwire + # Following node labeled SS + - &SS Sammy Sosa +rbi: + - *SS # Subsequent occurrence + - Ken Griffey Index: test/YAMLParser/spec-02-11.data =================================================================== --- test/YAMLParser/spec-02-11.data +++ /dev/null @@ -1,11 +0,0 @@ -# RUN: yaml-bench -canonical %s - -? - Detroit Tigers - - Chicago cubs -: - - 2001-07-23 - -? [ New York Yankees, - Atlanta Braves ] -: [ 2001-07-02, 2001-08-12, - 2001-08-14 ] Index: test/YAMLParser/spec-02-11.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-11.test @@ -0,0 +1,11 @@ +# RUN: yaml-bench -canonical %s + +? - Detroit Tigers + - Chicago cubs +: + - 2001-07-23 + +? [ New York Yankees, + Atlanta Braves ] +: [ 2001-07-02, 2001-08-12, + 2001-08-14 ] Index: test/YAMLParser/spec-02-12.data =================================================================== --- test/YAMLParser/spec-02-12.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -# products purchased -- item : Super Hoop - quantity: 1 -- item : Basketball - quantity: 4 -- item : Big Shoes - quantity: 1 Index: test/YAMLParser/spec-02-12.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-12.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +--- +# products purchased +- item : Super Hoop + quantity: 1 +- item : Basketball + quantity: 4 +- item : Big Shoes + quantity: 1 Index: test/YAMLParser/spec-02-13.data =================================================================== --- test/YAMLParser/spec-02-13.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# ASCII Art ---- | - \//||\/|| - // || ||__ Index: test/YAMLParser/spec-02-13.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-13.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +# ASCII Art +--- | + \//||\/|| + // || ||__ Index: test/YAMLParser/spec-02-14.data =================================================================== --- test/YAMLParser/spec-02-14.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- - Mark McGwire's - year was crippled - by a knee injury. Index: test/YAMLParser/spec-02-14.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-14.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +--- + Mark McGwire's + year was crippled + by a knee injury. Index: test/YAMLParser/spec-02-15.data =================================================================== --- test/YAMLParser/spec-02-15.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - -> - Sammy Sosa completed another - fine season with great stats. - - 63 Home Runs - 0.288 Batting Average - - What a year! Index: test/YAMLParser/spec-02-15.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-15.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +> + Sammy Sosa completed another + fine season with great stats. + + 63 Home Runs + 0.288 Batting Average + + What a year! Index: test/YAMLParser/spec-02-16.data =================================================================== --- test/YAMLParser/spec-02-16.data +++ /dev/null @@ -1,9 +0,0 @@ -# RUN: yaml-bench -canonical %s - -name: Mark McGwire -accomplishment: > - Mark set a major league - home run record in 1998. -stats: | - 65 Home Runs - 0.278 Batting Average Index: test/YAMLParser/spec-02-16.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-16.test @@ -0,0 +1,9 @@ +# RUN: yaml-bench -canonical %s + +name: Mark McGwire +accomplishment: > + Mark set a major league + home run record in 1998. +stats: | + 65 Home Runs + 0.278 Batting Average Index: test/YAMLParser/spec-02-17.data =================================================================== --- test/YAMLParser/spec-02-17.data +++ /dev/null @@ -1,16 +0,0 @@ -# RUN: yaml-bench -canonical %s - -unicode: "Sosa did fine.\u263A" -control: "\b1998\t1999\t2000\n" -hexesc: "\x13\x10 is \r\n" - -single: '"Howdy!" he cried.' -quoted: ' # not a ''comment''.' -tie-fighter: '|\-*-/|' - -# CHECK: !!str "Sosa did fine.\u263A" -# CHECK: !!str "\b1998\t1999\t2000\n" -# CHECK: !!str "\x13\x10 is \r\n" -# CHECK: !!str "\"Howdy!\" he cried." -# CHECK: !!str " # not a 'comment'." -# CHECK: !!str "|\\-*-/|" Index: test/YAMLParser/spec-02-17.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-17.test @@ -0,0 +1,16 @@ +# RUN: yaml-bench -canonical %s + +unicode: "Sosa did fine.\u263A" +control: "\b1998\t1999\t2000\n" +hexesc: "\x13\x10 is \r\n" + +single: '"Howdy!" he cried.' +quoted: ' # not a ''comment''.' +tie-fighter: '|\-*-/|' + +# CHECK: !!str "Sosa did fine.\u263A" +# CHECK: !!str "\b1998\t1999\t2000\n" +# CHECK: !!str "\x13\x10 is \r\n" +# CHECK: !!str "\"Howdy!\" he cried." +# CHECK: !!str " # not a 'comment'." +# CHECK: !!str "|\\-*-/|" Index: test/YAMLParser/spec-02-18.data =================================================================== --- test/YAMLParser/spec-02-18.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - -plain: - This unquoted scalar - spans many lines. - -quoted: "So does this - quoted scalar.\n" Index: test/YAMLParser/spec-02-18.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-18.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +plain: + This unquoted scalar + spans many lines. + +quoted: "So does this + quoted scalar.\n" Index: test/YAMLParser/spec-02-19.data =================================================================== --- test/YAMLParser/spec-02-19.data +++ /dev/null @@ -1,7 +0,0 @@ -# RUN: yaml-bench -canonical %s - -canonical: 12345 -decimal: +12,345 -sexagesimal: 3:25:45 -octal: 014 -hexadecimal: 0xC Index: test/YAMLParser/spec-02-19.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-19.test @@ -0,0 +1,7 @@ +# RUN: yaml-bench -canonical %s + +canonical: 12345 +decimal: +12,345 +sexagesimal: 3:25:45 +octal: 014 +hexadecimal: 0xC Index: test/YAMLParser/spec-02-20.data =================================================================== --- test/YAMLParser/spec-02-20.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - -canonical: 1.23015e+3 -exponential: 12.3015e+02 -sexagesimal: 20:30.15 -fixed: 1,230.15 -negative infinity: -.inf -not a number: .NaN Index: test/YAMLParser/spec-02-20.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-20.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +canonical: 1.23015e+3 +exponential: 12.3015e+02 +sexagesimal: 20:30.15 +fixed: 1,230.15 +negative infinity: -.inf +not a number: .NaN Index: test/YAMLParser/spec-02-21.data =================================================================== --- test/YAMLParser/spec-02-21.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -null: ~ -true: y -false: n -string: '12345' Index: test/YAMLParser/spec-02-21.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-21.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +null: ~ +true: y +false: n +string: '12345' Index: test/YAMLParser/spec-02-22.data =================================================================== --- test/YAMLParser/spec-02-22.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -canonical: 2001-12-15T02:59:43.1Z -iso8601: 2001-12-14t21:59:43.10-05:00 -spaced: 2001-12-14 21:59:43.10 -5 -date: 2002-12-14 Index: test/YAMLParser/spec-02-22.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-22.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +canonical: 2001-12-15T02:59:43.1Z +iso8601: 2001-12-14t21:59:43.10-05:00 +spaced: 2001-12-14 21:59:43.10 -5 +date: 2002-12-14 Index: test/YAMLParser/spec-02-23.data =================================================================== --- test/YAMLParser/spec-02-23.data +++ /dev/null @@ -1,15 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -not-date: !!str 2002-04-28 - -picture: !!binary | - R0lGODlhDAAMAIQAAP//9/X - 17unp5WZmZgAAAOfn515eXv - Pz7Y6OjuDg4J+fn5OTk6enp - 56enmleECcgggoBADs= - -application specific tag: !something | - The semantics of the tag - above may be different for - different documents. Index: test/YAMLParser/spec-02-23.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-23.test @@ -0,0 +1,15 @@ +# RUN: yaml-bench -canonical %s + +--- +not-date: !!str 2002-04-28 + +picture: !!binary | + R0lGODlhDAAMAIQAAP//9/X + 17unp5WZmZgAAAOfn515eXv + Pz7Y6OjuDg4J+fn5OTk6enp + 56enmleECcgggoBADs= + +application specific tag: !something | + The semantics of the tag + above may be different for + different documents. Index: test/YAMLParser/spec-02-24.data =================================================================== --- test/YAMLParser/spec-02-24.data +++ /dev/null @@ -1,21 +0,0 @@ -# RUN: yaml-bench -canonical %s | FileCheck %s - -%TAG ! tag:clarkevans.com,2002: ---- !shape - # Use the ! handle for presenting - # tag:clarkevans.com,2002:circle -- !circle - center: &ORIGIN {x: 73, y: 129} - radius: 7 -- !line - start: *ORIGIN - finish: { x: 89, y: 102 } -- !label - start: *ORIGIN - color: 0xFFEEBB - text: Pretty vector drawing. - -#CHECK: ! -#CHECK: ! -#CHECK: ! -#CHECK: ! Index: test/YAMLParser/spec-02-24.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-24.test @@ -0,0 +1,21 @@ +# RUN: yaml-bench -canonical %s | FileCheck %s + +%TAG ! tag:clarkevans.com,2002: +--- !shape + # Use the ! handle for presenting + # tag:clarkevans.com,2002:circle +- !circle + center: &ORIGIN {x: 73, y: 129} + radius: 7 +- !line + start: *ORIGIN + finish: { x: 89, y: 102 } +- !label + start: *ORIGIN + color: 0xFFEEBB + text: Pretty vector drawing. + +#CHECK: ! +#CHECK: ! +#CHECK: ! +#CHECK: ! Index: test/YAMLParser/spec-02-25.data =================================================================== --- test/YAMLParser/spec-02-25.data +++ /dev/null @@ -1,9 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# sets are represented as a -# mapping where each key is -# associated with the empty string ---- !!set -? Mark McGwire -? Sammy Sosa -? Ken Griff Index: test/YAMLParser/spec-02-25.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-25.test @@ -0,0 +1,9 @@ +# RUN: yaml-bench -canonical %s + +# sets are represented as a +# mapping where each key is +# associated with the empty string +--- !!set +? Mark McGwire +? Sammy Sosa +? Ken Griff Index: test/YAMLParser/spec-02-26.data =================================================================== --- test/YAMLParser/spec-02-26.data +++ /dev/null @@ -1,9 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# ordered maps are represented as -# a sequence of mappings, with -# each mapping having one key ---- !!omap -- Mark McGwire: 65 -- Sammy Sosa: 63 -- Ken Griffy: 58 Index: test/YAMLParser/spec-02-26.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-26.test @@ -0,0 +1,9 @@ +# RUN: yaml-bench -canonical %s + +# ordered maps are represented as +# a sequence of mappings, with +# each mapping having one key +--- !!omap +- Mark McGwire: 65 +- Sammy Sosa: 63 +- Ken Griffy: 58 Index: test/YAMLParser/spec-02-27.data =================================================================== --- test/YAMLParser/spec-02-27.data +++ /dev/null @@ -1,31 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- ! -invoice: 34843 -date : 2001-01-23 -bill-to: &id001 - given : Chris - family : Dumars - address: - lines: | - 458 Walkman Dr. - Suite #292 - city : Royal Oak - state : MI - postal : 48046 -ship-to: *id001 -product: - - sku : BL394D - quantity : 4 - description : Basketball - price : 450.00 - - sku : BL4438H - quantity : 1 - description : Super Hoop - price : 2392.00 -tax : 251.42 -total: 4443.52 -comments: - Late afternoon is best. - Backup contact is Nancy - Billsmer @ 338-4338. Index: test/YAMLParser/spec-02-27.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-27.test @@ -0,0 +1,31 @@ +# RUN: yaml-bench -canonical %s + +--- ! +invoice: 34843 +date : 2001-01-23 +bill-to: &id001 + given : Chris + family : Dumars + address: + lines: | + 458 Walkman Dr. + Suite #292 + city : Royal Oak + state : MI + postal : 48046 +ship-to: *id001 +product: + - sku : BL394D + quantity : 4 + description : Basketball + price : 450.00 + - sku : BL4438H + quantity : 1 + description : Super Hoop + price : 2392.00 +tax : 251.42 +total: 4443.52 +comments: + Late afternoon is best. + Backup contact is Nancy + Billsmer @ 338-4338. Index: test/YAMLParser/spec-02-28.data =================================================================== --- test/YAMLParser/spec-02-28.data +++ /dev/null @@ -1,28 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -Time: 2001-11-23 15:01:42 -5 -User: ed -Warning: - This is an error message - for the log file ---- -Time: 2001-11-23 15:02:31 -5 -User: ed -Warning: - A slightly different error - message. ---- -Date: 2001-11-23 15:03:17 -5 -User: ed -Fatal: - Unknown variable "bar" -Stack: - - file: TopClass.py - line: 23 - code: | - x = MoreObject("345\n") - - file: MoreClass.py - line: 58 - code: |- - foo = bar Index: test/YAMLParser/spec-02-28.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-02-28.test @@ -0,0 +1,28 @@ +# RUN: yaml-bench -canonical %s + +--- +Time: 2001-11-23 15:01:42 -5 +User: ed +Warning: + This is an error message + for the log file +--- +Time: 2001-11-23 15:02:31 -5 +User: ed +Warning: + A slightly different error + message. +--- +Date: 2001-11-23 15:03:17 -5 +User: ed +Fatal: + Unknown variable "bar" +Stack: + - file: TopClass.py + line: 23 + code: | + x = MoreObject("345\n") + - file: MoreClass.py + line: 58 + code: |- + foo = bar Index: test/YAMLParser/spec-05-01-utf8.data =================================================================== --- test/YAMLParser/spec-05-01-utf8.data +++ /dev/null @@ -1,3 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Comment only. Index: test/YAMLParser/spec-05-01-utf8.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-05-01-utf8.test @@ -0,0 +1,3 @@ +# RUN: yaml-bench -canonical %s + +# Comment only. Index: test/YAMLParser/spec-05-02-utf8.data =================================================================== --- test/YAMLParser/spec-05-02-utf8.data +++ /dev/null @@ -1,7 +0,0 @@ -# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s - -# Invalid use of BOM -# inside a -# document. - -# CHECK: error Index: test/YAMLParser/spec-05-02-utf8.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-05-02-utf8.test @@ -0,0 +1,7 @@ +# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s + +# Invalid use of BOM +# inside a +# document. + +# CHECK: error Index: test/YAMLParser/spec-05-03.data =================================================================== --- test/YAMLParser/spec-05-03.data +++ /dev/null @@ -1,9 +0,0 @@ -# RUN: yaml-bench -canonical %s - -sequence: -- one -- two -mapping: - ? sky - : blue - ? sea : green Index: test/YAMLParser/spec-05-03.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-05-03.test @@ -0,0 +1,9 @@ +# RUN: yaml-bench -canonical %s + +sequence: +- one +- two +mapping: + ? sky + : blue + ? sea : green Index: test/YAMLParser/spec-05-04.data =================================================================== --- test/YAMLParser/spec-05-04.data +++ /dev/null @@ -1,4 +0,0 @@ -# RUN: yaml-bench -canonical %s - -sequence: [ one, two, ] -mapping: { sky: blue, sea: green } Index: test/YAMLParser/spec-05-04.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-05-04.test @@ -0,0 +1,4 @@ +# RUN: yaml-bench -canonical %s + +sequence: [ one, two, ] +mapping: { sky: blue, sea: green } Index: test/YAMLParser/spec-05-05.data =================================================================== --- test/YAMLParser/spec-05-05.data +++ /dev/null @@ -1,3 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Comment only. Index: test/YAMLParser/spec-05-05.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-05-05.test @@ -0,0 +1,3 @@ +# RUN: yaml-bench -canonical %s + +# Comment only. Index: test/YAMLParser/spec-05-06.data =================================================================== --- test/YAMLParser/spec-05-06.data +++ /dev/null @@ -1,4 +0,0 @@ -# RUN: yaml-bench -canonical %s - -anchored: !local &anchor value -alias: *anchor Index: test/YAMLParser/spec-05-06.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-05-06.test @@ -0,0 +1,4 @@ +# RUN: yaml-bench -canonical %s + +anchored: !local &anchor value +alias: *anchor Index: test/YAMLParser/spec-05-07.data =================================================================== --- test/YAMLParser/spec-05-07.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -literal: | - text -folded: > - text Index: test/YAMLParser/spec-05-07.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-05-07.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +literal: | + text +folded: > + text Index: test/YAMLParser/spec-05-08.data =================================================================== --- test/YAMLParser/spec-05-08.data +++ /dev/null @@ -1,4 +0,0 @@ -# RUN: yaml-bench -canonical %s - -single: 'text' -double: "text" Index: test/YAMLParser/spec-05-08.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-05-08.test @@ -0,0 +1,4 @@ +# RUN: yaml-bench -canonical %s + +single: 'text' +double: "text" Index: test/YAMLParser/spec-05-09.data =================================================================== --- test/YAMLParser/spec-05-09.data +++ /dev/null @@ -1,4 +0,0 @@ -# RUN: yaml-bench -canonical %s - -%YAML 1.1 ---- text Index: test/YAMLParser/spec-05-09.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-05-09.test @@ -0,0 +1,4 @@ +# RUN: yaml-bench -canonical %s + +%YAML 1.1 +--- text Index: test/YAMLParser/spec-05-10.data =================================================================== --- test/YAMLParser/spec-05-10.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s - -commercial-at: @text -grave-accent: `text - -# CHECK: error Index: test/YAMLParser/spec-05-10.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-05-10.test @@ -0,0 +1,6 @@ +# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s + +commercial-at: @text +grave-accent: `text + +# CHECK: error Index: test/YAMLParser/spec-05-11.data =================================================================== --- test/YAMLParser/spec-05-11.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - -| - Generic line break (no glyph) - Generic line break (glyphed)… Line separator
 Paragraph separator
 Index: test/YAMLParser/spec-05-11.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-05-11.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + +| + Generic line break (no glyph) + Generic line break (glyphed)… Line separator
 Paragraph separator
 Index: test/YAMLParser/spec-05-12.data =================================================================== --- test/YAMLParser/spec-05-12.data +++ /dev/null @@ -1,16 +0,0 @@ -# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s -# -# We don't currently reject tabs as indentation. -# XFAIL: * - -# Tabs do's and don'ts: -# comment: -quoted: "Quoted " -block: | - void main() { - printf("Hello, world!\n"); - } -elsewhere: # separation - indentation, in plain scalar - -# CHECK: error Index: test/YAMLParser/spec-05-12.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-05-12.test @@ -0,0 +1,17 @@ +# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s +# +# FIXME: This test should actually fail. +# We don't currently reject tabs as indentation. + +# Tabs do's and don'ts: +# comment: +quoted: "Quoted " +block: | + void main() { + printf("Hello, world!\n"); + } +elsewhere: # separation + indentation, in plain scalar + + +# CHECK: !!str "Quoted\t\t" Index: test/YAMLParser/spec-05-13.data =================================================================== --- test/YAMLParser/spec-05-13.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - - "Text containing - both space and - tab characters" Index: test/YAMLParser/spec-05-13.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-05-13.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + + "Text containing + both space and + tab characters" Index: test/YAMLParser/spec-05-14.data =================================================================== --- test/YAMLParser/spec-05-14.data +++ /dev/null @@ -1,9 +0,0 @@ -# RUN: yaml-bench -canonical %s - -"Fun with \\ -\" \a \b \e \f \ -\n \r \t \v \0 \ -\ \_ \N \L \P \ -\x41 \u0041 \U00000041" - -# CHECK: !!str "Fun with \\\n\" \a \b \e \f \n \r \t \v \0 \_ \N \L \P A A A" Index: test/YAMLParser/spec-05-14.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-05-14.test @@ -0,0 +1,9 @@ +# RUN: yaml-bench -canonical %s + +"Fun with \\ +\" \a \b \e \f \ +\n \r \t \v \0 \ +\ \_ \N \L \P \ +\x41 \u0041 \U00000041" + +# CHECK: !!str "Fun with \\\n\" \a \b \e \f \n \r \t \v \0 \_ \N \L \P A A A" Index: test/YAMLParser/spec-05-15.data =================================================================== --- test/YAMLParser/spec-05-15.data +++ /dev/null @@ -1,7 +0,0 @@ -# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s - -Bad escapes: - "\c - \xq-" - -# CHECK: error Index: test/YAMLParser/spec-05-15.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-05-15.test @@ -0,0 +1,7 @@ +# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s + +Bad escapes: + "\c + \xq-" + +# CHECK: error Index: test/YAMLParser/spec-06-01.data =================================================================== --- test/YAMLParser/spec-06-01.data +++ /dev/null @@ -1,16 +0,0 @@ -# RUN: yaml-bench -canonical %s - - # Leading comment line spaces are - # neither content nor indentation. - -Not indented: - By one space: | - By four - spaces - Flow style: [ # Leading spaces - By two, # in flow style - Also by two, # are neither -# Tabs are not allowed: -# Still by two # content nor - Still by two # content nor - ] # indentation. Index: test/YAMLParser/spec-06-01.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-06-01.test @@ -0,0 +1,16 @@ +# RUN: yaml-bench -canonical %s + + # Leading comment line spaces are + # neither content nor indentation. + +Not indented: + By one space: | + By four + spaces + Flow style: [ # Leading spaces + By two, # in flow style + Also by two, # are neither +# Tabs are not allowed: +# Still by two # content nor + Still by two # content nor + ] # indentation. Index: test/YAMLParser/spec-06-02.data =================================================================== --- test/YAMLParser/spec-06-02.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - - # Comment - - Index: test/YAMLParser/spec-06-02.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-06-02.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + + # Comment + + Index: test/YAMLParser/spec-06-03.data =================================================================== --- test/YAMLParser/spec-06-03.data +++ /dev/null @@ -1,4 +0,0 @@ -# RUN: yaml-bench -canonical %s - -key: # Comment - value Index: test/YAMLParser/spec-06-03.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-06-03.test @@ -0,0 +1,4 @@ +# RUN: yaml-bench -canonical %s + +key: # Comment + value Index: test/YAMLParser/spec-06-04.data =================================================================== --- test/YAMLParser/spec-06-04.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -key: # Comment - # lines - value - Index: test/YAMLParser/spec-06-04.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-06-04.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +key: # Comment + # lines + value + Index: test/YAMLParser/spec-06-05.data =================================================================== --- test/YAMLParser/spec-06-05.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - -{ first: Sammy, last: Sosa }: -# Statistics: - hr: # Home runs - 65 - avg: # Average - 0.278 Index: test/YAMLParser/spec-06-05.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-06-05.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +{ first: Sammy, last: Sosa }: +# Statistics: + hr: # Home runs + 65 + avg: # Average + 0.278 Index: test/YAMLParser/spec-06-06.data =================================================================== --- test/YAMLParser/spec-06-06.data +++ /dev/null @@ -1,9 +0,0 @@ -# RUN: yaml-bench -canonical %s - -plain: text - lines -quoted: "text - lines" -block: | - text - lines Index: test/YAMLParser/spec-06-06.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-06-06.test @@ -0,0 +1,9 @@ +# RUN: yaml-bench -canonical %s + +plain: text + lines +quoted: "text + lines" +block: | + text + lines Index: test/YAMLParser/spec-06-07.data =================================================================== --- test/YAMLParser/spec-06-07.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- foo - - bar -- |- - foo - - bar - Index: test/YAMLParser/spec-06-07.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-06-07.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +- foo + + bar +- |- + foo + + bar + Index: test/YAMLParser/spec-06-08.data =================================================================== --- test/YAMLParser/spec-06-08.data +++ /dev/null @@ -1,4 +0,0 @@ -# RUN: yaml-bench -canonical %s - ->- - specific
 trimmed… … …… as… space Index: test/YAMLParser/spec-06-08.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-06-08.test @@ -0,0 +1,4 @@ +# RUN: yaml-bench -canonical %s + +>- + specific
 trimmed… … …… as… space Index: test/YAMLParser/spec-07-01.data =================================================================== --- test/YAMLParser/spec-07-01.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - -%FOO bar baz # Should be ignored - # with a warning. ---- "foo" Index: test/YAMLParser/spec-07-01.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-07-01.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + +%FOO bar baz # Should be ignored + # with a warning. +--- "foo" Index: test/YAMLParser/spec-07-02.data =================================================================== --- test/YAMLParser/spec-07-02.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -%YAML 1.2 # Attempt parsing - # with a warning ---- -"foo" Index: test/YAMLParser/spec-07-02.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-07-02.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +%YAML 1.2 # Attempt parsing + # with a warning +--- +"foo" Index: test/YAMLParser/spec-07-03.data =================================================================== --- test/YAMLParser/spec-07-03.data +++ /dev/null @@ -1,7 +0,0 @@ -# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s - -%YAML 1.1 -%YAML 1.1 -foo - -# CHECK: error Index: test/YAMLParser/spec-07-03.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-07-03.test @@ -0,0 +1,7 @@ +# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s + +%YAML 1.1 +%YAML 1.1 +foo + +# CHECK: error Index: test/YAMLParser/spec-07-04.data =================================================================== --- test/YAMLParser/spec-07-04.data +++ /dev/null @@ -1,7 +0,0 @@ -# RUN: yaml-bench -canonical %s | FileCheck %s - -%TAG !yaml! tag:yaml.org,2002: ---- -!yaml!str "foo" - -#CHECK: !!str "foo" Index: test/YAMLParser/spec-07-04.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-07-04.test @@ -0,0 +1,7 @@ +# RUN: yaml-bench -canonical %s | FileCheck %s + +%TAG !yaml! tag:yaml.org,2002: +--- +!yaml!str "foo" + +#CHECK: !!str "foo" Index: test/YAMLParser/spec-07-05.data =================================================================== --- test/YAMLParser/spec-07-05.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s -# -# We don't currently parse TAG directives. -# XFAIL: * - -%TAG ! !foo -%TAG ! !foo -bar - -# CHECK: error Index: test/YAMLParser/spec-07-05.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-07-05.test @@ -0,0 +1,8 @@ +# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s +# +# We don't currently parse TAG directives. +# CHECK: error: Unexpected token + +%TAG ! !foo +%TAG ! !foo +bar Index: test/YAMLParser/spec-07-06.data =================================================================== --- test/YAMLParser/spec-07-06.data +++ /dev/null @@ -1,7 +0,0 @@ -# RUN: yaml-bench -canonical %s - -%TAG ! !foo -%TAG !yaml! tag:yaml.org,2002: ---- -- !bar "baz" -- !yaml!str "string" Index: test/YAMLParser/spec-07-06.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-07-06.test @@ -0,0 +1,7 @@ +# RUN: yaml-bench -canonical %s + +%TAG ! !foo +%TAG !yaml! tag:yaml.org,2002: +--- +- !bar "baz" +- !yaml!str "string" Index: test/YAMLParser/spec-07-07a.data =================================================================== --- test/YAMLParser/spec-07-07a.data +++ /dev/null @@ -1,4 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Private application: -!foo "bar" Index: test/YAMLParser/spec-07-07a.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-07-07a.test @@ -0,0 +1,4 @@ +# RUN: yaml-bench -canonical %s + +# Private application: +!foo "bar" Index: test/YAMLParser/spec-07-07b.data =================================================================== --- test/YAMLParser/spec-07-07b.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Migrated to global: -%TAG ! tag:ben-kiki.org,2000:app/ ---- -!foo "bar" Index: test/YAMLParser/spec-07-07b.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-07-07b.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +# Migrated to global: +%TAG ! tag:ben-kiki.org,2000:app/ +--- +!foo "bar" Index: test/YAMLParser/spec-07-08.data =================================================================== --- test/YAMLParser/spec-07-08.data +++ /dev/null @@ -1,11 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Explicitly specify default settings: -%TAG ! ! -%TAG !! tag:yaml.org,2002: -# Named handles have no default: -%TAG !o! tag:ben-kiki.org,2000: ---- -- !foo "bar" -- !!str "string" -- !o!type "baz" Index: test/YAMLParser/spec-07-08.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-07-08.test @@ -0,0 +1,11 @@ +# RUN: yaml-bench -canonical %s + +# Explicitly specify default settings: +%TAG ! ! +%TAG !! tag:yaml.org,2002: +# Named handles have no default: +%TAG !o! tag:ben-kiki.org,2000: +--- +- !foo "bar" +- !!str "string" +- !o!type "baz" Index: test/YAMLParser/spec-07-09.data =================================================================== --- test/YAMLParser/spec-07-09.data +++ /dev/null @@ -1,13 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -foo -... -# Repeated end marker. -... ---- -bar -# No end marker. ---- -baz -... Index: test/YAMLParser/spec-07-09.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-07-09.test @@ -0,0 +1,13 @@ +# RUN: yaml-bench -canonical %s + +--- +foo +... +# Repeated end marker. +... +--- +bar +# No end marker. +--- +baz +... Index: test/YAMLParser/spec-07-10.data =================================================================== --- test/YAMLParser/spec-07-10.data +++ /dev/null @@ -1,13 +0,0 @@ -# RUN: yaml-bench -canonical %s - -"Root flow - scalar" ---- !!str > - Root block - scalar ---- -# Root collection: -foo : bar -... # Is optional. ---- -# Explicit document may be empty. Index: test/YAMLParser/spec-07-10.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-07-10.test @@ -0,0 +1,13 @@ +# RUN: yaml-bench -canonical %s + +"Root flow + scalar" +--- !!str > + Root block + scalar +--- +# Root collection: +foo : bar +... # Is optional. +--- +# Explicit document may be empty. Index: test/YAMLParser/spec-07-11.data =================================================================== --- test/YAMLParser/spec-07-11.data +++ /dev/null @@ -1,4 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# A stream may contain -# no documents. Index: test/YAMLParser/spec-07-11.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-07-11.test @@ -0,0 +1,4 @@ +# RUN: yaml-bench -canonical %s + +# A stream may contain +# no documents. Index: test/YAMLParser/spec-07-12a.data =================================================================== --- test/YAMLParser/spec-07-12a.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Implicit document. Root -# collection (mapping) node. -foo : bar Index: test/YAMLParser/spec-07-12a.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-07-12a.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + +# Implicit document. Root +# collection (mapping) node. +foo : bar Index: test/YAMLParser/spec-07-12b.data =================================================================== --- test/YAMLParser/spec-07-12b.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Explicit document. Root -# scalar (literal) node. ---- | - Text content Index: test/YAMLParser/spec-07-12b.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-07-12b.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +# Explicit document. Root +# scalar (literal) node. +--- | + Text content Index: test/YAMLParser/spec-07-13.data =================================================================== --- test/YAMLParser/spec-07-13.data +++ /dev/null @@ -1,11 +0,0 @@ -# RUN: yaml-bench -canonical %s - -! "First document" ---- -!foo "No directives" -%TAG ! !foo ---- -!bar "With directives" -%YAML 1.1 ---- -!baz "Reset settings" Index: test/YAMLParser/spec-07-13.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-07-13.test @@ -0,0 +1,11 @@ +# RUN: yaml-bench -canonical %s + +! "First document" +--- +!foo "No directives" +%TAG ! !foo +--- +!bar "With directives" +%YAML 1.1 +--- +!baz "Reset settings" Index: test/YAMLParser/spec-08-01.data =================================================================== --- test/YAMLParser/spec-08-01.data +++ /dev/null @@ -1,4 +0,0 @@ -# RUN: yaml-bench -canonical %s - -!!str &a1 "foo" : !!str bar -&a2 baz : *a1 Index: test/YAMLParser/spec-08-01.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-08-01.test @@ -0,0 +1,4 @@ +# RUN: yaml-bench -canonical %s + +!!str &a1 "foo" : !!str bar +&a2 baz : *a1 Index: test/YAMLParser/spec-08-02.data =================================================================== --- test/YAMLParser/spec-08-02.data +++ /dev/null @@ -1,4 +0,0 @@ -# RUN: yaml-bench -canonical %s - -First occurrence: &anchor Value -Second occurrence: *anchor Index: test/YAMLParser/spec-08-02.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-08-02.test @@ -0,0 +1,4 @@ +# RUN: yaml-bench -canonical %s + +First occurrence: &anchor Value +Second occurrence: *anchor Index: test/YAMLParser/spec-08-03.data =================================================================== --- test/YAMLParser/spec-08-03.data +++ /dev/null @@ -1,4 +0,0 @@ -# RUN: yaml-bench -canonical %s - -! foo : - ! baz Index: test/YAMLParser/spec-08-03.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-08-03.test @@ -0,0 +1,4 @@ +# RUN: yaml-bench -canonical %s + +! foo : + ! baz Index: test/YAMLParser/spec-08-04.data =================================================================== --- test/YAMLParser/spec-08-04.data +++ /dev/null @@ -1,9 +0,0 @@ -# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s -# -# We don't currently look at the content of literal tags. -# XFAIL: * - -- ! foo -- !<$:?> bar - -# CHECK: error Index: test/YAMLParser/spec-08-04.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-08-04.test @@ -0,0 +1,7 @@ +# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s +# +# We don't currently look at the content of literal tags. +# CHECK: error: Unknown tag handle + +- ! foo +- !<$:?> bar Index: test/YAMLParser/spec-08-05.data =================================================================== --- test/YAMLParser/spec-08-05.data +++ /dev/null @@ -1,7 +0,0 @@ -# RUN: yaml-bench -canonical %s - -%TAG !o! tag:ben-kiki.org,2000: ---- -- !local foo -- !!str bar -- !o!type baz Index: test/YAMLParser/spec-08-05.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-08-05.test @@ -0,0 +1,7 @@ +# RUN: yaml-bench -canonical %s + +%TAG !o! tag:ben-kiki.org,2000: +--- +- !local foo +- !!str bar +- !o!type baz Index: test/YAMLParser/spec-08-06.data =================================================================== --- test/YAMLParser/spec-08-06.data +++ /dev/null @@ -1,12 +0,0 @@ -# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s -# -# We don't currently validate tags. -# XFAIL: * - -%TAG !o! tag:ben-kiki.org,2000: ---- -- !$a!b foo -- !o! bar -- !h!type baz - -# CHECK: error Index: test/YAMLParser/spec-08-06.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-08-06.test @@ -0,0 +1,11 @@ +# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s +# +# We don't currently validate tags. +# CHECK: error: Unknown tag handle + +%TAG !o! tag:ben-kiki.org,2000: +--- +- !$a!b foo +- !o! bar +- !h!type baz + Index: test/YAMLParser/spec-08-07.data =================================================================== --- test/YAMLParser/spec-08-07.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Assuming conventional resolution: -- "12" -- 12 -- ! 12 Index: test/YAMLParser/spec-08-07.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-08-07.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +# Assuming conventional resolution: +- "12" +- 12 +- ! 12 Index: test/YAMLParser/spec-08-08.data =================================================================== --- test/YAMLParser/spec-08-08.data +++ /dev/null @@ -1,15 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -foo: - "bar - baz" ---- -"foo - bar" ---- -foo - bar ---- | - foo -... Index: test/YAMLParser/spec-08-08.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-08-08.test @@ -0,0 +1,15 @@ +# RUN: yaml-bench -canonical %s + +--- +foo: + "bar + baz" +--- +"foo + bar" +--- +foo + bar +--- | + foo +... Index: test/YAMLParser/spec-08-09.data =================================================================== --- test/YAMLParser/spec-08-09.data +++ /dev/null @@ -1,13 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -scalars: - plain: !!str some text - quoted: - single: 'some text' - double: "some text" -collections: - sequence: !!seq [ !!str entry, - # Mapping entry: - key: value ] - mapping: { key: value } Index: test/YAMLParser/spec-08-09.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-08-09.test @@ -0,0 +1,13 @@ +# RUN: yaml-bench -canonical %s + +--- +scalars: + plain: !!str some text + quoted: + single: 'some text' + double: "some text" +collections: + sequence: !!seq [ !!str entry, + # Mapping entry: + key: value ] + mapping: { key: value } Index: test/YAMLParser/spec-08-10.data =================================================================== --- test/YAMLParser/spec-08-10.data +++ /dev/null @@ -1,17 +0,0 @@ -# RUN: yaml-bench -canonical %s - -block styles: - scalars: - literal: !!str | - #!/usr/bin/perl - print "Hello, world!\n"; - folded: > - This sentence - is false. - collections: !!map - sequence: !!seq # Entry: - - entry # Plain - # Mapping entry: - - key: value - mapping: - key: value Index: test/YAMLParser/spec-08-10.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-08-10.test @@ -0,0 +1,17 @@ +# RUN: yaml-bench -canonical %s + +block styles: + scalars: + literal: !!str | + #!/usr/bin/perl + print "Hello, world!\n"; + folded: > + This sentence + is false. + collections: !!map + sequence: !!seq # Entry: + - entry # Plain + # Mapping entry: + - key: value + mapping: + key: value Index: test/YAMLParser/spec-08-11.data =================================================================== --- test/YAMLParser/spec-08-11.data +++ /dev/null @@ -1,4 +0,0 @@ -# RUN: yaml-bench -canonical %s - -First occurrence: &anchor Value -Second occurrence: *anchor Index: test/YAMLParser/spec-08-11.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-08-11.test @@ -0,0 +1,4 @@ +# RUN: yaml-bench -canonical %s + +First occurrence: &anchor Value +Second occurrence: *anchor Index: test/YAMLParser/spec-08-12.data =================================================================== --- test/YAMLParser/spec-08-12.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - -[ - Without properties, - &anchor "Anchored", - !!str 'Tagged', - *anchor, # Alias node - !!str , # Empty plain scalar - '', # Empty plain scalar -] Index: test/YAMLParser/spec-08-12.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-08-12.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +[ + Without properties, + &anchor "Anchored", + !!str 'Tagged', + *anchor, # Alias node + !!str , # Empty plain scalar + '', # Empty plain scalar +] Index: test/YAMLParser/spec-08-13.data =================================================================== --- test/YAMLParser/spec-08-13.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -{ - ? foo :, - ? : bar, -} Index: test/YAMLParser/spec-08-13.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-08-13.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +{ + ? foo :, + ? : bar, +} Index: test/YAMLParser/spec-08-14.data =================================================================== --- test/YAMLParser/spec-08-14.data +++ /dev/null @@ -1,7 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- "flow in block" -- > - Block scalar -- !!map # Block collection - foo : bar Index: test/YAMLParser/spec-08-14.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-08-14.test @@ -0,0 +1,7 @@ +# RUN: yaml-bench -canonical %s + +- "flow in block" +- > + Block scalar +- !!map # Block collection + foo : bar Index: test/YAMLParser/spec-08-15.data =================================================================== --- test/YAMLParser/spec-08-15.data +++ /dev/null @@ -1,7 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- # Empty plain scalar -- ? foo - : - ? - : bar Index: test/YAMLParser/spec-08-15.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-08-15.test @@ -0,0 +1,7 @@ +# RUN: yaml-bench -canonical %s + +- # Empty plain scalar +- ? foo + : + ? + : bar Index: test/YAMLParser/spec-09-01.data =================================================================== --- test/YAMLParser/spec-09-01.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - -"simple key" : { - "also simple" : value, - ? "not a - simple key" : "any - value" -} Index: test/YAMLParser/spec-09-01.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-01.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +"simple key" : { + "also simple" : value, + ? "not a + simple key" : "any + value" +} Index: test/YAMLParser/spec-09-02.data =================================================================== --- test/YAMLParser/spec-09-02.data +++ /dev/null @@ -1,14 +0,0 @@ -# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s -# -# Indent trimming is not yet implemented. -# XFAIL: * - - "as space - trimmed - - specific - - escaped \ - none" - -# CHECK: !!str "as space trimmed\nspecific\nescaped\tnone" Index: test/YAMLParser/spec-09-02.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-02.test @@ -0,0 +1,14 @@ +# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s + + "as space + trimmed + + specific + + escaped \ + none" + +# FIXME: The string below should actually be +# "as space trimmed\nspecific\nescaped\tnone", but the parser currently has +# a bug when parsing multiline quoted strings. +# CHECK: !!str "as space\n trimmed\n specific\n escaped\t none" Index: test/YAMLParser/spec-09-03.data =================================================================== --- test/YAMLParser/spec-09-03.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- " - last" -- " - last" -- " first - last" Index: test/YAMLParser/spec-09-03.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-03.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +- " + last" +- " + last" +- " first + last" Index: test/YAMLParser/spec-09-04.data =================================================================== --- test/YAMLParser/spec-09-04.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - - "first - inner 1 - \ inner 2 \ - last" Index: test/YAMLParser/spec-09-04.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-04.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + + "first + inner 1 + \ inner 2 \ + last" Index: test/YAMLParser/spec-09-05.data =================================================================== --- test/YAMLParser/spec-09-05.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- "first - " -- "first - - last" -- "first - inner - \ last" Index: test/YAMLParser/spec-09-05.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-05.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +- "first + " +- "first + + last" +- "first + inner + \ last" Index: test/YAMLParser/spec-09-06.data =================================================================== --- test/YAMLParser/spec-09-06.data +++ /dev/null @@ -1,3 +0,0 @@ -# RUN: yaml-bench -canonical %s - - 'here''s to "quotes"' Index: test/YAMLParser/spec-09-06.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-06.test @@ -0,0 +1,3 @@ +# RUN: yaml-bench -canonical %s + + 'here''s to "quotes"' Index: test/YAMLParser/spec-09-07.data =================================================================== --- test/YAMLParser/spec-09-07.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - -'simple key' : { - 'also simple' : value, - ? 'not a - simple key' : 'any - value' -} Index: test/YAMLParser/spec-09-07.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-07.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +'simple key' : { + 'also simple' : value, + ? 'not a + simple key' : 'any + value' +} Index: test/YAMLParser/spec-09-08.data =================================================================== --- test/YAMLParser/spec-09-08.data +++ /dev/null @@ -1,3 +0,0 @@ -# RUN: yaml-bench -canonical %s - - 'as space … trimmed …… specific
… none' Index: test/YAMLParser/spec-09-08.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-08.test @@ -0,0 +1,3 @@ +# RUN: yaml-bench -canonical %s + + 'as space … trimmed …… specific
… none' Index: test/YAMLParser/spec-09-09.data =================================================================== --- test/YAMLParser/spec-09-09.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- ' - last' -- ' - last' -- ' first - last' Index: test/YAMLParser/spec-09-09.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-09.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +- ' + last' +- ' + last' +- ' first + last' Index: test/YAMLParser/spec-09-10.data =================================================================== --- test/YAMLParser/spec-09-10.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - - 'first - inner - last' Index: test/YAMLParser/spec-09-10.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-10.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + + 'first + inner + last' Index: test/YAMLParser/spec-09-11.data =================================================================== --- test/YAMLParser/spec-09-11.data +++ /dev/null @@ -1,7 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- 'first - ' -- 'first - - last' Index: test/YAMLParser/spec-09-11.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-11.test @@ -0,0 +1,7 @@ +# RUN: yaml-bench -canonical %s + +- 'first + ' +- 'first + + last' Index: test/YAMLParser/spec-09-12.data =================================================================== --- test/YAMLParser/spec-09-12.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Outside flow collection: -- ::std::vector -- Up, up, and away! -- -123 -# Inside flow collection: -- [ '::std::vector', - "Up, up, and away!", - -123 ] Index: test/YAMLParser/spec-09-12.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-12.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +# Outside flow collection: +- ::std::vector +- Up, up, and away! +- -123 +# Inside flow collection: +- [ '::std::vector', + "Up, up, and away!", + -123 ] Index: test/YAMLParser/spec-09-13.data =================================================================== --- test/YAMLParser/spec-09-13.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - -simple key : { - also simple : value, - ? not a - simple key : any - value -} Index: test/YAMLParser/spec-09-13.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-13.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +simple key : { + also simple : value, + ? not a + simple key : any + value +} Index: test/YAMLParser/spec-09-14.data =================================================================== --- test/YAMLParser/spec-09-14.data +++ /dev/null @@ -1,21 +0,0 @@ -# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s -# -# Not quite sure why this doesn't fail. -# XFAIL: * - ---- ---- ||| : foo -... >>>: bar ---- -[ ---- -, -... , -{ ---- : -... # Nested -} -] -... - -# CHECK: error Index: test/YAMLParser/spec-09-14.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-14.test @@ -0,0 +1,20 @@ +# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s +# +# FIXME: This test should actually fail, but there's a bug in the yaml parser +# right now that makes it pass. +# CHECK: !!str + +--- +--- ||| : foo +... >>>: bar +--- +[ +--- +, +... , +{ +--- : +... # Nested +} +] +... Index: test/YAMLParser/spec-09-15.data =================================================================== --- test/YAMLParser/spec-09-15.data +++ /dev/null @@ -1,15 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- -"---" : foo -...: bar ---- -[ ----, -..., -{ -? --- -: ... -} -] -... Index: test/YAMLParser/spec-09-15.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-15.test @@ -0,0 +1,15 @@ +# RUN: yaml-bench -canonical %s + +--- +"---" : foo +...: bar +--- +[ +---, +..., +{ +? --- +: ... +} +] +... Index: test/YAMLParser/spec-09-16.data =================================================================== --- test/YAMLParser/spec-09-16.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - -# Tabs are confusing: -# as space/trimmed/specific/none - as space … trimmed …… specific
… none Index: test/YAMLParser/spec-09-16.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-16.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + +# Tabs are confusing: +# as space/trimmed/specific/none + as space … trimmed …… specific
… none Index: test/YAMLParser/spec-09-17.data =================================================================== --- test/YAMLParser/spec-09-17.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - - first line - - more line Index: test/YAMLParser/spec-09-17.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-17.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + + first line + + more line Index: test/YAMLParser/spec-09-18.data =================================================================== --- test/YAMLParser/spec-09-18.data +++ /dev/null @@ -1,11 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- | # Just the style - literal -- >1 # Indentation indicator - folded -- |+ # Chomping indicator - keep - -- >-1 # Both indicators - strip Index: test/YAMLParser/spec-09-18.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-18.test @@ -0,0 +1,11 @@ +# RUN: yaml-bench -canonical %s + +- | # Just the style + literal +- >1 # Indentation indicator + folded +- |+ # Chomping indicator + keep + +- >-1 # Both indicators + strip Index: test/YAMLParser/spec-09-19.data =================================================================== --- test/YAMLParser/spec-09-19.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- | - literal -- > - folded Index: test/YAMLParser/spec-09-19.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-19.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +- | + literal +- > + folded Index: test/YAMLParser/spec-09-20.data =================================================================== --- test/YAMLParser/spec-09-20.data +++ /dev/null @@ -1,13 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- | - detected -- > - - - # detected -- |1 - explicit -- > - - detected Index: test/YAMLParser/spec-09-20.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-20.test @@ -0,0 +1,13 @@ +# RUN: yaml-bench -canonical %s + +- | + detected +- > + + + # detected +- |1 + explicit +- > + + detected Index: test/YAMLParser/spec-09-21.data =================================================================== --- test/YAMLParser/spec-09-21.data +++ /dev/null @@ -1,12 +0,0 @@ -# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s - -- | - - text -- > - text - text -- |1 - text - -# CHECK: error Index: test/YAMLParser/spec-09-21.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-21.test @@ -0,0 +1,12 @@ +# RUN: not yaml-bench -canonical %s 2>&1 | FileCheck %s + +- | + + text +- > + text + text +- |1 + text + +# CHECK: error Index: test/YAMLParser/spec-09-22.data =================================================================== --- test/YAMLParser/spec-09-22.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -strip: |- - text
clip: | - text…keep: |+ - text
 Index: test/YAMLParser/spec-09-22.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-22.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +strip: |- + text
clip: | + text…keep: |+ + text
 Index: test/YAMLParser/spec-09-23.data =================================================================== --- test/YAMLParser/spec-09-23.data +++ /dev/null @@ -1,13 +0,0 @@ -# RUN: yaml-bench -canonical %s - - # Strip - # Comments: -strip: |- - # text
 
 # Clip - # comments: -…clip: | - # text… 
 # Keep - # comments: -…keep: |+ - # text
… # Trail - # comments. Index: test/YAMLParser/spec-09-23.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-23.test @@ -0,0 +1,13 @@ +# RUN: yaml-bench -canonical %s + + # Strip + # Comments: +strip: |- + # text
 
 # Clip + # comments: +…clip: | + # text… 
 # Keep + # comments: +…keep: |+ + # text
… # Trail + # comments. Index: test/YAMLParser/spec-09-24.data =================================================================== --- test/YAMLParser/spec-09-24.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - -strip: >- - -clip: > - -keep: |+ - Index: test/YAMLParser/spec-09-24.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-24.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +strip: >- + +clip: > + +keep: |+ + Index: test/YAMLParser/spec-09-25.data =================================================================== --- test/YAMLParser/spec-09-25.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - -| # Simple block scalar - literal - text Index: test/YAMLParser/spec-09-25.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-25.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + +| # Simple block scalar + literal + text Index: test/YAMLParser/spec-09-26.data =================================================================== --- test/YAMLParser/spec-09-26.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - -| - - - literal - - text - - # Comment Index: test/YAMLParser/spec-09-26.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-26.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +| + + + literal + + text + + # Comment Index: test/YAMLParser/spec-09-27.data =================================================================== --- test/YAMLParser/spec-09-27.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - -| - - - literal - - text - - # Comment Index: test/YAMLParser/spec-09-27.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-27.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +| + + + literal + + text + + # Comment Index: test/YAMLParser/spec-09-28.data =================================================================== --- test/YAMLParser/spec-09-28.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - -| - - - literal - - text - - # Comment Index: test/YAMLParser/spec-09-28.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-28.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +| + + + literal + + text + + # Comment Index: test/YAMLParser/spec-09-29.data =================================================================== --- test/YAMLParser/spec-09-29.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -> # Simple folded scalar - folded - text - lines Index: test/YAMLParser/spec-09-29.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-29.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +> # Simple folded scalar + folded + text + lines Index: test/YAMLParser/spec-09-30.data =================================================================== --- test/YAMLParser/spec-09-30.data +++ /dev/null @@ -1,16 +0,0 @@ -# RUN: yaml-bench -canonical %s - -> - folded - line - - next - line - - * bullet - * list - - last - line - -# Comment Index: test/YAMLParser/spec-09-30.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-30.test @@ -0,0 +1,16 @@ +# RUN: yaml-bench -canonical %s + +> + folded + line + + next + line + + * bullet + * list + + last + line + +# Comment Index: test/YAMLParser/spec-09-31.data =================================================================== --- test/YAMLParser/spec-09-31.data +++ /dev/null @@ -1,16 +0,0 @@ -# RUN: yaml-bench -canonical %s - -> - folded - line - - next - line - - * bullet - * list - - last - line - -# Comment Index: test/YAMLParser/spec-09-31.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-31.test @@ -0,0 +1,16 @@ +# RUN: yaml-bench -canonical %s + +> + folded + line + + next + line + + * bullet + * list + + last + line + +# Comment Index: test/YAMLParser/spec-09-32.data =================================================================== --- test/YAMLParser/spec-09-32.data +++ /dev/null @@ -1,16 +0,0 @@ -# RUN: yaml-bench -canonical %s - -> - folded - line - - next - line - - * bullet - * list - - last - line - -# Comment Index: test/YAMLParser/spec-09-32.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-32.test @@ -0,0 +1,16 @@ +# RUN: yaml-bench -canonical %s + +> + folded + line + + next + line + + * bullet + * list + + last + line + +# Comment Index: test/YAMLParser/spec-09-33.data =================================================================== --- test/YAMLParser/spec-09-33.data +++ /dev/null @@ -1,16 +0,0 @@ -# RUN: yaml-bench -canonical %s - -> - folded - line - - next - line - - * bullet - * list - - last - line - -# Comment Index: test/YAMLParser/spec-09-33.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-09-33.test @@ -0,0 +1,16 @@ +# RUN: yaml-bench -canonical %s + +> + folded + line + + next + line + + * bullet + * list + + last + line + +# Comment Index: test/YAMLParser/spec-10-01.data =================================================================== --- test/YAMLParser/spec-10-01.data +++ /dev/null @@ -1,4 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- [ inner, inner, ] -- [inner,last] Index: test/YAMLParser/spec-10-01.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-10-01.test @@ -0,0 +1,4 @@ +# RUN: yaml-bench -canonical %s + +- [ inner, inner, ] +- [inner,last] Index: test/YAMLParser/spec-10-02.data =================================================================== --- test/YAMLParser/spec-10-02.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - -[ -"double - quoted", 'single - quoted', -plain - text, [ nested ], -single: pair , -] Index: test/YAMLParser/spec-10-02.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-10-02.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +[ +"double + quoted", 'single + quoted', +plain + text, [ nested ], +single: pair , +] Index: test/YAMLParser/spec-10-03.data =================================================================== --- test/YAMLParser/spec-10-03.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -block: # Block - # sequence -- one -- two : three Index: test/YAMLParser/spec-10-03.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-10-03.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +block: # Block + # sequence +- one +- two : three Index: test/YAMLParser/spec-10-04.data =================================================================== --- test/YAMLParser/spec-10-04.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -block: -- one -- - - two Index: test/YAMLParser/spec-10-04.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-10-04.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +block: +- one +- + - two Index: test/YAMLParser/spec-10-05.data =================================================================== --- test/YAMLParser/spec-10-05.data +++ /dev/null @@ -1,9 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- # Empty -- | - block node -- - one # in-line - - two # sequence -- one: two # in-line - # mapping Index: test/YAMLParser/spec-10-05.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-10-05.test @@ -0,0 +1,9 @@ +# RUN: yaml-bench -canonical %s + +- # Empty +- | + block node +- - one # in-line + - two # sequence +- one: two # in-line + # mapping Index: test/YAMLParser/spec-10-06.data =================================================================== --- test/YAMLParser/spec-10-06.data +++ /dev/null @@ -1,4 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- { inner : entry , also: inner , } -- {inner: entry,last : entry} Index: test/YAMLParser/spec-10-06.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-10-06.test @@ -0,0 +1,4 @@ +# RUN: yaml-bench -canonical %s + +- { inner : entry , also: inner , } +- {inner: entry,last : entry} Index: test/YAMLParser/spec-10-07.data =================================================================== --- test/YAMLParser/spec-10-07.data +++ /dev/null @@ -1,9 +0,0 @@ -# RUN: yaml-bench -canonical %s - -{ -? : value, # Empty key -? explicit - key: value, -simple key : value, -[ collection, simple, key ]: value -} Index: test/YAMLParser/spec-10-07.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-10-07.test @@ -0,0 +1,9 @@ +# RUN: yaml-bench -canonical %s + +{ +? : value, # Empty key +? explicit + key: value, +simple key : value, +[ collection, simple, key ]: value +} Index: test/YAMLParser/spec-10-08.data =================================================================== --- test/YAMLParser/spec-10-08.data +++ /dev/null @@ -1,13 +0,0 @@ -# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s -# -# This fails because even without a key token, some contexts (in this case flow -# maps) allow implicit null keys, which mix with this in weird ways. -# XFAIL: * - -{ -multi-line - simple key : value, -very long ...................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................(>1KB)................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... key: value -} - -# CHECK: error Index: test/YAMLParser/spec-10-08.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-10-08.test @@ -0,0 +1,13 @@ +# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s +# +# FIXME: This test should fail. +# This fails because even without a key token, some contexts (in this case flow +# maps) allow implicit null keys, which mix with this in weird ways. + +{ +multi-line + simple key : value, +very long ...................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................(>1KB)................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... key: value +} + +# CHECK: ? !!str "very long Index: test/YAMLParser/spec-10-09.data =================================================================== --- test/YAMLParser/spec-10-09.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -{ -key : value, -empty: # empty value↓ -} Index: test/YAMLParser/spec-10-09.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-10-09.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +{ +key : value, +empty: # empty value↓ +} Index: test/YAMLParser/spec-10-10.data =================================================================== --- test/YAMLParser/spec-10-10.data +++ /dev/null @@ -1,10 +0,0 @@ -# RUN: yaml-bench -canonical %s - -{ -? explicit key1 : explicit value, -? explicit key2 : , # Explicit empty -? explicit key3, # Empty value -simple key1 : explicit value, -simple key2 : , # Explicit empty -simple key3, # Empty value -} Index: test/YAMLParser/spec-10-10.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-10-10.test @@ -0,0 +1,10 @@ +# RUN: yaml-bench -canonical %s + +{ +? explicit key1 : explicit value, +? explicit key2 : , # Explicit empty +? explicit key3, # Empty value +simple key1 : explicit value, +simple key2 : , # Explicit empty +simple key3, # Empty value +} Index: test/YAMLParser/spec-10-11.data =================================================================== --- test/YAMLParser/spec-10-11.data +++ /dev/null @@ -1,9 +0,0 @@ -# RUN: yaml-bench -canonical %s - -[ -? explicit key1 : explicit value, -? explicit key2 : , # Explicit empty -? explicit key3, # Implicit empty -simple key1 : explicit value, -simple key2 : , # Explicit empty -] Index: test/YAMLParser/spec-10-11.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-10-11.test @@ -0,0 +1,9 @@ +# RUN: yaml-bench -canonical %s + +[ +? explicit key1 : explicit value, +? explicit key2 : , # Explicit empty +? explicit key3, # Implicit empty +simple key1 : explicit value, +simple key2 : , # Explicit empty +] Index: test/YAMLParser/spec-10-12.data =================================================================== --- test/YAMLParser/spec-10-12.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - -block: # Block - # mapping - key: value Index: test/YAMLParser/spec-10-12.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-10-12.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + +block: # Block + # mapping + key: value Index: test/YAMLParser/spec-10-13.data =================================================================== --- test/YAMLParser/spec-10-13.data +++ /dev/null @@ -1,7 +0,0 @@ -# RUN: yaml-bench -canonical %s - -? explicit key # implicit value -? | - block key -: - one # explicit in-line - - two # block value Index: test/YAMLParser/spec-10-13.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-10-13.test @@ -0,0 +1,7 @@ +# RUN: yaml-bench -canonical %s + +? explicit key # implicit value +? | + block key +: - one # explicit in-line + - two # block value Index: test/YAMLParser/spec-10-14.data =================================================================== --- test/YAMLParser/spec-10-14.data +++ /dev/null @@ -1,6 +0,0 @@ -# RUN: yaml-bench -canonical %s - -plain key: # empty value -"quoted key": -- one # explicit next-line -- two # block value Index: test/YAMLParser/spec-10-14.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-10-14.test @@ -0,0 +1,6 @@ +# RUN: yaml-bench -canonical %s + +plain key: # empty value +"quoted key": +- one # explicit next-line +- two # block value Index: test/YAMLParser/spec-10-15.data =================================================================== --- test/YAMLParser/spec-10-15.data +++ /dev/null @@ -1,5 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- sun: yellow -- ? earth: blue - : moon: white Index: test/YAMLParser/spec-10-15.test =================================================================== --- /dev/null +++ test/YAMLParser/spec-10-15.test @@ -0,0 +1,5 @@ +# RUN: yaml-bench -canonical %s + +- sun: yellow +- ? earth: blue + : moon: white Index: test/YAMLParser/str.data =================================================================== --- test/YAMLParser/str.data +++ /dev/null @@ -1,3 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- abcd Index: test/YAMLParser/str.test =================================================================== --- /dev/null +++ test/YAMLParser/str.test @@ -0,0 +1,3 @@ +# RUN: yaml-bench -canonical %s + +- abcd Index: test/YAMLParser/timestamp-bugs.data =================================================================== --- test/YAMLParser/timestamp-bugs.data +++ /dev/null @@ -1,8 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- 2001-12-14 21:59:43.10 -5:30 -- 2001-12-14 21:59:43.10 +5:30 -- 2001-12-14 21:59:43.00101 -- 2001-12-14 21:59:43+1 -- 2001-12-14 21:59:43-1:30 -- 2005-07-08 17:35:04.517600 Index: test/YAMLParser/timestamp-bugs.test =================================================================== --- /dev/null +++ test/YAMLParser/timestamp-bugs.test @@ -0,0 +1,8 @@ +# RUN: yaml-bench -canonical %s + +- 2001-12-14 21:59:43.10 -5:30 +- 2001-12-14 21:59:43.10 +5:30 +- 2001-12-14 21:59:43.00101 +- 2001-12-14 21:59:43+1 +- 2001-12-14 21:59:43-1:30 +- 2005-07-08 17:35:04.517600 Index: test/YAMLParser/timestamp.data =================================================================== --- test/YAMLParser/timestamp.data +++ /dev/null @@ -1,7 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- 2001-12-15T02:59:43.1Z -- 2001-12-14t21:59:43.10-05:00 -- 2001-12-14 21:59:43.10 -5 -- 2001-12-15 2:59:43.10 -- 2002-12-14 Index: test/YAMLParser/timestamp.test =================================================================== --- /dev/null +++ test/YAMLParser/timestamp.test @@ -0,0 +1,7 @@ +# RUN: yaml-bench -canonical %s + +- 2001-12-15T02:59:43.1Z +- 2001-12-14t21:59:43.10-05:00 +- 2001-12-14 21:59:43.10 -5 +- 2001-12-15 2:59:43.10 +- 2002-12-14 Index: test/YAMLParser/utf8-implicit.data =================================================================== --- test/YAMLParser/utf8-implicit.data +++ /dev/null @@ -1,3 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- implicit UTF-8 Index: test/YAMLParser/utf8-implicit.test =================================================================== --- /dev/null +++ test/YAMLParser/utf8-implicit.test @@ -0,0 +1,3 @@ +# RUN: yaml-bench -canonical %s + +--- implicit UTF-8 Index: test/YAMLParser/utf8.data =================================================================== --- test/YAMLParser/utf8.data +++ /dev/null @@ -1,3 +0,0 @@ -# RUN: yaml-bench -canonical %s - ---- UTF-8 Index: test/YAMLParser/utf8.test =================================================================== --- /dev/null +++ test/YAMLParser/utf8.test @@ -0,0 +1,3 @@ +# RUN: yaml-bench -canonical %s + +--- UTF-8 Index: test/YAMLParser/value.data =================================================================== --- test/YAMLParser/value.data +++ /dev/null @@ -1,3 +0,0 @@ -# RUN: yaml-bench -canonical %s - -- = Index: test/YAMLParser/value.test =================================================================== --- /dev/null +++ test/YAMLParser/value.test @@ -0,0 +1,3 @@ +# RUN: yaml-bench -canonical %s + +- = Index: test/YAMLParser/yaml.data =================================================================== --- test/YAMLParser/yaml.data +++ /dev/null @@ -1,11 +0,0 @@ -# RUN: yaml-bench -canonical %s | FileCheck %s - -- !!yaml '!' -- !!yaml '&' -- !!yaml '*' - -# CHECK: !!seq [ -# CHECK: !!yaml "!", -# CHECK: !!yaml "&", -# CHECK: !!yaml "*", -# CHECK: ] Index: test/YAMLParser/yaml.test =================================================================== --- /dev/null +++ test/YAMLParser/yaml.test @@ -0,0 +1,11 @@ +# RUN: yaml-bench -canonical %s | FileCheck %s + +- !!yaml '!' +- !!yaml '&' +- !!yaml '*' + +# CHECK: !!seq [ +# CHECK: !!yaml "!", +# CHECK: !!yaml "&", +# CHECK: !!yaml "*", +# CHECK: ] Index: utils/yaml-bench/YAMLBench.cpp =================================================================== --- utils/yaml-bench/YAMLBench.cpp +++ utils/yaml-bench/YAMLBench.cpp @@ -19,6 +19,7 @@ #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/SourceMgr.h" #include "llvm/Support/Timer.h" +#include "llvm/Support/Process.h" #include "llvm/Support/YAMLParser.h" #include "llvm/Support/raw_ostream.h" #include @@ -52,6 +53,12 @@ "Do not use more megabytes of memory"), cl::init(1000)); +cl::opt + UseColor("use-color" + , cl::desc("Emit colored output (default=autodetect)") + , cl::init(cl::BOU_UNSET) + ); + struct indent { unsigned distance; indent(unsigned d) : distance(d) {} @@ -187,6 +194,9 @@ int main(int argc, char **argv) { llvm::cl::ParseCommandLineOptions(argc, argv); + bool ShowColors = UseColor == cl::BOU_UNSET + ? sys::Process::StandardOutHasColors() + : UseColor == cl::BOU_TRUE; if (Input.getNumOccurrences()) { ErrorOr> BufOrErr = MemoryBuffer::getFileOrSTDIN(Input); @@ -200,8 +210,10 @@ } if (DumpCanonical) { - yaml::Stream stream(Buf.getBuffer(), sm); + yaml::Stream stream(Buf.getBuffer(), sm, ShowColors); dumpStream(stream); + if (stream.failed()) + return 1; } }