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
ed4fdcb0ad
Par nodes 🧳
2020-08-04 11:46:04 +02:00
dbfb3d2ced
Formatting, documentation and small improvements 🧽
2020-08-03 16:04:55 +02:00
5a8f2fb73d
Replace body! macro with functions 🧰
2020-08-02 22:21:58 +02:00
266d457292
Refactor model into tree 🛒
2020-08-02 22:05:49 +02:00
d5ff97f42e
Move binary into separate crate and tidy dependencies 🎭
2020-08-02 16:56:14 +02:00
533374db14
Refactor argument parsing 🔬
2020-08-02 16:31:34 +02:00
efb78831a7
Unify font and page functions 💕
...
- Removes font weight and width warnings for now, will be added again later
- Adds a bit hacky get_first function for tuples, will be refactored soon anyway
2020-08-02 11:06:45 +02:00
659248d52f
Raw lengths 🚲
...
Replace unitless length with raw f64 and introduce length type with unit.
2020-08-01 19:15:55 +02:00
06dbac6efd
Port font handling to fontdock and ttf-parser 🛳
...
- Use fontdock for indexing fonts and querying
- Typst binary now automatically indexes and uses system fonts in addition to a fixed font folder!
- Removes subsetting support for now (was half-finished anyways, plan is to use harfbuzz for subsetting in the future)
- Adds font width configuration support
2020-08-01 00:10:54 +02:00
8ca80fc7da
Include parens in expression's span ( fixes #4 ) ☘
2020-07-29 18:13:52 +02:00
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
9672d43200
Improve argument naming and fix grammar in comment ♻
2020-07-29 17:38:14 +02:00
53ca5a7fc5
Refactor parser 🚇
2020-07-27 13:47:29 +02:00
9f400042cb
Streamline parser and tokenizer test code ✈
2020-07-26 19:14:23 +02:00
ea64ce9aeb
Better distinguish function names in tokenizer from parser ✂
2020-07-26 18:08:08 +02:00
e2ef4f64e7
Rename errors to problems and make error! macro more ergonomic 🧼
...
Also adds a `warning!` macro.
2020-07-26 17:28:43 +02:00
38a2424742
Remove duplicate spans for func args ❌
2020-07-18 18:02:38 +02:00
332f83ed2d
Some code and styling improvements 🎨
2020-07-18 17:52:12 +02:00
e9a9581252
Spanned object pairs and refactoring 🧵
2020-07-18 16:57:58 +02:00
bb1350cff5
Parsing mathematical expressions ➕
2020-07-18 14:07:53 +02:00
6f1319e91f
Derive copy for RgbaColor and change debug representation 🐞
2020-07-16 16:27:18 +02:00
e96f3830f1
Use FromStr trait and formatting ✨
2020-07-15 23:49:10 +02:00
1683ca87f7
Healed field for RgbaColors, CodeRev feedback 🤝
2020-07-15 20:57:26 +02:00
28c3a797ec
Add named tuples and hex color tokens
2020-07-14 19:09:58 +02:00
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
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
5badb4e8ff
Write lots of parser tests 🌪
2020-02-09 14:14:32 +01:00
4e8359385f
Improve syntax testing framework ♻
...
... and finally expand a few escape sequences in strings.
2020-02-07 22:29:16 +01:00
02dc29d18a
Highlight bold / italic / monospace 🎨
2020-02-06 11:15:48 +01:00
751812f451
Serialize layouts with serde 🔠
2020-02-04 21:36:29 +01:00
e63ce52ae0
Merge `Parsed` and `Layouted` types into `Pass` with `Feedback` 🌝 🎢 🌚
2020-02-04 19:22:23 +01:00
5c11aa7223
Adapt for tonty and fix a few bugs 🚧
2020-02-04 11:22:00 +01:00
f655656fb8
Streamline Key + Value traits 🌊
2020-02-04 09:35:29 +01:00
ec60795575
Port tests 🚁
2020-02-03 15:05:34 +01:00
3150fd5643
Better Debug/Display and Derives 🧽
2020-02-03 12:22:02 +01:00
40ea35cbe7
Upgrade to new toddle interface 🐳
2020-02-03 10:37:50 +01:00
20fb4e7c37
Document everything 📜
2020-01-26 15:51:13 +01:00
0a087cd28b
Reorganize modules 🧱
2020-01-24 16:23:57 +01:00
03fddaf3ae
Non-fatal argument parsing 🌋
2020-01-24 12:44:04 +01:00
78da2bdd5d
Decoupled function parser 🔗 [WIP]
2020-01-21 17:09:31 +01:00
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
277f2d2176
ColorToken serialization + function fix 🚧
2020-01-18 15:58:36 +01:00
70878885f5
Do argument parsing ☑
2020-01-16 23:00:39 +01:00
08b91a265f
Powerful parser testing 🐱 👤
2020-01-16 17:51:04 +01:00
15ad30555b
Parser testing prototype 🥥
2020-01-14 20:17:50 +01:00
dde69276d4
Refactor expressions and create tuples and objects 🧮
2020-01-13 14:36:40 +01:00
6527d31dfb
Merge Characters struct into tokenizer 🔀
2020-01-13 13:02:33 +01:00
a8f711d49a
Checkpoint 🏁
2020-01-13 11:26:42 +01:00
bd702c2029
Span tests ↔
2020-01-11 11:47:07 +01:00
b1e956419d
Re-engineer tokenization 🚿
2020-01-11 10:11:14 +01:00
a75ddd2c93
Convert spans to line/column format 📑
2020-01-10 13:03:43 +01:00
5dbc7dc5aa
Introduce color tokens 🎨
2020-01-09 18:44:29 +01:00
a93b1ab003
Formatting 🛀
2020-01-06 12:50:20 +01:00
2ee5810fec
Asyncify font loading 🪐
2020-01-06 12:41:42 +01:00
bd384a2a63
Re-enable *, _ and `.
2020-01-05 11:18:13 +01:00
b8620121a6
Fix nasty string boundary bug 🏗
2019-12-15 15:43:22 +01:00
f3e461b27c
Paper styles and scalable+default margins 📜
2019-12-15 15:09:09 +01:00
665b4d2aca
More consistent library code and functions 🎄
2019-12-13 23:59:01 +01:00
971ff3a2dc
Implement expression kind for Spanned<T> 👩💻
2019-12-13 14:58:14 +01:00
ff107cf3e7
Tidying up 🧹
2019-12-12 22:19:38 +01:00
f364395e1d
Create parsing test harness ⚡
2019-12-07 14:42:25 +01:00
1099330988
Finish consistent map and add two further convenience maps 🗺
2019-12-06 13:26:44 +01:00
f5b104d0da
Rename crate `typst` -> `typstc` ✏
2019-12-05 20:29:55 +01:00
72a9631b03
Move arg parser into `FuncArgs` and create (incomplete) consistent map 🧭
2019-12-05 19:48:37 +01:00
f72b1505be
Unify error types ♾
2019-12-04 20:20:02 +01:00
9fb31defd0
Expand functionality of function! macro 🛰
2019-12-04 19:35:28 +01:00
5782b82770
Refactor layouting base ♻
2019-11-30 18:54:46 +01:00
b13ed627ff
Better error reporting 🚨
2019-11-30 14:10:35 +01:00
1ece263579
Create easy-to-use argument parser 💎
2019-11-07 19:07:11 +01:00
271af7ed03
Parse keyword arguments 📋
2019-11-06 23:18:48 +01:00
110e4b9cb9
Spans for all parts of functions ✅
2019-10-31 20:26:21 +01:00
65ec3764e5
Basic node spans ✅
2019-10-30 22:52:25 +01:00
b5d8b8f4a5
Token spans 🔜 🔙
2019-10-30 21:13:12 +01:00
ccc4639c7d
Improve documentation comments 📜
2019-10-30 20:13:28 +01:00
b4be25e43b
Prettify peeking and rearrange syntax/parsing modules 🧶
2019-10-24 19:10:03 +02:00
Laurenz
Martin Haug