Commit Graph

27 Commits

Author SHA1 Message Date
beder
46ab9103a6 Moved the three scalar token scanning functions back to scantoken.cpp, so scanscalar.cpp now only has the main scalar scanning function.
Renamed ScanScalarInfo to ScanScalarParams.
2008-06-30 01:38:32 +00:00
beder
88e6bc7718 Mostly finished refactoring the scalar scanning. 2008-06-30 01:31:23 +00:00
beder
8ffdbb026d Moved scalar scanning-related parameters to a struct.
Renamed the valid/possible tokens to a single variable status with enums valid, invalid, and unverified.
2008-06-29 17:39:33 +00:00
beder
7478308488 Moved the input stream, together with line/column info, into its own class, which allowed some other stuff just to pass the stream, and not have to be a member of Scanner. 2008-06-29 06:32:13 +00:00
beder
88ee96d432 Refactored common scalar scanning code (from plain, quoted, and block) to one function. 2008-06-29 05:45:41 +00:00
beder
abcea93589 Moved the scalar-related functions to their own file. 2008-06-29 03:11:25 +00:00
beder
0adbe3aa5b 2008-06-29 00:33:34 +00:00
beder
854d89e1e4 Small refactoring. 2008-06-28 22:05:51 +00:00
beder
44c8283aea 2008-06-28 20:09:49 +00:00
beder
10e13764c5 Added folded and literal scalars. 2008-06-28 20:08:21 +00:00
beder
d6f8f4fe24 Fixed complex keys. 2008-06-28 17:32:10 +00:00
beder
82f240313b Moved the simple key validation to before each token scan (plus at newlines of scalars). 2008-06-28 16:46:37 +00:00
beder
a351d05efa Added simple keys.
There's a bug (and question): should we test simple keys' validity BEFORE stuff or AFTER stuff?
2008-06-28 06:36:59 +00:00
beder
c9f81d3ff8 Added quoted scalars (with escaping).
Refactored some common whitespace-parsing code in scanning both scalars.
Implemented the flow collection tokens.
2008-06-27 23:11:46 +00:00
beder
4a70e77492 Small plain scalar scanning fixes. 2008-06-27 20:54:43 +00:00
beder
dce43a305f Split off the specific regular expressions, and the specialized token-scanning functions, into their own files. 2008-06-27 19:13:03 +00:00
beder
5657241e4c Added stream input to the regular expressions, greatly simplifying the usage (in particular, we no longer have to specify the number of characters to be checked). 2008-06-27 19:07:30 +00:00
beder
b20e47cdd9 Wrote a simplified regular expression parser to make life easier (it only does single matches; i.e., no one-or-more matches, etc.).
Fixed some of the whitespace/line break matching.
2008-06-27 08:20:41 +00:00
beder
076779d325 The plain scalar scanner is almost done (and it scans a simple list correctly).
Also messed around with multiple character peeking on the input, and got something working.
2008-06-27 00:18:52 +00:00
beder
643b0de4fa More simple scalar scanning. 2008-06-26 22:00:39 +00:00
beder
fb149fc15a Continued working on scanner.
We're now using exceptions for errors, and scanning/pushing tokens is exception-safe (using a set of "limbo tokens").
2008-06-26 19:30:11 +00:00
beder
a03a8f10f1 Started the scanner. 2008-06-26 09:05:28 +00:00
beder
92ebd0ba82 Beginning of first attempt to parse.
Will be completely wiped, I think, in favor of a Scanner (to tokens), then Parser mechanism.
2008-06-26 06:49:50 +00:00
beder
b5ad2cdb94 Preliminary setup - basic data structures are there. 2008-06-25 23:00:18 +00:00
beder
984230b96e 2008-06-25 22:46:18 +00:00
beder
ced580ef6d 2008-06-25 22:45:08 +00:00
beder
28d5532c06 2008-06-25 22:44:44 +00:00