sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add kwd_lit again

pull/70/head
Stephan Seitz 2021-04-15 16:50:31 +07:00
parent 12d3a31cbf
commit 3c53430f7c
5 changed files with 37261 additions and 40966 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
grammar.js
Unescape Escape View File

@ -18,7 +18,8 @@ const PREC = {
NORMAL: 1, NORMAL: 1,
PACKAGE_LIT: 2, PACKAGE_LIT: 2,
DOTTET_LIT: 3, DOTTET_LIT: 3,
SPECIAL: 4, KWD_LIT: 4,
SPECIAL: 5,
} }
const SYMBOL_HEAD = const SYMBOL_HEAD =
@ -153,15 +154,15 @@ module.exports = grammar(clojure, {
dotted_sym_lit: $ => prec.left(PREC.DOTTET_LIT, seq($.sym_lit, repeat1(seq(".", $.sym_lit)))), dotted_sym_lit: $ => prec.left(PREC.DOTTET_LIT, seq($.sym_lit, repeat1(seq(".", $.sym_lit)))),
package_lit: $ => prec(PREC.PACKAGE_LIT, seq( package_lit: $ => prec(PREC.PACKAGE_LIT, seq(
optional(field('package', choice($.dotted_sym_lit, $.sym_lit))), field('package', choice($.dotted_sym_lit, $.sym_lit)), // Make optional, instead of keywords?
choice(':', '::'), choice(':', '::'),
field('symbol', choice($.dotted_sym_lit, $.sym_lit)) field('symbol', choice($.dotted_sym_lit, $.sym_lit))
)), )),
//kwd_lit: $ => prec(-1, seq( kwd_lit: $ => prec(PREC.KWD_LIT, seq(
//choice(':', '::'), choice(':', '::'),
//$.sym_lit), choice($.sym_lit, $.dotted_sym_lit),
//), )),
sym_lit: $ => sym_lit: $ =>
seq(repeat($._metadata_lit), seq(repeat($._metadata_lit),
@ -172,7 +173,7 @@ module.exports = grammar(clojure, {
$.num_lit, $.num_lit,
$.fancy_literal, $.fancy_literal,
//$.defun_header, //$.defun_header,
//seq($._gap, $.kwd_lit), $.kwd_lit,
$.str_lit, $.str_lit,
$.char_lit, $.char_lit,
$.nil_lit, $.nil_lit,

119
src/grammar.json
Unescape Escape View File

@ -90,6 +90,10 @@
"type": "SYMBOL", "type": "SYMBOL",
"name": "fancy_literal" "name": "fancy_literal"
}, },
{
"type": "SYMBOL",
"name": "kwd_lit"
},
{ {
"type": "SYMBOL", "type": "SYMBOL",
"name": "str_lit" "name": "str_lit"
@ -429,87 +433,34 @@
} }
}, },
"kwd_lit": { "kwd_lit": {
"type": "TOKEN", "type": "PREC",
"value": 4,
"content": { "content": {
"type": "CHOICE", "type": "SEQ",
"members": [ "members": [
{ {
"type": "SEQ", "type": "CHOICE",
"members": [ "members": [
{ {
"type": "STRING", "type": "STRING",
"value": ":" "value": ":"
}, },
{ {
"type": "CHOICE", "type": "STRING",
"members": [ "value": "::"
{
"type": "STRING",
"value": "/"
},
{
"type": "SEQ",
"members": [
{
"type": "PATTERN",
"value": "[^\\f\\n\\r\\t ()\\[\\]{}\"@~^;`\\\\,:/\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
},
{
"type": "REPEAT",
"content": {
"type": "CHOICE",
"members": [
{
"type": "PATTERN",
"value": "[:'/]"
},
{
"type": "PATTERN",
"value": "[^\\f\\n\\r\\t ()\\[\\]{}\"@~^;`\\\\,:/\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
}
]
}
}
]
}
]
} }
] ]
}, },
{ {
"type": "SEQ", "type": "CHOICE",
"members": [ "members": [
{ {
"type": "TOKEN", "type": "SYMBOL",
"content": { "name": "sym_lit"
"type": "STRING",
"value": "::"
}
}, },
{ {
"type": "SEQ", "type": "SYMBOL",
"members": [ "name": "dotted_sym_lit"
{
"type": "PATTERN",
"value": "[^\\f\\n\\r\\t ()\\[\\]{}\"@~^;`\\\\,:/\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
},
{
"type": "REPEAT",
"content": {
"type": "CHOICE",
"members": [
{
"type": "PATTERN",
"value": "[:'/]"
},
{
"type": "PATTERN",
"value": "[^\\f\\n\\r\\t ()\\[\\]{}\"@~^;`\\\\,:/\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
}
]
}
}
]
} }
] ]
} }
@ -913,7 +864,7 @@
"members": [ "members": [
{ {
"type": "PREC", "type": "PREC",
"value": 4, "value": 5,
"content": { "content": {
"type": "SYMBOL", "type": "SYMBOL",
"name": "defun" "name": "defun"
@ -921,7 +872,7 @@
}, },
{ {
"type": "PREC", "type": "PREC",
"value": 4, "value": 5,
"content": { "content": {
"type": "SYMBOL", "type": "SYMBOL",
"name": "loop_macro" "name": "loop_macro"
@ -2539,29 +2490,21 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "CHOICE", "type": "FIELD",
"members": [ "name": "package",
{ "content": {
"type": "FIELD", "type": "CHOICE",
"name": "package", "members": [
"content": { {
"type": "CHOICE", "type": "SYMBOL",
"members": [ "name": "dotted_sym_lit"
{ },
"type": "SYMBOL", {
"name": "dotted_sym_lit" "type": "SYMBOL",
}, "name": "sym_lit"
{
"type": "SYMBOL",
"name": "sym_lit"
}
]
} }
}, ]
{ }
"type": "BLANK"
}
]
}, },
{ {
"type": "CHOICE", "type": "CHOICE",

121
src/node-types.json
Unescape Escape View File

@ -43,6 +43,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -240,6 +244,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -371,6 +379,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -501,6 +513,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -682,6 +698,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -818,6 +838,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -940,6 +964,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -1134,6 +1162,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -1241,6 +1273,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -1357,6 +1393,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -1497,6 +1537,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -1579,6 +1623,25 @@
] ]
} }
}, },
{
"type": "kwd_lit",
"named": true,
"fields": {},
"children": {
"multiple": false,
"required": true,
"types": [
{
"type": "dotted_sym_lit",
"named": true
},
{
"type": "sym_lit",
"named": true
}
]
}
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true, "named": true,
@ -1663,6 +1726,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -1924,6 +1991,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -2124,7 +2195,7 @@
"fields": { "fields": {
"package": { "package": {
"multiple": false, "multiple": false,
"required": false, "required": true,
"types": [ "types": [
{ {
"type": "dotted_sym_lit", "type": "dotted_sym_lit",
@ -2226,6 +2297,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -2402,6 +2477,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -2586,6 +2665,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -2708,6 +2791,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -2869,6 +2956,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -3124,6 +3215,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -3265,6 +3360,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -3401,6 +3500,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -3557,6 +3660,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -3751,6 +3858,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -3858,6 +3969,10 @@
"type": "include_reader_macro", "type": "include_reader_macro",
"named": true "named": true
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "list_lit", "type": "list_lit",
"named": true "named": true
@ -4133,10 +4248,6 @@
"type": "into", "type": "into",
"named": false "named": false
}, },
{
"type": "kwd_lit",
"named": true
},
{ {
"type": "loop", "type": "loop",
"named": false "named": false

77968
src/parser.c
View File

File diff suppressed because it is too large Load Diff

4
test/corpus/basic.txt
Unescape Escape View File

@ -498,9 +498,9 @@ Keywords
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(source (source
(package_lit (kwd_lit
(sym_lit)) (sym_lit))
(package_lit (kwd_lit
(dotted_sym_lit (dotted_sym_lit
(sym_lit) (sym_lit)
(sym_lit)))) (sym_lit))))