Commit Graph

68 Commits

Author SHA1 Message Date
Laurenz 3cbca56a71 Parse braced expressions and bracketed calls in headers 🗳
- Refactors the tokenizer to be lazy: It does not emit pre-parsed function tokens, but instead allows it's mode to be changed. The modes are tracked on a stack to allow nested compute/typesetting (pop/push).
- Introduces delimited groups into the parser, which make it easy to parse delimited expressions without handling the delimiters in the parsing code for the group's content. A group is started with `start_group`. When reaching the group's end (matching delimiter) the eat and peek methods will simply return `None` instead of the delimiter, stopping the content parser and bubbling up the call stack until `end_group` is called to clear up the situation.
2020-08-17 16:25:09 +02:00
Laurenz 30f16bbf64 Add Value type and replace dyn-nodes with call-exprs 🏗
- In addition to syntax trees there are now `Value`s, which syntax trees can be evaluated into (e.g. the tree is `5+5` and the value is `10`)
- Parsing is completely pure, function calls are not parsed into nodes, but into simple call expressions, which are resolved later
- Functions aren't dynamic nodes anymore, but simply functions which receive their arguments as a table and the layouting context
- Functions may return any `Value`
- Layouting is powered by functions which return the new `Commands` value, which informs the layouting engine what to do
- When a function returns a non-`Commands` value, the layouter simply dumps the value into the document in monospace
2020-08-16 22:39:21 +02:00
Laurenz 9f6137d8a8 Remove tuples and objects in favor of tables 🛢
This refactores the parser tests to make them more concise and flexible with regards to spans.
2020-08-16 14:38:30 +02:00
Laurenz c8f6b5bd5c Desugar body into last argument 🍩 2020-08-14 20:43:03 +02:00
Laurenz 1fb2d5103d Always parse bodies as syntax trees 🌳
Previously they were passed as strings to the function parser, now they are parsed and then passed as trees to the function. This allows making bodies sugar for a last content argument. While it removes some flexibility allowing function to parse arbitrary syntaxes in their bodies, these can be modelled as (raw) string arguments.
2020-08-14 20:13:50 +02:00
Laurenz 88151c546f Use equals sign instead of colon for objects 📍 2020-08-13 20:10:29 +02:00
Laurenz da2ade6542 Remove redundant `Expr` prefix from tokens 🧽 2020-08-13 20:02:07 +02:00
Laurenz 2467cd6272 Refactor function parsing ♻ 2020-08-04 13:48:07 +02:00
Laurenz ed4fdcb0ad Par nodes 🧳 2020-08-04 11:46:04 +02:00
Laurenz dbfb3d2ced Formatting, documentation and small improvements 🧽 2020-08-03 16:04:55 +02:00
Laurenz 5a8f2fb73d Replace body! macro with functions 🧰 2020-08-02 22:21:58 +02:00
Laurenz 266d457292 Refactor model into tree 🛒 2020-08-02 22:05:49 +02:00
Laurenz 533374db14 Refactor argument parsing 🔬 2020-08-02 16:31:34 +02:00
Laurenz 8ca80fc7da Include parens in expression's span (fixes #4) ☘ 2020-07-29 18:13:52 +02:00
Laurenz bbcdeb128c Move, rename and switch some things (boring) 🚚
- Problems -> Diagnostics
- Position -> Pos
- offset_spans -> Offset trait
- Size -> Length (and some more size types renamed)
- Paper into its own module
- scope::Parser -> parsing::CallParser
- Create `Decorations` alias
- Remove lots of double newlines
- Switch from f32 to f64
2020-07-29 18:09:51 +02:00
Laurenz 9672d43200 Improve argument naming and fix grammar in comment ♻ 2020-07-29 17:38:14 +02:00
Laurenz 53ca5a7fc5 Refactor parser 🚇 2020-07-27 13:47:29 +02:00
Laurenz 9f400042cb Streamline parser and tokenizer test code ✈ 2020-07-26 19:14:23 +02:00
Laurenz e2ef4f64e7 Rename errors to problems and make error! macro more ergonomic 🧼
Also adds a `warning!` macro.
2020-07-26 17:28:43 +02:00
Laurenz 38a2424742 Remove duplicate spans for func args 2020-07-18 18:02:38 +02:00
Laurenz 332f83ed2d Some code and styling improvements 🎨 2020-07-18 17:52:12 +02:00
Martin Haug e9a9581252 Spanned object pairs and refactoring 🧵 2020-07-18 16:57:58 +02:00
Martin Haug bb1350cff5 Parsing mathematical expressions 2020-07-18 14:07:53 +02:00
Laurenz e96f3830f1 Use FromStr trait and formatting 2020-07-15 23:49:10 +02:00
Martin Haug 1683ca87f7 Healed field for RgbaColors, CodeRev feedback 🤝 2020-07-15 20:57:26 +02:00
Martin Haug 28c3a797ec Add named tuples and hex color tokens 2020-07-14 19:09:58 +02:00
Laurenz 1658b00282 New syntax features 👔
- Forced line breaks with backslash followed by whitespace
- (Multline) raw text in backticks
- Set font class fallbacks with [font.family] (e.g. [font.family: monospace=("CMU Typewriter Text")])
- More sophisticated procedure to find end of function, which accounts for comments, strings, raw text and nested functions (this is a mix of a feature and a bug fix)
2020-02-13 21:58:49 +01:00
Laurenz 60099aed50 Parse tuples and objects 🍒
Generalizes the parsing of tuples, objects and function arguments into generic comma-separated collections.
2020-02-11 21:30:39 +01:00
Laurenz 5badb4e8ff Write lots of parser tests 🌪 2020-02-09 14:14:32 +01:00
Laurenz 4e8359385f Improve syntax testing framework ♻
... and finally expand a few escape sequences in strings.
2020-02-07 22:29:16 +01:00
Laurenz 02dc29d18a Highlight bold / italic / monospace 🎨 2020-02-06 11:15:48 +01:00
Laurenz e63ce52ae0 Merge `Parsed` and `Layouted` types into `Pass` with `Feedback` 🌝🎢🌚 2020-02-04 19:22:23 +01:00
Laurenz ec60795575 Port tests 🚁 2020-02-03 15:05:34 +01:00
Laurenz 3150fd5643 Better Debug/Display and Derives 🧽 2020-02-03 12:22:02 +01:00
Laurenz 40ea35cbe7 Upgrade to new toddle interface 🐳 2020-02-03 10:37:50 +01:00
Laurenz 20fb4e7c37 Document everything 📜 2020-01-26 15:51:13 +01:00
Laurenz 0a087cd28b Reorganize modules 🧱 2020-01-24 16:23:57 +01:00
Laurenz 03fddaf3ae Non-fatal argument parsing 🌋 2020-01-24 12:44:04 +01:00
Laurenz 78da2bdd5d Decoupled function parser 🔗 [WIP] 2020-01-21 17:09:31 +01:00
Laurenz 95e6b078fe Move to non-fatal errors 🪂 [WIP]
- Dynamic models instead of SyntaxTrees
- No more ParseResult/LayoutResult
- Errors and Decorations which are propagated to parent contexts
- Models are finally clonable
2020-01-19 21:53:24 +01:00
Laurenz 277f2d2176 ColorToken serialization + function fix 🚧 2020-01-18 15:58:36 +01:00
Laurenz 70878885f5 Do argument parsing ☑ 2020-01-16 23:00:39 +01:00
Laurenz 08b91a265f Powerful parser testing 🐱👤 2020-01-16 17:51:04 +01:00
Laurenz 15ad30555b Parser testing prototype 🥥 2020-01-14 20:17:50 +01:00
Laurenz dde69276d4 Refactor expressions and create tuples and objects 🧮 2020-01-13 14:36:40 +01:00
Laurenz a8f711d49a Checkpoint 🏁 2020-01-13 11:26:42 +01:00
Laurenz b1e956419d Re-engineer tokenization 🚿 2020-01-11 10:11:14 +01:00
Laurenz a75ddd2c93 Convert spans to line/column format 📑 2020-01-10 13:03:43 +01:00
Laurenz 5dbc7dc5aa Introduce color tokens 🎨 2020-01-09 18:44:29 +01:00
Laurenz a93b1ab003 Formatting 🛀 2020-01-06 12:50:20 +01:00