* Use a proper namespace.
* Optimise header file usage a bit. * Compile the parser as C++.
This commit is contained in:
		
							parent
							
								
									aab8812732
								
							
						
					
					
						commit
						75068e7d75
					
				
					 61 changed files with 650 additions and 268 deletions
				
			
		|  | @ -1,11 +1,16 @@ | |||
| #include <algorithm> | ||||
| 
 | ||||
| #include "build.hh" | ||||
| #include "misc.hh" | ||||
| #include "eval.hh" | ||||
| #include "globals.hh" | ||||
| #include "nixexpr-ast.hh" | ||||
| #include "store.hh" | ||||
| #include "util.hh" | ||||
| #include "expr-to-xml.hh" | ||||
| #include "nixexpr-ast.hh" | ||||
| 
 | ||||
| #include <algorithm> | ||||
| 
 | ||||
| 
 | ||||
| namespace nix { | ||||
| 
 | ||||
| 
 | ||||
| static Expr primBuiltins(EvalState & state, const ATermVector & args) | ||||
|  | @ -472,7 +477,7 @@ static Expr primToString(EvalState & state, const ATermVector & args) | |||
|    be sensibly or completely represented (e.g., functions). */ | ||||
| static Expr primToXML(EvalState & state, const ATermVector & args) | ||||
| { | ||||
|     ostringstream out; | ||||
|     std::ostringstream out; | ||||
|     printTermAsXML(strictEvalExpr(state, args[0]), out); | ||||
|     return makeStr(toATerm(out.str())); | ||||
| } | ||||
|  | @ -746,3 +751,6 @@ void EvalState::addPrimOps() | |||
|     addPrimOp("removeAttrs", 2, primRemoveAttrs); | ||||
|     addPrimOp("relativise", 2, primRelativise); | ||||
| } | ||||
| 
 | ||||
|   | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue