From b260394263f8db363e0b1bd335edcead011800c3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 1 Feb 2019 11:48:44 +0000 Subject: [PATCH] Add comment about order to all sass.hpp includes --- src/ast.hpp | 3 +++ src/ast2c.cpp | 3 +++ src/ast_sel_cmp.cpp | 3 +++ src/ast_selectors.hpp | 3 +++ src/ast_supports.cpp | 5 ++++- src/ast_supports.hpp | 3 +++ src/ast_values.cpp | 3 +++ src/ast_values.hpp | 3 +++ src/base64vlq.cpp | 3 +++ src/check_nesting.cpp | 3 +++ src/color_maps.cpp | 3 +++ src/constants.cpp | 3 +++ src/context.cpp | 3 +++ src/cssize.cpp | 3 +++ src/emitter.hpp | 6 +++++- src/error_handling.cpp | 3 +++ src/eval.cpp | 3 +++ src/expand.cpp | 3 +++ src/extend.cpp | 3 +++ src/file.cpp | 3 +++ src/fn_colors.cpp | 5 ++++- src/fn_numbers.cpp | 2 ++ src/fn_strings.cpp | 3 +++ src/fn_utils.cpp | 3 +++ src/inspect.cpp | 3 +++ src/lexer.cpp | 3 +++ src/listize.cpp | 3 +++ src/listize.hpp | 2 ++ src/node.cpp | 3 +++ src/operators.cpp | 3 +++ src/output.cpp | 3 +++ src/parser.cpp | 3 +++ src/plugins.cpp | 3 +++ src/position.cpp | 3 +++ src/prelexer.cpp | 3 +++ src/remove_placeholders.cpp | 3 +++ src/sass.cpp | 5 ++++- src/sass_context.cpp | 3 +++ src/sass_functions.cpp | 3 +++ src/sass_util.cpp | 3 +++ src/sass_values.cpp | 3 +++ src/source_map.cpp | 3 +++ src/subset_map.cpp | 5 ++++- src/to_value.cpp | 3 +++ src/utf8_string.cpp | 3 +++ src/util.hpp | 3 +++ src/values.cpp | 3 +++ 47 files changed, 145 insertions(+), 5 deletions(-) diff --git a/src/ast.hpp b/src/ast.hpp index a77aade25..c6af3ed62 100644 --- a/src/ast.hpp +++ b/src/ast.hpp @@ -1,7 +1,10 @@ #ifndef SASS_AST_H #define SASS_AST_H +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include diff --git a/src/ast2c.cpp b/src/ast2c.cpp index 6498c5d30..b529234bf 100644 --- a/src/ast2c.cpp +++ b/src/ast2c.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "ast2c.hpp" #include "ast.hpp" diff --git a/src/ast_sel_cmp.cpp b/src/ast_sel_cmp.cpp index 8be5d7538..531f8ee19 100644 --- a/src/ast_sel_cmp.cpp +++ b/src/ast_sel_cmp.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "ast.hpp" #include "context.hpp" #include "node.hpp" diff --git a/src/ast_selectors.hpp b/src/ast_selectors.hpp index c8039dee5..a0663b3dc 100644 --- a/src/ast_selectors.hpp +++ b/src/ast_selectors.hpp @@ -1,7 +1,10 @@ #ifndef SASS_AST_SEL_H #define SASS_AST_SEL_H +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include diff --git a/src/ast_supports.cpp b/src/ast_supports.cpp index 087f14f0d..60136d63e 100644 --- a/src/ast_supports.cpp +++ b/src/ast_supports.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "ast.hpp" #include "context.hpp" #include "node.hpp" @@ -124,4 +127,4 @@ namespace Sass { ///////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////// -} \ No newline at end of file +} diff --git a/src/ast_supports.hpp b/src/ast_supports.hpp index 2caf82b5c..506d3a3b6 100644 --- a/src/ast_supports.hpp +++ b/src/ast_supports.hpp @@ -1,7 +1,10 @@ #ifndef SASS_AST_SUPPORTS_H #define SASS_AST_SUPPORTS_H +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include diff --git a/src/ast_values.cpp b/src/ast_values.cpp index ffcd27f86..79e6c8a9f 100644 --- a/src/ast_values.cpp +++ b/src/ast_values.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "ast.hpp" #include "context.hpp" #include "node.hpp" diff --git a/src/ast_values.hpp b/src/ast_values.hpp index 0df859199..59cce1216 100644 --- a/src/ast_values.hpp +++ b/src/ast_values.hpp @@ -1,7 +1,10 @@ #ifndef SASS_AST_VALUES_H #define SASS_AST_VALUES_H +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include diff --git a/src/base64vlq.cpp b/src/base64vlq.cpp index be2fb4926..d618dae5b 100644 --- a/src/base64vlq.cpp +++ b/src/base64vlq.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "base64vlq.hpp" namespace Sass { diff --git a/src/check_nesting.cpp b/src/check_nesting.cpp index b43b03197..dd45e5ff8 100644 --- a/src/check_nesting.cpp +++ b/src/check_nesting.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include "check_nesting.hpp" diff --git a/src/color_maps.cpp b/src/color_maps.cpp index 7ad0c3987..105d6beb2 100644 --- a/src/color_maps.cpp +++ b/src/color_maps.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "ast.hpp" #include "color_maps.hpp" diff --git a/src/constants.cpp b/src/constants.cpp index 67b5b2c7e..aa8eddf27 100644 --- a/src/constants.cpp +++ b/src/constants.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "constants.hpp" namespace Sass { diff --git a/src/context.cpp b/src/context.cpp index 2b493bf53..55f27d206 100644 --- a/src/context.cpp +++ b/src/context.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include diff --git a/src/cssize.cpp b/src/cssize.cpp index 25db8240b..813929719 100644 --- a/src/cssize.cpp +++ b/src/cssize.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include diff --git a/src/emitter.hpp b/src/emitter.hpp index 9e7bdc786..92e77fda5 100644 --- a/src/emitter.hpp +++ b/src/emitter.hpp @@ -1,8 +1,12 @@ #ifndef SASS_EMITTER_H #define SASS_EMITTER_H -#include +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + +#include + #include "sass/base.h" #include "source_map.hpp" #include "ast_fwd_decl.hpp" diff --git a/src/error_handling.cpp b/src/error_handling.cpp index 7c974caf7..efd2a9c6f 100644 --- a/src/error_handling.cpp +++ b/src/error_handling.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "ast.hpp" #include "prelexer.hpp" #include "backtrace.hpp" diff --git a/src/eval.cpp b/src/eval.cpp index 777ffb4af..75767a0ef 100644 --- a/src/eval.cpp +++ b/src/eval.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include diff --git a/src/expand.cpp b/src/expand.cpp index 860720613..587f6e2d3 100644 --- a/src/expand.cpp +++ b/src/expand.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include diff --git a/src/extend.cpp b/src/extend.cpp index 98940573c..4e6f9a1fd 100644 --- a/src/extend.cpp +++ b/src/extend.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "extend.hpp" #include "context.hpp" #include "backtrace.hpp" diff --git a/src/file.cpp b/src/file.cpp index 71b179251..e1b8631e5 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #ifdef _WIN32 # ifdef __MINGW32__ # ifndef off64_t diff --git a/src/fn_colors.cpp b/src/fn_colors.cpp index 43aa3f9ad..129c3fbac 100644 --- a/src/fn_colors.cpp +++ b/src/fn_colors.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include "ast.hpp" @@ -123,7 +126,7 @@ namespace Sass { Signature red_sig = "red($color)"; BUILT_IN(red) - { + { Color_RGBA_Obj color = ARG("$color", Color)->toRGBA(); return SASS_MEMORY_NEW(Number, pstate, color->r()); } diff --git a/src/fn_numbers.cpp b/src/fn_numbers.cpp index 136226f1e..11084ee9f 100644 --- a/src/fn_numbers.cpp +++ b/src/fn_numbers.cpp @@ -1,3 +1,5 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" #include diff --git a/src/fn_strings.cpp b/src/fn_strings.cpp index 8b6ac0e96..450f1e4f8 100644 --- a/src/fn_strings.cpp +++ b/src/fn_strings.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include "utf8.h" #include "ast.hpp" diff --git a/src/fn_utils.cpp b/src/fn_utils.cpp index eef642468..46b644132 100644 --- a/src/fn_utils.cpp +++ b/src/fn_utils.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "parser.hpp" #include "fn_utils.hpp" diff --git a/src/inspect.cpp b/src/inspect.cpp index 176d75bfc..8797bee05 100644 --- a/src/inspect.cpp +++ b/src/inspect.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include diff --git a/src/lexer.cpp b/src/lexer.cpp index be7f67713..73cfdad4c 100644 --- a/src/lexer.cpp +++ b/src/lexer.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include diff --git a/src/listize.cpp b/src/listize.cpp index a18724e45..0dda066e4 100644 --- a/src/listize.cpp +++ b/src/listize.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include diff --git a/src/listize.hpp b/src/listize.hpp index a0f6a96eb..0d9ce8a28 100644 --- a/src/listize.hpp +++ b/src/listize.hpp @@ -1,6 +1,8 @@ #ifndef SASS_LISTIZE_H #define SASS_LISTIZE_H +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" #include diff --git a/src/node.cpp b/src/node.cpp index 1861a668a..e9e3c0209 100644 --- a/src/node.cpp +++ b/src/node.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include "node.hpp" diff --git a/src/operators.cpp b/src/operators.cpp index a8e780e26..c2fa9fa82 100644 --- a/src/operators.cpp +++ b/src/operators.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "operators.hpp" namespace Sass { diff --git a/src/output.cpp b/src/output.cpp index c0e8bd27e..0d5ec7481 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "ast.hpp" #include "output.hpp" #include "util.hpp" diff --git a/src/parser.cpp b/src/parser.cpp index f70f6f398..c74e15f48 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "parser.hpp" #include "file.hpp" #include "inspect.hpp" diff --git a/src/plugins.cpp b/src/plugins.cpp index 180ff2f28..1b9941277 100644 --- a/src/plugins.cpp +++ b/src/plugins.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include "output.hpp" #include "plugins.hpp" diff --git a/src/position.cpp b/src/position.cpp index 312e04ca6..de8f83135 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "position.hpp" namespace Sass { diff --git a/src/prelexer.cpp b/src/prelexer.cpp index 216407af6..020831465 100644 --- a/src/prelexer.cpp +++ b/src/prelexer.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include diff --git a/src/remove_placeholders.cpp b/src/remove_placeholders.cpp index 15cddace2..d36462fae 100644 --- a/src/remove_placeholders.cpp +++ b/src/remove_placeholders.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "remove_placeholders.hpp" #include "context.hpp" #include "inspect.hpp" diff --git a/src/sass.cpp b/src/sass.cpp index 8e91b337c..9405c7c73 100644 --- a/src/sass.cpp +++ b/src/sass.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include @@ -149,4 +152,4 @@ namespace Sass { return sass_copy_c_string(str.c_str()); } -} \ No newline at end of file +} diff --git a/src/sass_context.cpp b/src/sass_context.cpp index f4b1f07ce..cca864f1c 100644 --- a/src/sass_context.cpp +++ b/src/sass_context.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include diff --git a/src/sass_functions.cpp b/src/sass_functions.cpp index bfbf25838..0c1e4064a 100644 --- a/src/sass_functions.cpp +++ b/src/sass_functions.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include "util.hpp" #include "context.hpp" diff --git a/src/sass_util.cpp b/src/sass_util.cpp index 3aef2bc72..b60e64c57 100644 --- a/src/sass_util.cpp +++ b/src/sass_util.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "node.hpp" namespace Sass { diff --git a/src/sass_values.cpp b/src/sass_values.cpp index 5a007df25..c82e50078 100644 --- a/src/sass_values.cpp +++ b/src/sass_values.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include "util.hpp" diff --git a/src/source_map.cpp b/src/source_map.cpp index 2ebf41aea..966dbbb74 100644 --- a/src/source_map.cpp +++ b/src/source_map.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include diff --git a/src/subset_map.cpp b/src/subset_map.cpp index 24513e498..11586f30a 100644 --- a/src/subset_map.cpp +++ b/src/subset_map.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "ast.hpp" #include "subset_map.hpp" @@ -52,4 +55,4 @@ namespace Sass { return get_kv(sel); } -} \ No newline at end of file +} diff --git a/src/to_value.cpp b/src/to_value.cpp index fae6fffe3..affd8dd67 100644 --- a/src/to_value.cpp +++ b/src/to_value.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "ast.hpp" #include "to_value.hpp" diff --git a/src/utf8_string.cpp b/src/utf8_string.cpp index 19425521c..dc61f733f 100644 --- a/src/utf8_string.cpp +++ b/src/utf8_string.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include #include #include diff --git a/src/util.hpp b/src/util.hpp index e98a74246..1bc6f1f0d 100644 --- a/src/util.hpp +++ b/src/util.hpp @@ -1,7 +1,10 @@ #ifndef SASS_UTIL_H #define SASS_UTIL_H +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "sass/base.h" #include "ast_fwd_decl.hpp" diff --git a/src/values.cpp b/src/values.cpp index f840e6033..8cb8ef988 100644 --- a/src/values.cpp +++ b/src/values.cpp @@ -1,4 +1,7 @@ +// sass.hpp must go before all system headers to get the +// __EXTENSIONS__ fix on Solaris. #include "sass.hpp" + #include "sass.h" #include "values.hpp"