Re: [GSOC][PATCH] userdiff: add support for Scheme
- From
Johannes Sixt <j6t@kdbg.org>
- Date
- Mar 27, 2021, 23:46 UTC
- Message-ID
- <3def82fd-71a7-3ad9-0fa2-48598bfd3313@kdbg.org>
- In-Reply-To
- <20210327173938.59391-1-raykar.ath@gmail.com>
Am 27.03.21 um 18:39 schrieb Atharva Raykar:
Show 8 quoted lines
> - By best-effort attempt at the wordregex, I mean that it is a little > more permissive than it has to be, as it accepts a few words that are > technically invalid in Scheme. > Making it handle all cases like numbers and identifiers with separate > regexen would be greatly complicated (Eg: #x#e10.2f3 is a valid number > but #x#f10.2e3 is not; 10t1 is a valid identifier, but 10s1 is a number > -- my wordregex just clubs all of these into a generic 'word match' which > trades of granularity for simplicity, and it usually does the right thing).
It is ok to have regex that capture tokens that are not valid. A userdiff driver can assume that it operates only text that is valid in the language.
Show 10 quoted lines
> diff --git a/t/t4018/scheme-define-syntax b/t/t4018/scheme-define-syntax > new file mode 100644 > index 0000000000..603b99cea4 > --- /dev/null > +++ b/t/t4018/scheme-define-syntax > @@ -0,0 +1,8 @@ > +(define-syntax define-test-suite RIGHT > + (syntax-rules () > + ((_ suite-name (name test) ChangeMe ...) > + (define suite-name
This test is suspicious. Notice the "ChangeMe" above? That is sufficient to let the test case succeed. The "ChangeMe" in the last line below should be the only one.
But then there is this indented '(define' that is not marked as RIGHT, and I wonder how is it different from...
Show 13 quoted lines
> + (let ((tests > + `((name . ,test) ...))) > + (lambda () > + (ChangeMe 'suite-name tests))))))) > \ No newline at end of file > diff --git a/t/t4018/scheme-local-define b/t/t4018/scheme-local-define > new file mode 100644 > index 0000000000..90e75dcce8 > --- /dev/null > +++ b/t/t4018/scheme-local-define > @@ -0,0 +1,4 @@ > +(define (higher-order) > + (define local-function RIGHT
... this one, which is also indented and *is* marked as RIGHT.
BTW, it's good to see test cases for both indented and not-indented trigger lines.
> + (lambda (x) > + (car "this is" "ChangeMe")))) > \ No newline at end of file
Show 10 quoted lines
> diff --git a/userdiff.c b/userdiff.c
> index 3f81a2261c..c51a8c98ba 100644
> --- a/userdiff.c
> +++ b/userdiff.c
> @@ -191,6 +191,14 @@ PATTERNS("rust",
> "[a-zA-Z_][a-zA-Z0-9_]*"
> "|[0-9][0-9_a-fA-Fiosuxz]*(\\.([0-9]*[eE][+-]?)?[0-9_fF]*)?"
> "|[-+*\\/<>%&^|=!:]=|<<=?|>>=?|&&|\\|\\||->|=>|\\.{2}=|\\.{3}|::"),
> +PATTERNS("scheme",
> + "^[\t ]*(\\(define-?.*)$",This "optional hyphen followed by anything" in the regex is strange. Wouldn't that also capture a line that looks like, e.g.,
(defined-foo bar)
Perhaps we want "define[- \t].*" in the regex?
Show 10 quoted lines
> + /*
> + * Scheme allows symbol names to have any character,
> + * as long as it is not a form of a parenthesis.
> + * The spaces must be escaped.
> + */
> + "(\\.|[^][)(\\}\\{ ])+"),
> PATTERNS("bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
> "[={}\"]|[^={}\" \t]+"),
> PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
> -- Hannes