Commit 0959db8b by Lars Immisch

Fix signed/unsigned warnings.

This commit wasn't tested (for a lack of tests) but was reviewed and should be safe.
parent 106c682b
...@@ -52,8 +52,7 @@ namespace Sass { ...@@ -52,8 +52,7 @@ namespace Sass {
Context::~Context() Context::~Context()
{ {
int i; for (size_t i = 0; i < source_refs.size(); ++i) {
for (i = 0; i < source_refs.size(); ++i) {
delete[] source_refs[i]; delete[] source_refs[i];
} }
// cerr << "Deallocated " << i << " source string(s)." << endl; // cerr << "Deallocated " << i << " source string(s)." << endl;
...@@ -117,4 +116,4 @@ namespace Sass { ...@@ -117,4 +116,4 @@ namespace Sass {
register_function(not_descriptor, not_impl); register_function(not_descriptor, not_impl);
} }
} }
\ No newline at end of file
...@@ -45,7 +45,7 @@ namespace Sass { ...@@ -45,7 +45,7 @@ namespace Sass {
} break; } break;
case Node::root: { case Node::root: {
for (int i = 0; i < expr.size(); ++i) { for (size_t i = 0; i < expr.size(); ++i) {
eval(expr[i], env, f_env, registry); eval(expr[i], env, f_env, registry);
} }
return expr; return expr;
...@@ -54,7 +54,7 @@ namespace Sass { ...@@ -54,7 +54,7 @@ namespace Sass {
case Node::block: { case Node::block: {
Environment current; Environment current;
current.link(env); current.link(env);
for (int i = 0; i < expr.size(); ++i) { for (size_t i = 0; i < expr.size(); ++i) {
eval(expr[i], current, f_env, registry); eval(expr[i], current, f_env, registry);
} }
return expr; return expr;
...@@ -63,7 +63,7 @@ namespace Sass { ...@@ -63,7 +63,7 @@ namespace Sass {
case Node::assignment: { case Node::assignment: {
Node val(expr[1]); Node val(expr[1]);
if (val.type == Node::comma_list || val.type == Node::space_list) { if (val.type == Node::comma_list || val.type == Node::space_list) {
for (int i = 0; i < val.size(); ++i) { for (size_t i = 0; i < val.size(); ++i) {
if (val[i].eval_me) val[i] = eval(val[i], env, f_env, registry); if (val[i].eval_me) val[i] = eval(val[i], env, f_env, registry);
} }
} }
...@@ -83,7 +83,7 @@ namespace Sass { ...@@ -83,7 +83,7 @@ namespace Sass {
case Node::rule: { case Node::rule: {
Node rhs(expr[1]); Node rhs(expr[1]);
if (rhs.type == Node::comma_list || rhs.type == Node::space_list) { if (rhs.type == Node::comma_list || rhs.type == Node::space_list) {
for (int i = 0; i < rhs.size(); ++i) { for (size_t i = 0; i < rhs.size(); ++i) {
if (rhs[i].eval_me) rhs[i] = eval(rhs[i], env, f_env, registry); if (rhs[i].eval_me) rhs[i] = eval(rhs[i], env, f_env, registry);
} }
} }
...@@ -104,7 +104,7 @@ namespace Sass { ...@@ -104,7 +104,7 @@ namespace Sass {
case Node::disjunction: { case Node::disjunction: {
Node result; Node result;
for (int i = 0; i < expr.size(); ++i) { for (size_t i = 0; i < expr.size(); ++i) {
// if (expr[i].type == Node::relation || // if (expr[i].type == Node::relation ||
// expr[i].type == Node::function_call && expr[0].content.token.to_string() == "not") { // expr[i].type == Node::function_call && expr[0].content.token.to_string() == "not") {
result = eval(expr[i], env, f_env, registry); result = eval(expr[i], env, f_env, registry);
...@@ -116,7 +116,7 @@ namespace Sass { ...@@ -116,7 +116,7 @@ namespace Sass {
case Node::conjunction: { case Node::conjunction: {
Node result; Node result;
for (int i = 0; i < expr.size(); ++i) { for (size_t i = 0; i < expr.size(); ++i) {
result = eval(expr[i], env, f_env, registry); result = eval(expr[i], env, f_env, registry);
if (result.type == Node::boolean && result.content.boolean_value == false) return result; if (result.type == Node::boolean && result.content.boolean_value == false) return result;
} }
...@@ -367,13 +367,13 @@ namespace Sass { ...@@ -367,13 +367,13 @@ namespace Sass {
Node body(mixin[2].clone(registry)); Node body(mixin[2].clone(registry));
Environment bindings; Environment bindings;
// bind arguments // bind arguments
for (int i = 0, j = 0; i < args.size(); ++i) { for (size_t i = 0, j = 0; i < args.size(); ++i) {
if (args[i].type == Node::assignment) { if (args[i].type == Node::assignment) {
Node arg(args[i]); Node arg(args[i]);
Token name(arg[0].content.token); Token name(arg[0].content.token);
// check that the keyword arg actually names a formal parameter // check that the keyword arg actually names a formal parameter
bool valid_param = false; bool valid_param = false;
for (int k = 0; k < params.size(); ++k) { for (size_t k = 0; k < params.size(); ++k) {
Node param_k = params[k]; Node param_k = params[k];
if (param_k.type == Node::assignment) param_k = param_k[0]; if (param_k.type == Node::assignment) param_k = param_k[0];
if (arg[0] == param_k) { if (arg[0] == param_k) {
...@@ -421,7 +421,7 @@ namespace Sass { ...@@ -421,7 +421,7 @@ namespace Sass {
{ {
map<Token, Node> bindings; map<Token, Node> bindings;
// bind arguments // bind arguments
for (int i = 0, j = 0; i < args.size(); ++i) { for (size_t i = 0, j = 0; i < args.size(); ++i) {
if (args[i].type == Node::assignment) { if (args[i].type == Node::assignment) {
Node arg(args[i]); Node arg(args[i]);
Token name(arg[0].content.token); Token name(arg[0].content.token);
...@@ -436,4 +436,4 @@ namespace Sass { ...@@ -436,4 +436,4 @@ namespace Sass {
return f(bindings, registry); return f(bindings, registry);
} }
} }
\ No newline at end of file
...@@ -30,7 +30,7 @@ namespace Sass { ...@@ -30,7 +30,7 @@ namespace Sass {
while (d[len+1]) ++len; while (d[len+1]) ++len;
parameters.reserve(len); parameters.reserve(len);
for (int i = 0; i < len; ++i) { for (size_t i = 0; i < len; ++i) {
const char* p = d[i+1]; const char* p = d[i+1];
Token name(Token::make(p, p + std::strlen(p))); Token name(Token::make(p, p + std::strlen(p)));
parameters.push_back(name); parameters.push_back(name);
......
...@@ -190,7 +190,7 @@ namespace Sass { ...@@ -190,7 +190,7 @@ namespace Sass {
Node& operator+=(const Node& n) Node& operator+=(const Node& n)
{ {
for (int i = 0; i < n.size(); ++i) { for (size_t i = 0; i < n.size(); ++i) {
content.children->push_back(n[i]); content.children->push_back(n[i]);
} }
return *this; return *this;
...@@ -278,4 +278,4 @@ namespace Sass { ...@@ -278,4 +278,4 @@ namespace Sass {
~Node() { ++destructed; } ~Node() { ++destructed; }
}; };
} }
\ No newline at end of file
...@@ -25,7 +25,7 @@ namespace Sass { ...@@ -25,7 +25,7 @@ namespace Sass {
case space_list: case space_list:
case expression: case expression:
case term: { case term: {
for (int i = 0; i < size(); ++i) { for (size_t i = 0; i < size(); ++i) {
if (at(i) == rhs[i]) continue; if (at(i) == rhs[i]) continue;
else return false; else return false;
} }
...@@ -101,4 +101,4 @@ namespace Sass { ...@@ -101,4 +101,4 @@ namespace Sass {
bool Node::operator>=(const Node& rhs) const bool Node::operator>=(const Node& rhs) const
{ return !(*this < rhs); } { return !(*this < rhs); }
} }
\ No newline at end of file
...@@ -47,8 +47,7 @@ extern "C" { ...@@ -47,8 +47,7 @@ extern "C" {
// cerr << "Destructions:\t" << Node::destructed << endl; // cerr << "Destructions:\t" << Node::destructed << endl;
// cerr << "Registry size:\t" << doc.context.registry.size() << endl; // cerr << "Registry size:\t" << doc.context.registry.size() << endl;
int i; for (size_t i = 0; i < doc.context.registry.size(); ++i) {
for (i = 0; i < doc.context.registry.size(); ++i) {
delete doc.context.registry[i]; delete doc.context.registry[i];
} }
// cerr << "Deallocations:\t" << i << endl; // cerr << "Deallocations:\t" << i << endl;
...@@ -133,4 +132,4 @@ extern "C" { ...@@ -133,4 +132,4 @@ extern "C" {
return 1; return 1;
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment