diff options
| author | Tim King <taking@google.com> | 2015-12-18 17:19:07 -0800 |
|---|---|---|
| committer | Tim King <taking@google.com> | 2015-12-18 17:19:07 -0800 |
| commit | 5f207ba01302c3245e169bfbe2ed91ad0cd659cd (patch) | |
| tree | e1131e8c2891e283ab028fba6a7a677bb4ac9f5f /src/expr/node.h | |
| parent | 7e4468ba0aa0b08eeb4ba1a86b1fdd839ae169d6 (diff) | |
Modifying emptyset.h and sexpr. Adding SetLanguage.
- Modifies expr/emptyset.h to use SetType only as an incomplete type within expr/emptyset.h. This breaks the include cycle between expr/emptyset.h, expr/expr.h and expr/type.h.
- Refactors SExpr to avoid a potentially infinite cycle. This is likely overkill, but it works.
- Moving Expr::setlanguage and related utilities out of the Expr class and into their own file. This allows files in util/ to know the output language set on an ostream.
Diffstat (limited to 'src/expr/node.h')
| -rw-r--r-- | src/expr/node.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/expr/node.h b/src/expr/node.h index 384dbcc03..f345ba552 100644 --- a/src/expr/node.h +++ b/src/expr/node.h @@ -38,6 +38,7 @@ #include "expr/metakind.h" #include "expr/expr.h" #include "options/language.h" +#include "options/set_language.h" #include "util/configuration.h" #include "util/utility.h" #include "util/hash.h" @@ -864,7 +865,7 @@ public: /** * IOStream manipulator to set the output language for Exprs. */ - typedef expr::ExprSetLanguage setlanguage; + typedef language::SetLanguage setlanguage; /** * Very basic pretty printer for Node. |