mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-10 00:08:07 +02:00
* Bug fix in parsing of /* ... */ comments; due to longest match
regexp there could be only one such comment per file.
This commit is contained in:
parent
463e2817c5
commit
3277c9432a
4 changed files with 14 additions and 2 deletions
|
@ -76,7 +76,7 @@ inherit { return INHERIT; }
|
||||||
|
|
||||||
[ \t\n]+ /* eat up whitespace */
|
[ \t\n]+ /* eat up whitespace */
|
||||||
\#[^\n]* /* single-line comments */
|
\#[^\n]* /* single-line comments */
|
||||||
\/\*(.|\n)*\*\/ /* long comments */
|
\/\*([^*]|\*[^\/])*\*\/ /* long comments */
|
||||||
|
|
||||||
. return yytext[0];
|
. return yytext[0];
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ TESTS = init.sh lang.sh simple.sh dependencies.sh locking.sh parallel.sh \
|
||||||
|
|
||||||
XFAIL_TESTS =
|
XFAIL_TESTS =
|
||||||
|
|
||||||
foo:
|
langtests:
|
||||||
$(TESTS_ENVIRONMENT) ./lang.sh
|
$(TESTS_ENVIRONMENT) ./lang.sh
|
||||||
|
|
||||||
include ../substitute.mk
|
include ../substitute.mk
|
||||||
|
|
1
tests/lang/parse-okay-regression-20041027.exp
Normal file
1
tests/lang/parse-okay-regression-20041027.exp
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Function([NoDefFormal("stdenv"),NoDefFormal("fetchurl")],Call(Select(Var("stdenv"),"mkDerivation"),Attrs([Bind("name",Str("libXi-6.0.1"),Pos("(string)",4,7)),Bind("src",Call(Var("fetchurl"),Attrs([Bind("url",Uri("http://freedesktop.org/~xlibs/release/libXi-6.0.1.tar.bz2"),Pos("(string)",6,8)),Bind("md5",Str("7e935a42428d63a387b3c048be0f2756"),Pos("(string)",7,8))])),Pos("(string)",5,6))])),Pos("(string)",1,2))
|
11
tests/lang/parse-okay-regression-20041027.nix
Normal file
11
tests/lang/parse-okay-regression-20041027.nix
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
{stdenv, fetchurl /* pkgconfig, libX11 */ }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "libXi-6.0.1";
|
||||||
|
src = fetchurl {
|
||||||
|
url = http://freedesktop.org/~xlibs/release/libXi-6.0.1.tar.bz2;
|
||||||
|
md5 = "7e935a42428d63a387b3c048be0f2756";
|
||||||
|
};
|
||||||
|
/* buildInputs = [pkgconfig];
|
||||||
|
propagatedBuildInputs = [libX11]; */
|
||||||
|
}
|
Loading…
Reference in a new issue