Code cleanup (duplicates, typos, naming)

Author: mgreter

include/sass/compiler.h

@@ -118,6 +118,12 @@ extern "C" {
   // Note: LibSass does not write the file, implementers should write to this path.
   ADDAPI void ADDCALL sass_compiler_set_srcmap_path(struct SassCompiler* compiler, const char* path);
 
+  // Getter for source-map path (where to store the source-mapping).
+  // Note: if path is not explicitly given, we will deduct one from input path.
+  // Note: the value will only be deducted after the main render phase is completed.
+  // Note: LibSass does not write the file, implementers should write to this path.
+  ADDAPI const char* ADDCALL sass_compiler_get_srcmap_path(struct SassCompiler* compiler);
+
   // Setter for source-map root (simply passed to the resulting srcmap info).
   // Note: if not given, no root attribute will be added to the srcmap info object.
   ADDAPI void ADDCALL sass_compiler_set_srcmap_root(struct SassCompiler* compiler, const char* root);

src/ast_expressions.cpp

@@ -106,12 +106,12 @@ namespace Sass {
       if (auto str = item->isaString()) { // Ex
         auto& value = str->value();
         for (size_t i = 0; i < value.size(); i++) {
-          if (value[i] == $single_quote) return $double_quote;
-          if (value[i] == $double_quote) containsDoubleQuote = true;
+          if (value[i] == $apos) return $quote;
+          if (value[i] == $quote) containsDoubleQuote = true;
         }
       }
     }
-    return containsDoubleQuote ? $single_quote : $double_quote;
+    return containsDoubleQuote ? $apos : $quote;
   }
 
   PlainCssCallable2::PlainCssCallable2(

src/ast_expressions.hpp

@@ -283,7 +283,6 @@ namespace Sass {
   {
     ADD_CONSTREF(EnvKey, name);
     ADD_REF(sass::vector<EnvRef>, vidxs);
-    // ADD_REF(EnvRef, vidx2);
     ADD_CONSTREF(sass::string, ns);
     ADD_PROPERTY(bool, withinLoop);
   public:

src/ast_selectors.hpp

@@ -252,7 +252,7 @@ namespace Sass {
     // Returns whether this is a private selector.
     // That is, whether it begins with `-` or `_`.
     bool isPrivate() const {
-      return name_[0] == Character::$dash
+      return name_[0] == Character::$minus
         || name_[0] == Character::$underscore;
     }
 

src/ast_statements.hpp

@@ -748,14 +748,11 @@ namespace Sass {
   class AssignRule final : public Statement
   {
   private:
+    ADD_REF(EnvRef, vidx);
     ADD_CONSTREF(EnvKey, variable);
     ADD_CONSTREF(sass::string, ns);
     ADD_CONSTREF(ExpressionObj, value);
-    ADD_REF(sass::vector<EnvRef>, vidxs);
-
-    ADD_REF(EnvRef, vidx2);
     ADD_PROPERTY(bool, withinLoop);
-
     ADD_CONSTREF(bool, is_default); // ToDO rename
     ADD_CONSTREF(bool, is_global); // ToDO rename
   public:

src/capi_compiler.cpp

@@ -115,14 +115,16 @@ namespace Sass {
     compiler.content = std::move(output.buffer);
 
     // Create options to render source map and footer.
-    SrcMapOptions options(compiler.srcmap_options);
+    SrcMapOptions& options(compiler.srcmap_options);
     // Deduct some options always from original values.
     // ToDo: is there really any need to customize this?
     if (options.origin.empty() || options.origin == "stream://stdout") {
       options.origin = compiler.getOutputPath();
     }
     if (options.path.empty() || options.path == "stream://stdout") {
-      options.path = options.origin + ".map";
+      if (!options.origin.empty() && options.origin != "stream://stdout") {
+        options.path = options.origin + ".map";
+      }
     }
 
     switch (options.mode) {
@@ -507,6 +509,16 @@ extern "C" {
     Compiler::unwrap(compiler).srcmap_options.path = path;
   }
 
+  // Getter for source-map path (where to store the source-mapping).
+  // Note: if path is not explicitly given, we will deduct one from input path.
+  // Note: the value will only be deducted after the main render phase is completed.
+  // Note: LibSass does not write the file, implementers should write to this path.
+  const char* ADDCALL sass_compiler_get_srcmap_path(struct SassCompiler* compiler)
+  {
+    const sass::string& path(Compiler::unwrap(compiler).srcmap_options.path);
+    return path.empty() ? nullptr : path.c_str();
+  }
+
   // Setter for source-map root (simply passed to the resulting srcmap info).
   // Note: if not given, no root attribute will be added to the srcmap info object.
   void ADDCALL sass_compiler_set_srcmap_root(struct SassCompiler* compiler, const char* root)

src/capi_sass.hpp

@@ -216,7 +216,7 @@ namespace Sass {
     // Init everything to false
     SrcMapOptions() :
       mode(SASS_SRCMAP_NONE),
-      embed_contents(true),
+      embed_contents(false),
       file_urls(false)
     {}
 

src/capi_values.hpp

@@ -8,17 +8,4 @@
 // to get the __EXTENSIONS__ fix on Solaris.
 #include "capi_sass.hpp"
 
-  // Getter for callee entry
-  // const char* ADDCALL sass_callee_get_name(struct SassCallee* entry) { return entry->name; }
-  // const char* ADDCALL sass_callee_get_path(struct SassCallee* entry) { return entry->path; }
-  // uint32_t ADDCALL sass_callee_get_line(struct SassCallee* entry) { return entry->line; }
-  // uint32_t ADDCALL sass_callee_get_column(struct SassCallee* entry) { return entry->column; }
-  // enum Sass_Callee_Type ADDCALL sass_callee_get_type(struct SassCallee* entry) { return entry->type; }
-
-
-  // Explicit functions to take ownership of the memory
-  // Resets our own property since we do not know if it is still alive
-  // char* ADDCALL sass_import_take_source(struct SassImport* entry) { char* ptr = entry->source; entry->source = 0; return ptr; }
-  // char* ADDCALL sass_import_take_srcmap(struct SassImport* entry) { char* ptr = entry->srcmap; entry->srcmap = 0; return ptr; }
-
 #endif

src/character.hpp

@@ -44,13 +44,13 @@ namespace Sass {
     }
 
     // Returns whether [character] is
-    // starting a utf8 multibyte sequence.
+    // starting a utf8 multi-byte sequence.
     inline bool isUtf8StartByte(uint8_t character) {
       return (character & 192) == 192;
     }
 
     // Returns whether [character] is
-    // part of a utf8 multibyte sequence.
+    // part of a utf8 multi-byte sequence.
     inline bool isUtf8Continuation(uint8_t character) {
       return (character & 192) == 128;
     }

src/charcode.hpp

@@ -42,9 +42,6 @@ namespace Sass {
     const uint8_t $bs = 0x08;
 
     // "Horizontal Tab" control character.
-    const uint8_t $ht = 0x09;
-
-    // "Horizontal Tab" control character, common name.
     const uint8_t $tab = 0x09;
 
     // "Line feed" control character.
@@ -126,63 +123,30 @@ namespace Sass {
     // Character '!'.
     const uint8_t $exclamation = 0x21;
 
-    // Character '"', short name.
-    const uint8_t $quot = 0x22;
-
     // Character '"'.
     const uint8_t $quote = 0x22;
 
-    // Character '"'.
-    const uint8_t $double_quote = 0x22;
-
-    // Character '"'.
-    const uint8_t $quotation = 0x22;
-
     // Character '#'.
     const uint8_t $hash = 0x23;
 
-    // Character '$'.
-    const uint8_t $$ = 0x24;
-
     // Character '$'.
     const uint8_t $dollar = 0x24;
 
     // Character '%'.
     const uint8_t $percent = 0x25;
 
-    // Character '&', short name.
-    const uint8_t $amp = 0x26;
-
     // Character '&'.
     const uint8_t $ampersand = 0x26;
 
     // Character "'".
     const uint8_t $apos = 0x27;
 
-    // Character '''.
-    const uint8_t $apostrophe = 0x27;
-
-    // Character '''.
-    const uint8_t $single_quote = 0x27;
-
     // Character '('.
     const uint8_t $lparen = 0x28;
 
-    // Character '('.
-    const uint8_t $open_paren = 0x28;
-
-    // Character '('.
-    const uint8_t $open_parenthesis = 0x28;
-
     // Character ')'.
     const uint8_t $rparen = 0x29;
 
-    // Character ')'.
-    const uint8_t $close_paren = 0x29;
-
-    // Character ')'.
-    const uint8_t $close_parenthesis = 0x29;
-
     // Character '*'.
     const uint8_t $asterisk = 0x2A;
 
@@ -195,24 +159,12 @@ namespace Sass {
     // Character '-'.
     const uint8_t $minus = 0x2D;
 
-    // Character '-'.
-    const uint8_t $dash = 0x2D;
-
     // Character '.'.
     const uint8_t $dot = 0x2E;
 
-    // Character '.'.
-    const uint8_t $fullstop = 0x2E;
-
     // Character '/'.
     const uint8_t $slash = 0x2F;
 
-    // Character '/'.
-    const uint8_t $solidus = 0x2F;
-
-    // Character '/'.
-    const uint8_t $division = 0x2F;
-
     // Character '0'.
     const uint8_t $0 = 0x30;
 
@@ -252,30 +204,12 @@ namespace Sass {
     // Character '<'.
     const uint8_t $lt = 0x3C;
 
-    // Character '<'.
-    const uint8_t $less_than = 0x3C;
-
-    // Character '<'.
-    const uint8_t $langle = 0x3C;
-
-    // Character '<'.
-    const uint8_t $open_angle = 0x3C;
-
     // Character '='.
     const uint8_t $equal = 0x3D;
 
     // Character '>'.
     const uint8_t $gt = 0x3E;
 
-    // Character '>'.
-    const uint8_t $greater_than = 0x3E;
-
-    // Character '>'.
-    const uint8_t $rangle = 0x3E;
-
-    // Character '>'.
-    const uint8_t $close_angle = 0x3E;
-
     // Character '?'.
     const uint8_t $question = 0x3F;
 
@@ -363,18 +297,12 @@ namespace Sass {
     // Character '['.
     const uint8_t $lbracket = 0x5B;
 
-    // Character '['.
-    const uint8_t $open_bracket = 0x5B;
-
     // Character '\'.
     const uint8_t $backslash = 0x5C;
 
     // Character ']'.
     const uint8_t $rbracket = 0x5D;
 
-    // Character ']'.
-    const uint8_t $close_bracket = 0x5D;
-
     // Character '^'.
     const uint8_t $circumflex = 0x5E;
 
@@ -480,9 +408,6 @@ namespace Sass {
     // Character '{'.
     const uint8_t $lbrace = 0x7B;
 
-    // Character '{'.
-    const uint8_t $open_brace = 0x7B;
-
     // Character '|'.
     const uint8_t $pipe = 0x7C;
 
@@ -492,9 +417,6 @@ namespace Sass {
     // Character '}'.
     const uint8_t $rbrace = 0x7D;
 
-    // Character '}'.
-    const uint8_t $close_brace = 0x7D;
-
     // Character '~'.
     const uint8_t $tilde = 0x7E;