Fixup a bit more

Author: mgreter

src/ast_values.cpp

@@ -76,6 +76,9 @@ namespace Sass {
       }
       return true;
     }
+    if (auto m = Cast<Map>(&rhs)) {
+      return m->empty() && empty();
+    }
     return false;
   }
 
@@ -458,18 +461,44 @@ namespace Sass {
     }
     // ensure both have same units
     l.normalize(); r.normalize();
-    Units &lhs_unit = l, &rhs_unit = r;
+    Units& lhs_unit = l, & rhs_unit = r;
     if (!(lhs_unit == rhs_unit)) {
       /* ToDo: do we always get usefull backtraces? */
       throw Exception::IncompatibleUnits(*this, rhs);
     }
     if (lhs_unit == rhs_unit) {
       return l.value() < r.value();
-    } else {
+    }
+    else {
       return lhs_unit < rhs_unit;
     }
   }
 
+  bool Number::operator> (const Number& rhs) const
+  {
+    // unitless or only having one unit are equivalent (3.4)
+    // therefore we need to reduce the units beforehand
+    Number l(*this), r(rhs); l.reduce(); r.reduce();
+    size_t lhs_units = l.numerators.size() + l.denominators.size();
+    size_t rhs_units = r.numerators.size() + r.denominators.size();
+    if (!lhs_units || !rhs_units) {
+      return l.value() > r.value();
+    }
+    // ensure both have same units
+    l.normalize(); r.normalize();
+    Units& lhs_unit = l, & rhs_unit = r;
+    if (!(lhs_unit == rhs_unit)) {
+      /* ToDo: do we always get usefull backtraces? */
+      throw Exception::IncompatibleUnits(*this, rhs);
+    }
+    if (lhs_unit == rhs_unit) {
+      return l.value() > r.value();
+    }
+    else {
+      return lhs_unit > rhs_unit;
+    }
+  }
+
   /////////////////////////////////////////////////////////////////////////
   /////////////////////////////////////////////////////////////////////////
 

src/ast_values.hpp

@@ -247,6 +247,7 @@ namespace Sass {
     size_t hash() const override;
 
     bool operator< (const Number& rhs) const;
+    bool operator> (const Number& rhs) const;
     bool operator== (const Number& rhs) const;
 
 

src/eval.cpp

@@ -1028,7 +1028,7 @@ namespace Sass {
     Arguments_Obj args = c->arguments();
 
     Env* env = environment();
-    if (!env->has(full_name) /* || (!c->via_call() && Prelexer::re_special_fun(name.c_str()))*/) {
+    if (!c->func() && !env->has(full_name) /* || (!c->via_call() && Prelexer::re_special_fun(name.c_str()))*/) {
       if (!env->has("*[f]")) {
         for (Argument_Obj arg : args->elements()) {
           if (List_Obj ls = Cast<List>(arg->value())) {

src/file.cpp

@@ -236,12 +236,16 @@ namespace Sass {
     {
       // magic algorith goes here!!
 
-      // if the file is outside this directory show the absolute path
+    // std::cerr << "rel " << rel_path << "\n";
+    // std::cerr << "abs " << abs_path << "\n";
+    // std::cerr << "pstate " << orig_path << "\n";
+
+    // if the file is outside this directory show the absolute path
       if (rel_path.substr(0, 3) == "../") {
         return orig_path;
       }
       // this seems to work most of the time
-      return abs_path == orig_path ? abs_path : rel_path;
+      return abs_path == orig_path ? rel_path : rel_path;
     }
 
     // create an absolute path by resolving relative paths with cwd

src/fn_miscs.cpp

@@ -1,5 +1,6 @@
 #include "ast.hpp"
 #include "expand.hpp"
+#include "debugger.hpp"
 #include "fn_utils.hpp"
 #include "fn_miscs.hpp"
 #include "util_string.hpp"
@@ -139,7 +140,7 @@ namespace Sass {
       FunctionExpressionObj func = SASS_MEMORY_NEW(FunctionExpression, pstate, name, args, "");
 
       Expand expand(ctx, &d_env, &selector_stack, &original_stack);
-      func->via_call(true); // calc invoke is allowed
+      // func->via_call(true); // calc invoke is allowed
       if (ff) func->func(ff);
       return Cast<PreValue>(func->perform(&expand.eval));
     }
@@ -231,7 +232,7 @@ namespace Sass {
       }
 
 
-      if (!d_env.has_global(full_name)) {
+      if (!d_env.has(full_name)) {
         error("Function not found: " + name, pstate, traces);
       }
 

src/fn_numbers.cpp

@@ -138,7 +138,7 @@ namespace Sass {
           error(val->to_string(ctx.c_options) + " is not a number.", val->pstate(), traces);
         }
         if (greatest) {
-          if (*greatest < *xi) greatest = xi;
+          if (*xi > *greatest) greatest = xi;
         } else greatest = xi;
       }
       return greatest.detach();