Fix mixin-exists and function-exists in local scopes

xzyfer · xzyfer · commit bc551517877a · 2019-03-17T13:24:07.000+11:00
Spec sass/sass-spec#1362 Fixes #2831
diff --git a/src/fn_miscs.cpp b/src/fn_miscs.cpp
@@ -63,7 +63,7 @@ namespace Sass {
 
       std::string name = Util::normalize_underscores(unquote(ss->value()));
 
-      if(d_env.has_global(name+"[f]")) {
+      if(d_env.has(name+"[f]")) {
         return SASS_MEMORY_NEW(Boolean, pstate, true);
       }
       else {
@@ -76,7 +76,7 @@ namespace Sass {
     {
       std::string s = Util::normalize_underscores(unquote(ARG("$name", String_Constant)->value()));
 
-      if(d_env.has_global(s+"[m]")) {
+      if(d_env.has(s+"[m]")) {
         return SASS_MEMORY_NEW(Boolean, pstate, true);
       }
       else {
@@ -247,4 +247,4 @@ namespace Sass {
 
   }
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ namespace Sass {`
`63`	`63`
`64`	`64`	`std::string name = Util::normalize_underscores(unquote(ss->value()));`
`65`	`65`
`66`		`- if(d_env.has_global(name+"[f]")) {`
	`66`	`+ if(d_env.has(name+"[f]")) {`
`67`	`67`	`return SASS_MEMORY_NEW(Boolean, pstate, true);`
`68`	`68`	`}`
`69`	`69`	`else {`
`@@ -76,7 +76,7 @@ namespace Sass {`
`76`	`76`	`{`
`77`	`77`	`std::string s = Util::normalize_underscores(unquote(ARG("$name", String_Constant)->value()));`
`78`	`78`
`79`		`- if(d_env.has_global(s+"[m]")) {`
	`79`	`+ if(d_env.has(s+"[m]")) {`
`80`	`80`	`return SASS_MEMORY_NEW(Boolean, pstate, true);`
`81`	`81`	`}`
`82`	`82`	`else {`
`@@ -247,4 +247,4 @@ namespace Sass {`
`247`	`247`
`248`	`248`	`}`
`249`	`249`
`250`		`-}`
	`250`	`+}`