Merge pull request #2547 from mgreter/bugfix/compiler-warnings

Fix some compiler warnings
sass · Jan 22, 2018 · 6c10b38 · 6c10b38
2 parents f995957 + f6e29e3
commit 6c10b38
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/cencode.c b/src/cencode.c
@@ -46,6 +46,9 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
 			result = (fragment & 0x0fc) >> 2;
 			*codechar++ = base64_encode_value(result);
 			result = (fragment & 0x003) << 4;
+			#ifndef _MSC_VER
+				__attribute__ ((fallthrough));
+			#endif
 	case step_B:
 			if (plainchar == plaintextend)
 			{
@@ -57,6 +60,9 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
 			result |= (fragment & 0x0f0) >> 4;
 			*codechar++ = base64_encode_value(result);
 			result = (fragment & 0x00f) << 2;
+			#ifndef _MSC_VER
+				__attribute__ ((fallthrough));
+			#endif
 	case step_C:
 			if (plainchar == plaintextend)
 			{

diff --git a/src/debugger.hpp b/src/debugger.hpp
@@ -696,6 +696,8 @@ inline void debug_ast(AST_Node_Ptr node, std::string ind, Env* env)
       case Expression::Concrete_Type::C_ERROR: std::cerr << " [C_ERROR]"; break;
       case Expression::Concrete_Type::FUNCTION: std::cerr << " [FUNCTION]"; break;
       case Expression::Concrete_Type::NUM_TYPES: std::cerr << " [NUM_TYPES]"; break;
+      case Expression::Concrete_Type::VARIABLE: std::cerr << " [VARIABLE]"; break;
+      case Expression::Concrete_Type::FUNCTION_VAL: std::cerr << " [FUNCTION_VAL]"; break;
     }
     std::cerr << std::endl;
   } else if (Cast<Has_Block>(node)) {

diff --git a/src/parser.cpp b/src/parser.cpp
@@ -2769,7 +2769,7 @@ namespace Sass {
         re_selector_list
       >(p)
     ) {
-      bool could_be_property = peek< sequence< exactly<'-'>, exactly<'-'> > >(p);
+      bool could_be_property = peek< sequence< exactly<'-'>, exactly<'-'> > >(p) != 0;
       while (p < q) {
         // did we have interpolations?
         if (*p == '#' && *(p+1) == '{') {