9141cba6a9
Deal with the effects of keywords
2021-11-08 12:01:35 +01:00
0663758fbb
Tests
...
- length updates
- dealing with keywords and comments
2021-11-07 19:43:01 +01:00
eba7fc34ef
Incremental-safety based approach
2021-11-06 16:07:21 +01:00
7016ab0d12
Make stuff more elegant
2021-11-03 11:03:00 +01:00
1e4cab393e
Introduce incremental parsing
2021-11-02 12:06:22 +01:00
f5dcb84e36
Make clippy a bit happier
2021-12-30 12:00:12 +01:00
11565a40b3
Set Rules Episode IX: The Rise of Testing
2021-12-21 00:20:24 +01:00
2a3d0f4b39
Set Rules Episode VII: The Set Awakens
2021-12-15 20:27:41 +01:00
738ff7e1f5
Reduce the size of the `FramesEntry` struct and bump edition
2021-12-13 15:56:14 +01:00
f3bdc9d3da
Syntax highlighting
2021-11-30 18:55:50 +01:00
304d9dd110
Small style changes
2021-11-24 17:00:10 +01:00
63c274e7f6
Make clippy happier and remove `Str`
2021-11-15 17:06:43 +01:00
38c5c36241
Final touches
2021-11-08 13:06:11 +01:00
75fffc1f9b
Fine-grained capturing
2021-11-08 11:52:09 +01:00
95866d5fc9
Tidy up AST
2021-11-08 01:37:49 +01:00
41bdafb578
Faster parser
2021-11-06 15:49:39 +01:00
cf2e527a02
Code Review: No Patrick, question marks are not an instrument
2021-11-05 13:46:41 +01:00
5c952d56d0
New error handling
2021-11-05 13:46:41 +01:00
f0c9635db5
Notes
2021-11-05 13:46:41 +01:00
65fac0e57c
Refactoring
...
Co-Authored-By: Martin <mhaug@live.de>
2021-11-05 13:46:41 +01:00
42afb27cef
Add documentation
2021-11-05 13:44:50 +01:00
49fb3cd4e2
Code Review: Life is Like a Box of Iterators
2021-11-05 13:44:50 +01:00
7d34a548cc
Reorganize syntax module
2021-11-05 13:44:50 +01:00
2e7d359e59
Unicode escape error moved to tokenizer
2021-11-05 13:44:49 +01:00
c569e14c07
Improve error handling
2021-11-05 13:44:49 +01:00
1c0ac793d2
Slim `NodeKind` memory footprint
2021-11-05 13:44:49 +01:00
84d35efee3
Less owning, more iterating
2021-11-05 13:44:49 +01:00
4875633acf
Change parser
2021-11-05 13:44:49 +01:00
3968181622
Replace `..` syntax with `range` function
2021-10-25 13:38:32 +02:00
4b2c6334d0
Change precedence of range expression
2021-10-05 17:19:48 +02:00
9e78dbe525
Better function and closure pretty printing
2021-09-30 19:07:17 +02:00
6d26e15fbe
Support `else if`
2021-09-30 19:07:06 +02:00
9e95502622
No hashtag before else anymore
2021-09-30 18:28:25 +02:00
ea921aca5d
Blocks directly in template also scope
2021-09-15 13:12:07 +02:00
5de791d9e6
Rename `SyntaxTree` to `Markup`
...
Also `SyntaxNode` -> `MarkupNode`.
2021-09-15 13:05:01 +02:00
c18321a4c2
Bugfix and tidying
2021-09-15 13:05:00 +02:00
7f48e8fe66
Make user-facing "debug" representation use Debug instead of Display
2021-08-31 16:25:12 +02:00
0dd4ae0a7a
Prune derives
2021-08-21 17:30:21 +02:00
594809e35b
Library functions behave more imperatively
...
- Templates scope state changes
- State-modifying function operate in place instead of returning a template
- Internal template representation contains actual owned nodes instead of a pointer to a syntax tree + an expression map
- No more wide calls
2021-08-17 22:20:37 +02:00
9462fb17b3
Convert single-field structs to tuple structs
2021-08-16 19:15:03 +02:00
7e6e7e928c
Adjust macros to new version
2021-08-14 23:53:57 +02:00
6ae6d86b9c
Separate type for string values
2021-08-14 15:55:39 +02:00
f6814b7732
Optimize memory sizes
2021-08-13 18:17:24 +02:00
6a3385e4e7
Argument collection and spreading
2021-08-13 16:55:45 +02:00
144f208821
Add file information to spans
2021-08-13 14:33:58 +02:00
d002cdf451
Named arguments for user defined functions
2021-08-12 16:07:42 +02:00
ccb4be4da4
Make range-end exclusive
2021-08-12 14:54:52 +02:00
eaa3cbaa9c
Array and dictionary indexing
2021-08-12 13:56:23 +02:00
3c92bad9a7
Pretty-printed diagnostics with traceback
2021-08-01 00:00:36 +02:00
1ee1d078e2
Fatal errors
...
- Makes errors fatal, so that a phase is only reached when all previous phases were error-free
- Parsing still recovers and can produce multiple errors
- Evaluation fails fast and can thus produce only a single error (except for parse errors due to an import)
- The single error that could occur during execution is removed for now
- Removes Value::Error variant
2021-07-30 18:49:19 +02:00
312dcd070c
Move EcoString and OptionExt into util
2021-07-29 11:35:49 +02:00
6a4823461f
Reference-count complex values
...
Rename some nodes types
2021-07-10 23:10:17 +02:00
36b3067c19
Eco string 🌱
2021-07-10 13:07:39 +02:00
02b586cc36
Add lots of Eq impls
2021-07-08 23:16:02 +02:00
fd0b89a1d8
Rename Fill to Paint
2021-07-08 22:33:44 +02:00
551e3af9d0
Replace using with from
2021-07-08 21:16:16 +02:00
5c327e249e
Switch to = for headings once again
2021-07-08 20:03:13 +02:00
5a500fb8a7
Range operator
2021-07-08 19:12:07 +02:00
17e8946884
Remove color literals ( #39 )
2021-06-30 22:32:24 +02:00
470f8001a1
No more collisions between syntax::Tree and layout::Tree
2021-06-30 11:40:27 +02:00
b89cd128ae
Wide calls
2021-06-29 13:49:50 +02:00
6d0911d7a8
Mutable visitor
2021-06-29 10:54:34 +02:00
f64c772b6d
Fix capturing bug
2021-06-27 12:05:36 +02:00
422b8e640f
With expressions
2021-06-26 18:07:05 +02:00
285c2f617b
Cleanse library
...
- Remove doc-comments for Typst functions from library
- Reduce number of library source files
2021-06-26 13:06:37 +02:00
4dbd9285c9
Basic enums
2021-06-11 14:00:06 +02:00
bce553a991
Tidy up
2021-06-09 22:44:40 +02:00
29cfef0a6d
Add a grid layouter
2021-06-09 22:44:40 +02:00
73fa2eda2c
Introduce `fr`s
2021-06-09 22:44:40 +02:00
edff2ae680
Remove template pretty printing
...
Was buggy and pretty useless anyway since it couldn't peek into function templates.
2021-06-09 10:45:49 +02:00
5afb42ad89
Lists with indent-based parsing
...
- Unordered lists with indent-based parsing and basic layout using stacks
- Headings are now also indent based
- Removes syntax functions since they will be superseded by select & transform
2021-06-09 00:37:13 +02:00
f26526ba75
Switch back to hashtags for headings
2021-06-07 18:17:47 +02:00
9f77f09aac
Parse import and include expressions
...
Co-Authored-By: Laurenz <laurmaedje@gmail.com>
2021-05-31 22:33:40 +02:00
72478946c2
Make frames serializable 📚
...
This also makes serialization support non-optional since it's too much feature-management for too little benefit.
2021-04-21 21:17:25 +02:00
5e08028fb3
Syntax functions 🚀
...
This adds overridable functions that markup desugars into. Specifically:
- \ desugars into linebreak
- Two newlines desugar into parbreak
- * desugars into strong
- _ desugars into emph
- = .. desugars into heading
- `..` desugars into raw
2021-03-21 17:50:56 +01:00
264a7dedd4
Scheduled maintenance 🔨
...
- New naming scheme
- TextNode instead of NodeText
- CallExpr instead of ExprCall
- ...
- Less glob imports
- Removes Value::Args variant
- Removes prelude
- Renames Layouted to Fragment
- Moves font into env
- Moves shaping into layout
- Moves frame into separate module
2021-03-19 17:57:31 +01:00
1cfc3c72b5
Show name of user-defined functions in representation 🦋
2021-03-03 18:15:33 +01:00
c94a18833f
Closures and function definitions 🚀
...
Supports:
- Closure syntax: `(x, y) => z`
- Shorthand for a single argument: `x => y`
- Function syntax: `let f(x) = y`
- Capturing of variables from the environment
- Error messages for too few / many passed arguments
Does not support:
- Named arguments
- Variadic arguments with `..`
2021-03-03 17:53:40 +01:00
f084165eab
While loops 🔁
2021-02-24 21:29:32 +01:00
84cdc85ca7
Refresh parser 🌊
2021-02-18 15:06:00 +01:00
e143fd36ef
Refresh tokenizer 🌊
2021-02-18 15:05:49 +01:00
db1659a987
Rename any template to func template ✏
2021-02-12 23:14:29 +01:00
1711b67877
Move all pretty printing into one module and pretty print values 🦋
2021-02-11 17:33:13 +01:00
f9197dcfef
Add arguments value 🏓
2021-02-09 22:56:44 +01:00
06ca740d01
Split evaluation and execution 🔪
2021-02-09 19:46:57 +01:00
e35bbfffcb
Remove captured expression 🗑️
2021-02-07 13:39:05 +01:00
c80e13579f
Dry-clean visitor with a macro 🏜
2021-02-07 13:14:28 +01:00
8de1f8b770
Fix counting bug ✅
2021-02-04 00:38:30 +01:00
d86a5e8a1f
Tidy up raw blocks 🧹
...
- Better trimming (only trim at the end if necessary)
- Fixed block-level layouting
- Improved pretty printing
- Flip inline variable to block
- Flip inline variable to display for math formulas
2021-02-03 21:34:49 +01:00
5943f552e5
Capture variable by slot instead of value 🎣
2021-01-30 16:19:57 +01:00
67047047e8
Interpret two backticks as single-backtick block ✅
2021-01-30 15:24:11 +01:00
89eb8bae49
New syntax 💎
...
- Everything everywhere!
- Blocks with curly braces: {}
- Templates with brackets: []
- Function templates with hashtag: `#[f]`
- Headings with equals sign: `= Introduction`
2021-01-30 12:09:26 +01:00
ac24075469
Moves captures visitor into separate file 🚚
2021-01-30 10:24:51 +01:00
2036663ed2
Capture variables in templates 🔍
2021-01-27 15:05:18 +01:00
ce8138c685
Scope variables in blocks 🏔️
2021-01-27 11:50:51 +01:00
710f88ccb2
For loop patterns 🦚
2021-01-26 23:30:03 +01:00
010ddc4795
More straightforward pretty printing tests 🧹
2021-01-26 21:57:56 +01:00
f006636dd2
Update comments 🔄
2021-01-26 21:23:42 +01:00
ed929dd10c
For loops 🔁
...
(does not support key-value patterns yet)
2021-01-26 21:16:36 +01:00
e847082435
Multi-expression blocks 🛍️
2021-01-26 21:13:52 +01:00
aaa48403cd
Require hashtag for all keywords 💂♀️
2021-01-26 21:11:44 +01:00
16ac3f3ebc
Small improvements ♻
2021-01-26 13:49:04 +01:00
ac788f2082
Many more expressions 🥗
...
Boolean, equality, comparison and assignment expression parsing and evaluation.
2021-01-22 17:16:42 +01:00
0de4f3ed7b
Reorder and fix docs ✔
2021-01-20 21:50:51 +01:00
84ba547c7c
If expressions 🔀
2021-01-20 21:33:13 +01:00
dd246e5bc9
Spans for group and block contents 📐
2021-01-17 16:18:36 +01:00
51efb0f4d6
Port remaining parser tests 🚚
2021-01-16 15:08:03 +01:00
0f0416054f
Move value tests + smarter number formatting 🔢
2021-01-15 15:43:59 +01:00
539735e668
Basic let bindings 🎞
2021-01-13 11:54:50 +01:00
d2ba1b705e
Group and block expressions, unary plus 🧩
2021-01-12 18:55:12 +01:00
105cda0e69
Braced content -> Bracketed templates ✏
2021-01-10 21:38:58 +01:00
3c7d249ae4
Rename token modes ✏
2021-01-10 20:48:32 +01:00
515905d78d
Add angle value 📐
2021-01-10 18:22:06 +01:00
9eac62c31a
Add lots of new tokens 🍪
2021-01-10 17:52:37 +01:00
3b2a28ca8e
Add angle data type 📐
2021-01-09 21:35:36 +01:00
8275b186ba
Remove star-slash token ❌
2021-01-07 16:13:18 +01:00
59d811aeba
Inline literal enum into expression enum 🔀
2021-01-06 21:06:48 +01:00
7b4d4d6002
Pretty printing 🦋
...
- Syntax tree and value pretty printing
- Better value evaluation (top-level strings and content are evaluated plainly, everything else is pretty printed)
2021-01-06 01:32:59 +01:00
2e77b1c836
Better value representations, type function 🌐
2021-01-04 21:29:15 +01:00
77c06ebc24
None literal 🕳
2021-01-04 17:23:52 +01:00
aae67bd572
Move and rename many things 🚛
2021-01-03 00:12:09 +01:00
1c40dc42e7
Dynamic values, Types, Arrays, and Dictionaries 🚀
...
- Identifiers are now evaluated as variables instead of being plain values
- Constants like `left` or `bold` are stored as dynamic values containing the respective rust types
- We now distinguish between arrays and dictionaries to make things more intuitive (at the cost of a bit more complex parsing)
- Spans were removed from collections (arrays, dictionaries), function arguments still have spans for the top-level values to enable good diagnostics
2021-01-02 19:37:10 +01:00
8cad78481c
A few small improvements ♻
2021-01-01 17:54:31 +01:00
2b6ccd8248
Better parser testing ✅
2021-01-01 16:43:58 +01:00
4069f0744d
Parsing improvements 🧽
...
- Simplified scanner code
- Peek eagerly
- Skip whitespace and comments automatically in header mode
- Parse simple block expressions
- Move literal definitions into expression module
- Raw resolving tests
2020-12-31 17:48:56 +01:00
ba3d43f7b2
Refresh function call and dictionary syntax
...
- No colon between function name and arguments, just whitespace
- "Named" arguments (previously "keyword" arguments) use colon instead of equals sign
2020-12-27 20:45:20 +01:00
2336aeb4c3
Tweak parser error messages 🔮
2020-12-16 16:24:06 +01:00
6bbedeaa2c
Better tokenization testing 🌋
...
- Better tokenization test coverage.
- Suffix testing: Each test case is tested with many different suffixes to ensure correct token ends.
- Improves expression parsing (fixes #3 ).
2020-12-16 15:42:02 +01:00
761931405c
Use newly stabilized intra doc links ↩
2020-11-24 16:12:41 +01:00
3a7bfd6bed
Remove unused function `Spanned::value` 🗑
2020-11-16 11:08:36 +01:00
38157b0e0c
Synchronous layout 🪀
2020-10-12 17:10:01 +02:00
c216a4fc26
Flatten ast module back into syntax module 🌪
2020-10-10 22:41:56 +02:00
92c01da360
Switch back to custom geometry types, unified with layout primitives 🏞
2020-10-10 22:19:36 +02:00
13230db68c
Fix some clippy warnings ✔
2020-10-07 19:28:34 +02:00
d2e220245d
Move deco, pass and feedback into diagnostics module ↩
2020-10-07 18:24:47 +02:00
7dd78af459
Rename ast/tree -> ast/node ✏
2020-10-06 20:27:17 +02:00
5a7a32a9ba
Streamline generic layouting primitives 🛫
2020-10-05 16:44:35 +02:00
335fa2d118
Small improvements 🍪
2020-10-04 23:31:35 +02:00
605ab104c5
Better argument parsing 🥙
2020-10-04 22:36:20 +02:00
ef8aa763fa
Shorten some names ↔
2020-10-04 20:22:11 +02:00
a41d7ab47d
Expression evaluation with Eval trait 🧮
2020-10-04 20:07:01 +02:00
f4460f8abd
Style nits 🎈
2020-10-04 19:21:35 +02:00
0f7c70fd93
Separate state and constraints 🧶
2020-10-04 19:06:20 +02:00
54e0da59e3
Small documentation fixes 🧾
2020-10-03 18:15:09 +02:00
91d14d2a22
Evaluate expressions 🧮
2020-10-03 17:56:56 +02:00
95bae5725c
Int, Float, Relative and Linear values 🍉
2020-10-03 15:07:57 +02:00
75e6dbfbe6
Rename bold/italic to strong/emph ✏
2020-10-03 11:18:25 +02:00
904bc392ab
Remove spans from token iterator 🧽
2020-10-02 19:17:47 +02:00
3533268b1f
Refactor parser 🏞
2020-10-02 15:43:29 +02:00
e676ab53dd
Rename compute to eval ✏
2020-10-01 15:13:04 +02:00
7c12f0c07f
Flatten compute module
2020-10-01 15:10:35 +02:00
7fcad452b8
Reorganize ast types 🏕
2020-10-01 15:03:37 +02:00
aafd3c95ca
Rename table to dict ✏
2020-10-01 13:15:10 +02:00
885bfec5d7
Make syntax not depend on parse 📩
...
This would make it possible to split them into two separate crates.
2020-10-01 11:32:48 +02:00
16f0bd430e
Rename CharParser to Scanner ✏
2020-10-01 11:08:53 +02:00
4b9bc66028
Implement low-level char parser 🥜
2020-10-01 01:38:18 +02:00
4077a7c11e
Refactor raw blocks 💱
2020-09-30 18:59:33 +02:00
7cc279f7ae
Replace line/column with byte positions 🔢
2020-09-30 17:25:09 +02:00
3c3730425f
SpanWith trait ↔
2020-09-30 14:38:46 +02:00
3e791e3337
Move decoration into mod.rs 🔙
2020-09-30 12:49:30 +02:00
bc1b4216a8
Reorganize syntax types into two modules 📦
2020-09-30 12:45:33 +02:00
7f8f225cb3
Split up parser into multiple files 🧱
...
Splits up into:
- escaping: resolving of escape sequences
- parser: the parsing code
- tests: all integrated parsing tests
Also moves Ident from the root syntax module into the tree module.
2020-09-03 19:16:19 +02:00
7f575dc098
Rename `skip_white` to `skip_ws` ✒
2020-09-02 16:54:22 +02:00
b2f3730013
Deduplicate and flexibilize code token & node building 🧺
2020-09-01 14:57:25 +02:00
56acc9982c
Formatting 🌿
2020-09-01 13:13:54 +02:00
d986bc4b0a
Add section headings 👨🦲
...
Co-authored-by: Laurenz Mädje <laurmaedje@gmail.com>
2020-09-01 13:10:48 +02:00
1942a25793
Move Nbsp logic to tokenizer 🚛
2020-08-31 14:47:52 +02:00
08433ab79f
Capability to escape the tilde symbol 💨
2020-08-31 12:20:45 +02:00
d0e252d116
Add non-breaking space 🔒
2020-08-31 12:11:34 +02:00
181f756a9e
Format everything with rustfmt! 💚
2020-08-30 22:18:55 +02:00
0d44cf5321
Some alignment ⏭
2020-08-30 22:15:36 +02:00
18c515cde5
Make some code easier for rustfmt 🍦
2020-08-30 22:09:33 +02:00
9861a9583e
Slight simplifications 🍃
2020-08-30 15:16:55 +02:00
c043692c96
Also provide escapes for strings 🗒
2020-08-30 13:39:21 +02:00
7041e0938d
Added Unicode Escaping for body text 👙
2020-08-30 13:21:07 +02:00
d68367f32a
Newlines are complicated, y'all 😱
...
Co-authored-by: laurmaedje@outlook.de <laurmaedje@outlook.de>
2020-08-29 17:20:04 +02:00
1eb584e256
Fixing the build by removing P macro usage 🚑
...
Kids, merge with caution!
2020-08-29 14:10:56 +02:00
5e1fd35926
Merge branch 'master' into code-blocks
2020-08-29 13:58:30 +02:00
c2b6f2dc35
Added code blocks 🚟
2020-08-29 13:53:59 +02:00
236750c35f
Remove par nodes in favor of parbreaks 🔄
...
This basically reverts the earlier change from parbreaks to par nodes because:
- It is simpler and less nested
- It works way better with functions that layout their body inline like `font`, which where buggy before, previously
The original reasons for changing to par nodes were:
- the envisioned design of the layouter at that time (based on dynamic nodes etc.), which is not relevant anymore
- possibly existing benefits with regards to incremental compilation, which are unsure and outweighed by the immediate benefits of the parbreak-representation
2020-08-29 12:02:07 +02:00
2a92428ff6
Do as Dolores says ⚡
2020-08-27 21:47:26 +02:00
37835e4d8e
Better error reporting for nameless function 💡
2020-08-27 21:34:48 +02:00
c099b8b9b4
Fixing the regression 🩹
2020-08-27 20:56:44 +02:00
3abb9ec319
Code review-tastic changes 🦪
2020-08-27 20:42:09 +02:00
3de20f8d38
Add Multi-Invokation 👨👩👧👧
2020-08-27 17:50:57 +02:00
141d69cb60
Remove some obsolete stuff ❌
2020-08-19 21:12:34 +02:00
77dac270a8
Make compute functions possible 💻
...
Ships with the amazing new `rgb` function!
2020-08-19 20:49:01 +02:00
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
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
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
84f30fb735
Remove SpanlessEq 🎃
...
The new solution is slightly hacky, but way more flexible. All types that implement PartialEq can now be compared spanlessly in tests by manipulating a thread-local boolean that is read in Span's PartialEq implementation.
2020-08-15 15:01:55 +02:00
eb9c4b1a49
Add table expressions with arg-parsing functions 🪔
2020-08-15 13:25:31 +02:00
4b723add38
Take references in TryFromExpr 🔭
2020-08-15 11:58:01 +02:00
1a0608930c
Rename Value trait into TryFromExpr ✒
2020-08-15 11:44:18 +02:00
c8f6b5bd5c
Desugar body into last argument 🍩
2020-08-14 20:43:03 +02:00
650c712eab
Add a syntax tree expression kind 🎍
...
This allows bodies to be passed as regular arguments.
2020-08-14 20:19:50 +02:00
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
88151c546f
Use equals sign instead of colon for objects 📍
2020-08-13 20:10:29 +02:00
da2ade6542
Remove redundant `Expr` prefix from tokens 🧽
2020-08-13 20:02:07 +02:00
2467cd6272
Refactor function parsing ♻
2020-08-04 13:48:07 +02:00
Martin Haug
Laurenz