Fix eval

Revert "next try for "don't abort when given unmatched '}' with 'start-condition stack underflow'. This fixes #751 ""
This reverts commit ed23c8568e. Let's merge this *after* the 1.11.1 release.
2016-01-20 00:26:51 +01:00 · 2016-01-20 00:05:28 +01:00 · 2016-01-19 16:24:16 -05:00 · 2016-01-19 20:35:35 +00:00 · 2016-01-19 21:10:32 +01:00 · 2016-01-19 20:35:51 +01:00
3 changed files with 31 additions and 18 deletions
@@ -1,4 +1,5 @@
 { nix ? { outPath = ./.; revCount = 1234; shortRev = "abcdef"; }
+, nixpkgs ? { outPath = <nixpkgs>; revCount = 1234; shortRev = "abcdef"; }
 , officialRelease ? false
 }:

@@ -234,6 +235,26 @@ let
          touch $out/nix-support/hydra-build-products
        ''); # */

+    tests.evalNixpkgs =
+      import <nixpkgs/pkgs/top-level/make-tarball.nix> {
+        inherit nixpkgs;
+        inherit pkgs;
+        nix = build.x86_64-linux;
+        officialRelease = false;
+      };
+
+    tests.evalNixOS =
+      pkgs.runCommand "eval-nixos" { buildInputs = [ build.x86_64-linux ]; }
+        ''
+          export NIX_DB_DIR=$TMPDIR
+          export NIX_STATE_DIR=$TMPDIR
+          nix-store --init
+
+          nix-instantiate ${nixpkgs}/nixos/release-combined.nix -A tested --dry-run
+
+          touch $out
+        '';
+

    # Aggregate job containing the release-critical jobs.
    release = pkgs.releaseTools.aggregate {
@@ -264,6 +285,8 @@ let
          tests.remoteBuilds
          tests.nix-copy-closure
          tests.binaryTarball
+          tests.evalNixpkgs
+          tests.evalNixOS
        ];
    };

@@ -8,7 +8,6 @@

 %x STRING
 %x IND_STRING
-%x INSIDE_DOLLAR_CURLY


 %{
@@ -94,8 +93,6 @@ URI         [a-zA-Z][a-zA-Z0-9\+\-\.]*\:[a-zA-Z0-9\%\/\?\:\@\&\=\+\$\,\-\_\.\!\~

 %%

-<INITIAL,INSIDE_DOLLAR_CURLY>{
-

 if          { return IF; }
 then        { return THEN; }
@@ -127,15 +124,11 @@ or          { return OR_KW; }
              return INT;
            }

-\$\{        { PUSH_STATE(INSIDE_DOLLAR_CURLY); return DOLLAR_CURLY; }
-\{          { return '{'; }
-}
-
-\}                     { return '}'; }
-<INSIDE_DOLLAR_CURLY>\}      { POP_STATE(); return '}'; }
-
-<INITIAL,INSIDE_DOLLAR_CURLY>\"          { PUSH_STATE(STRING); return '"'; }
+\$\{        { PUSH_STATE(INITIAL); return DOLLAR_CURLY; }
+\{          { PUSH_STATE(INITIAL); return '{'; }
+\}          { POP_STATE(); return '}'; }

+\"          { PUSH_STATE(STRING); return '"'; }
 <STRING>([^\$\"\\]|\$[^\{\"\\]|\\.|\$\\.)*\$/\" |
 <STRING>([^\$\"\\]|\$[^\{\"\\]|\\.|\$\\.)+ {
              /* It is impossible to match strings ending with '$' with one
@@ -144,11 +137,11 @@ or          { return OR_KW; }
              yylval->e = unescapeStr(data->symbols, yytext);
              return STR;
            }
-<STRING>\$\{  { PUSH_STATE(INSIDE_DOLLAR_CURLY); return DOLLAR_CURLY; }
+<STRING>\$\{  { PUSH_STATE(INITIAL); return DOLLAR_CURLY; }
 <STRING>\"  { POP_STATE(); return '"'; }
 <STRING>.   return yytext[0]; /* just in case: shouldn't be reached */

-<INITIAL,INSIDE_DOLLAR_CURLY>\'\'(\ *\n)?     { PUSH_STATE(IND_STRING); return IND_STRING_OPEN; }
+\'\'(\ *\n)?     { PUSH_STATE(IND_STRING); return IND_STRING_OPEN; }
 <IND_STRING>([^\$\']|\$[^\{\']|\'[^\'\$])+ {
                   yylval->e = new ExprIndStr(yytext);
                   return IND_STR;
@@ -165,7 +158,7 @@ or          { return OR_KW; }
                   yylval->e = unescapeStr(data->symbols, yytext + 2);
                   return IND_STR;
                 }
-<IND_STRING>\$\{ { PUSH_STATE(INSIDE_DOLLAR_CURLY); return DOLLAR_CURLY; }
+<IND_STRING>\$\{ { PUSH_STATE(INITIAL); return DOLLAR_CURLY; }
 <IND_STRING>\'\' { POP_STATE(); return IND_STRING_CLOSE; }
 <IND_STRING>\'   {
                   yylval->e = new ExprIndStr("'");
@@ -173,8 +166,6 @@ or          { return OR_KW; }
                 }
 <IND_STRING>.    return yytext[0]; /* just in case: shouldn't be reached */

-<INITIAL,INSIDE_DOLLAR_CURLY>{
-
 {PATH}      { yylval->path = strdup(yytext); return PATH; }
 {HPATH}     { yylval->path = strdup(yytext); return HPATH; }
 {SPATH}     { yylval->path = strdup(yytext); return SPATH; }
@@ -186,7 +177,6 @@ or          { return OR_KW; }

 .           return yytext[0];

-}

 %%

@@ -1 +1 @@
-1.11
+1.11.1
Author	SHA1	Message	Date
Eelco Dolstra	da4495eb17	Fix eval	2016-01-20 00:26:51 +01:00
Eelco Dolstra	b669d3d2e8	Revert "next try for "don't abort when given unmatched '}' with 'start-condition stack underflow'. This fixes #751 "" This reverts commit `ed23c8568e`. Let's merge this after the 1.11.1 release.	2016-01-20 00:05:28 +01:00
Shea Levy	7db05781a6	Merge branch 'lexer-regression-fix' of git://github.com/fkz/nix	2016-01-19 16:24:16 -05:00
Fabian Schmitthenner	ed23c8568e	next try for "don't abort when given unmatched '}' with 'start-condition stack underflow'. This fixes #751 " This reverts commit `8120b6fb8a` and fixes the regression introduced in `8d22b26448`.	2016-01-19 20:35:35 +00:00
Eelco Dolstra	9fff492561	Add tests for Nixpkgs/NixOS evaluation	2016-01-19 21:10:32 +01:00
Eelco Dolstra	ef53735f28	Do a 1.11.1 brown paper bag release	2016-01-19 20:35:51 +01:00
Eelco Dolstra	8120b6fb8a	Revert "don't abort when given unmatched '}' with 'start-condition stack underflow'. This fixes #751 " This reverts commit `8d22b26448`. It breaks Nixpkgs: $ nix-env -qa error: syntax error, unexpected IND_STR, expecting '}', at /home/eelco/Dev/nixpkgs-stable/pkgs/top-level/python-packages.nix:7605:8	2016-01-19 20:33:32 +01:00
Eelco Dolstra	4c8098f30c	Bump version	2016-01-19 14:15:48 +01:00
@@ -1 +1 @@
 .11
 .11.1