wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-04 03:01:47 +02:00
Code Activity

* "Fix expression" -> "Nix expression".

Browse source 
* More refactoring.
This commit is contained in:
Eelco Dolstra 2003-11-18 12:06:07 +00:00
parent b1117ef29d
commit dfc9c64ead
14 changed files with 27 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/nix-instantiate/parser.cc
View file

@ -13,7 +13,6 @@ extern "C" {
#include "aterm.hh"
#include "parser.hh"
#include "shared.hh"
#include "fixexpr.hh"
#include "parse-table.h"
@ -76,12 +75,12 @@ Expr parseExprFromFile(Path path)
if (e) return e;
#endif
/* If `path' refers to a directory, append `/default.fix'. */
/* If `path' refers to a directory, append `/default.nix'. */
struct stat st;
if (stat(path.c_str(), &st))
throw SysError(format("getting status of `%1%'") % path);
if (S_ISDIR(st.st_mode))
path = canonPath(path + "/default.fix");
path = canonPath(path + "/default.nix");
/* Initialise the SDF libraries. */
static bool initialised = false;
@ -95,12 +94,12 @@ Expr parseExprFromFile(Path path)
ATprotect(&parseTable);
parseTable = ATreadFromBinaryString(
(char *) fixParseTable, sizeof fixParseTable);
(char *) nixParseTable, sizeof nixParseTable);
if (!parseTable)
throw Error(format("cannot construct parse table term"));
ATprotect(&lang);
lang = ATmake("Fix");
lang = ATmake("Nix");
if (!SGopenLanguageFromTerm(
(char *) programId.c_str(), lang, parseTable))
throw Error(format("cannot open language"));