Browse Source

Add unit files to lint, fix lint errors.

Brendan Dahl 14 years ago
parent
commit
971f35d165
  1. 2
      Makefile
  2. 19
      src/function.js
  3. 7
      test/unit/function_spec.js
  4. 8
      test/unit/obj_spec.js

2
Makefile

@ -129,7 +129,7 @@ browser-test: @@ -129,7 +129,7 @@ browser-test:
#
# <http://code.google.com/closure/utilities/docs/linter_howto.html>
SRC_DIRS := . src utils web test examples/helloworld extensions/firefox \
extensions/firefox/components extensions/chrome
extensions/firefox/components extensions/chrome test/unit
GJSLINT_FILES = $(foreach DIR,$(SRC_DIRS),$(wildcard $(DIR)/*.js))
lint:
gjslint --nojsdoc $(GJSLINT_FILES)

19
src/function.js

@ -336,15 +336,16 @@ var PDFFunction = (function PDFFunctionClosure() { @@ -336,15 +336,16 @@ var PDFFunction = (function PDFFunctionClosure() {
};
},
constructPostScript: function pdfFunctionConstructPostScript(fn, dict, xref) {
constructPostScript: function pdfFunctionConstructPostScript(fn, dict,
xref) {
var domain = dict.get('Domain');
var range = dict.get('Range');
if (!domain)
error('No domain.');
if(!range)
error('No range.')
if (!range)
error('No range.');
var lexer = new PostScriptLexer(fn);
var parser = new PostScriptParser(lexer);
@ -399,7 +400,7 @@ var FunctionCache = (function FunctionCache() { @@ -399,7 +400,7 @@ var FunctionCache = (function FunctionCache() {
}
FunctionCache.prototype = {
has: function(key) {
return key in this.cache
return key in this.cache;
},
get: function(key) {
return this.cache[key];
@ -446,8 +447,8 @@ var PostScriptStack = (function PostScriptStack() { @@ -446,8 +447,8 @@ var PostScriptStack = (function PostScriptStack() {
// algorithm from http://jsfromhell.com/array/rotate
var l = a.length, p = (Math.abs(p) >= l && (p %= l),
p < 0 && (p += l), p), i, x;
for(; p; p = (Math.ceil(l / p) - 1) * p - l + (l = p))
for(i = l; i > p; x = a[--i], a[i] = a[i - p], a[i - p] = x);
for (; p; p = (Math.ceil(l / p) - 1) * p - l + (l = p))
for (i = l; i > p; x = a[--i], a[i] = a[i - p], a[i - p] = x);
this.stack = this.stack.concat(a);
}
};
@ -677,12 +678,12 @@ var PostScriptEvaluator = (function PostScriptEvaluator() { @@ -677,12 +678,12 @@ var PostScriptEvaluator = (function PostScriptEvaluator() {
break;
default:
error('Unknown operator ' + operator);
break
break;
}
}
return stack.stack;
}
}
};
return PostScriptEvaluator;
})();
@ -741,7 +742,7 @@ var PostScriptParser = (function PostScriptParser() { @@ -741,7 +742,7 @@ var PostScriptParser = (function PostScriptParser() {
// The true block is right after the 'if' so it just falls through on
// true else it jumps and skips the true block.
condition.push('jz', this.code.length);
} else if(this.accept(PostScriptTokenTypes.LBRACE)) {
} else if (this.accept(PostScriptTokenTypes.LBRACE)) {
var jump = [];
this.code.push(jump);
var endOfTrue = this.code.length;

7
test/unit/function_spec.js

@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
'use strict';
describe('function', function() {
beforeEach(function () {
beforeEach(function() {
this.addMatchers({
toMatchArray: function(expected) {
var actual = this.actual;
@ -18,7 +18,7 @@ describe('function', function() { @@ -18,7 +18,7 @@ describe('function', function() {
for (var j = 0; j < a.length; j++) {
var suba = a[j], subb = b[j];
if (suba !== subb)
return false
return false;
}
} else {
if (a !== b)
@ -85,7 +85,7 @@ describe('function', function() { @@ -85,7 +85,7 @@ describe('function', function() {
['jz', 3],
['push', 99],
['j', 4],
['push', 44],
['push', 44]
];
expect(program).toMatchArray(expectedProgram);
});
@ -102,7 +102,6 @@ describe('function', function() { @@ -102,7 +102,6 @@ describe('function', function() {
var code = parser.parse();
var evaluator = new PostScriptEvaluator(code);
var output = evaluator.execute();
console.log(output);
return output;
}
it('pushes stack', function() {

8
test/unit/obj_spec.js

@ -3,11 +3,11 @@ @@ -3,11 +3,11 @@
'use strict';
describe("obj", function() {
describe('obj', function() {
describe("Name", function() {
it("should retain the given name", function() {
var givenName = "Font";
describe('Name', function() {
it('should retain the given name', function() {
var givenName = 'Font';
var name = new Name(givenName);
expect(name.name).toEqual(givenName);
});

Loading…
Cancel
Save