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

Fix unlabeled constant record argument bug

pull/204/head
Jonathan Arnett 2022-01-01 20:21:52 +07:00
parent 0802930958
commit d22ce5f6ae
5 changed files with 12011 additions and 11724 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
corpus/constants.txt
Unescape Escape View File

@ -16,7 +16,8 @@ const a = <<52:size(4)-unit(4)>>
const a = <<"Hello Gleam 💫":utf8>> const a = <<"Hello Gleam 💫":utf8>>
const a = Node const a = Node
const a = Node() const a = Node()
const a = Node(name: "Billy", age: 52) const a = Cat("Ginny", 1950)
const a = Person(name: "Billy", age: 52)
const a = uri.Uri(host: "github.com") const a = uri.Uri(host: "github.com")
--- ---
@ -104,16 +105,34 @@ const a = uri.Uri(host: "github.com")
value: (record)) value: (record))
(constant (constant
name: (identifier) name: (identifier)
value: (record)) value: (record
(arguments)))
(constant
name: (identifier)
value: (record
(arguments
(argument
value: (string))
(argument
value: (integer)))))
(constant (constant
name: (identifier) name: (identifier)
value: (record value: (record
(record_arg (string)) (arguments
(record_arg (integer)))) (argument
label: (identifier)
value: (string))
(argument
label: (identifier)
value: (integer)))))
(constant (constant
name: (identifier) name: (identifier)
value: (remote_record value: (remote_record
(record_arg (string))))) module: (identifier)
(arguments
(argument
label: (identifier)
value: (string))))))
================= =================
Public constants Public constants
@ -133,7 +152,8 @@ pub const a = <<52:size(4)-unit(4)>>
pub const a = <<"Hello Gleam 💫":utf8>> pub const a = <<"Hello Gleam 💫":utf8>>
pub const a = Node pub const a = Node
pub const a = Node() pub const a = Node()
pub const a = Node(name: "Billy", age: 52) pub const a = Cat("Ginny", 1950)
pub const a = Person(name: "Billy", age: 52)
pub const a = uri.Uri(host: "github.com") pub const a = uri.Uri(host: "github.com")
--- ---
@ -221,13 +241,31 @@ pub const a = uri.Uri(host: "github.com")
value: (record)) value: (record))
(public_constant (public_constant
name: (identifier) name: (identifier)
value: (record)) value: (record
(arguments)))
(public_constant
name: (identifier)
value: (record
(arguments
(argument
value: (string))
(argument
value: (integer)))))
(public_constant (public_constant
name: (identifier) name: (identifier)
value: (record value: (record
(record_arg (string)) (arguments
(record_arg (integer)))) (argument
label: (identifier)
value: (string))
(argument
label: (identifier)
value: (integer)))))
(public_constant (public_constant
name: (identifier) name: (identifier)
value: (remote_record value: (remote_record
(record_arg (string))))) module: (identifier)
(arguments
(argument
label: (identifier)
value: (string))))))

30
grammar.js
Unescape Escape View File

@ -108,19 +108,27 @@ module.exports = grammar({
_constant_record: ($) => _constant_record: ($) =>
seq( seq(
$._upname, $._upname,
optional(alias($._constant_record_arguments, $.arguments))
),
_constant_record_arguments: ($) =>
seq(
"(",
optional( optional(
seq( series_of(alias($._constant_record_argument, $.argument), ",")
"(", ),
optional( ")"
series_of(alias($._constant_record_arg, $.record_arg), ",") ),
), _constant_record_argument: ($) =>
")" seq(
) optional(seq(field("label", $.identifier), ":")),
) field("value", $._constant_value)
),
_constant_remote_record: ($) =>
seq(
field("module", alias($._name, $.identifier)),
".",
$._constant_record
), ),
_constant_record_arg: ($) =>
seq($._name, optional(seq(":", $._constant_value))),
_constant_remote_record: ($) => seq($._name, ".", $._constant_record),
/* Special constant types */ /* Special constant types */
// Versions of $._type, $._type_annotation, etc, that have constraints // Versions of $._type, $._type_annotation, etc, that have constraints

140
src/grammar.json
Unescape Escape View File

@ -824,6 +824,32 @@
"type": "SYMBOL", "type": "SYMBOL",
"name": "_upname" "name": "_upname"
}, },
{
"type": "CHOICE",
"members": [
{
"type": "ALIAS",
"content": {
"type": "SYMBOL",
"name": "_constant_record_arguments"
},
"named": true,
"value": "arguments"
},
{
"type": "BLANK"
}
]
}
]
},
"_constant_record_arguments": {
"type": "SEQ",
"members": [
{
"type": "STRING",
"value": "("
},
{ {
"type": "CHOICE", "type": "CHOICE",
"members": [ "members": [
@ -831,55 +857,34 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "ALIAS",
"value": "(" "content": {
"type": "SYMBOL",
"name": "_constant_record_argument"
},
"named": true,
"value": "argument"
}, },
{ {
"type": "CHOICE", "type": "REPEAT",
"members": [ "content": {
{ "type": "SEQ",
"type": "SEQ", "members": [
"members": [ {
{ "type": "STRING",
"type": "ALIAS", "value": ","
"content": { },
"type": "SYMBOL", {
"name": "_constant_record_arg" "type": "ALIAS",
}, "content": {
"named": true, "type": "SYMBOL",
"value": "record_arg" "name": "_constant_record_argument"
}, },
{ "named": true,
"type": "REPEAT", "value": "argument"
"content": { }
"type": "SEQ", ]
"members": [ }
{
"type": "STRING",
"value": ","
},
{
"type": "ALIAS",
"content": {
"type": "SYMBOL",
"name": "_constant_record_arg"
},
"named": true,
"value": "record_arg"
}
]
}
}
]
},
{
"type": "BLANK"
}
]
},
{
"type": "STRING",
"value": ")"
} }
] ]
}, },
@ -887,16 +892,16 @@
"type": "BLANK" "type": "BLANK"
} }
] ]
},
{
"type": "STRING",
"value": ")"
} }
] ]
}, },
"_constant_record_arg": { "_constant_record_argument": {
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{
"type": "SYMBOL",
"name": "_name"
},
{ {
"type": "CHOICE", "type": "CHOICE",
"members": [ "members": [
@ -904,12 +909,16 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "STRING", "type": "FIELD",
"value": ":" "name": "label",
"content": {
"type": "SYMBOL",
"name": "identifier"
}
}, },
{ {
"type": "SYMBOL", "type": "STRING",
"name": "_constant_value" "value": ":"
} }
] ]
}, },
@ -917,6 +926,14 @@
"type": "BLANK" "type": "BLANK"
} }
] ]
},
{
"type": "FIELD",
"name": "value",
"content": {
"type": "SYMBOL",
"name": "_constant_value"
}
} }
] ]
}, },
@ -924,8 +941,17 @@
"type": "SEQ", "type": "SEQ",
"members": [ "members": [
{ {
"type": "SYMBOL", "type": "FIELD",
"name": "_name" "name": "module",
"content": {
"type": "ALIAS",
"content": {
"type": "SYMBOL",
"name": "_name"
},
"named": true,
"value": "identifier"
}
}, },
{ {
"type": "STRING", "type": "STRING",

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

@ -172,7 +172,7 @@
"fields": {}, "fields": {},
"children": { "children": {
"multiple": true, "multiple": true,
"required": true, "required": false,
"types": [ "types": [
{ {
"type": "argument", "type": "argument",
@ -2799,59 +2799,12 @@
"type": "record", "type": "record",
"named": true, "named": true,
"fields": {}, "fields": {},
"children": {
"multiple": true,
"required": false,
"types": [
{
"type": "arguments",
"named": true
},
{
"type": "record_arg",
"named": true
}
]
}
},
{
"type": "record_arg",
"named": true,
"fields": {},
"children": { "children": {
"multiple": false, "multiple": false,
"required": false, "required": false,
"types": [ "types": [
{ {
"type": "bit_string", "type": "arguments",
"named": true
},
{
"type": "float",
"named": true
},
{
"type": "integer",
"named": true
},
{
"type": "list",
"named": true
},
{
"type": "record",
"named": true
},
{
"type": "remote_record",
"named": true
},
{
"type": "string",
"named": true
},
{
"type": "tuple",
"named": true "named": true
} }
] ]
@ -3111,7 +3064,7 @@
"fields": { "fields": {
"module": { "module": {
"multiple": false, "multiple": false,
"required": false, "required": true,
"types": [ "types": [
{ {
"type": "identifier", "type": "identifier",
@ -3121,15 +3074,15 @@
} }
}, },
"children": { "children": {
"multiple": true, "multiple": false,
"required": false, "required": false,
"types": [ "types": [
{ {
"type": "record", "type": "arguments",
"named": true "named": true
}, },
{ {
"type": "record_arg", "type": "record",
"named": true "named": true
} }
] ]

23448
src/parser.c
View File

File diff suppressed because it is too large Load Diff