Skip to content

fixed a counting of lines for files with windows line breaks #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dovyden wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fixed a counting of lines for files with windows line breaks #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abd7f26
fixed a counting of rows for files with windows end of line
Oct 10, 2013
a2f0f73
added test to count lines in files with different line breaks
Oct 17, 2013
ae89d1c
reset global variables at the start of the file parsing
Oct 17, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/gonzales.cssp.node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ var getTokens = (function() {
if (!s) return [];

tokens = [];
tn = 0;
ln = 1;

var c, cn;

Expand All @@ -125,7 +127,7 @@ var getTokens = (function() {
parseSpaces(s)
} else if (c in Punctuation) {
pushToken(Punctuation[c], c);
if (c === '\n' || c === '\r') ln++;
if (c === '\n' || c === '\r' && cn !== '\n') ln++;
if (c === ')') urlMode = false;
if (c === '{') blockMode++;
if (c === '}') blockMode--;
Expand Down
4 changes: 3 additions & 1 deletion src/tokenizer.shared.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ var getTokens = (function() {
if (!s) return [];

tokens = [];
tn = 0;
ln = 1;

var c, cn;

Expand All @@ -124,7 +126,7 @@ var getTokens = (function() {
parseSpaces(s)
} else if (c in Punctuation) {
pushToken(Punctuation[c], c);
if (c === '\n' || c === '\r') ln++;
if (c === '\n' || c === '\r' && cn !== '\n') ln++;
if (c === ')') urlMode = false;
if (c === '{') blockMode++;
if (c === '}') blockMode--;
Expand Down
71 changes: 71 additions & 0 deletions test/cssp/data/test_endOfLine/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/**
* test: end of line
*
* @author dovyden <dovyden@yandex.ru>
*/

var gonzales,
system = {
nix: '\n',
mac: '\r',
win: '\r\n'
},
file = ['.rule1{}', '.rule2{}', '.rule3{}'];

/**
* test
*
* @param {Object} gonzales
* @param {function} gonzales.srcToCSSP
* @param {function} gonzales.csspToSrc
*/
function main (gonzales) {
var eol,
css,
ast,
result = true;

for (eol in system) {
css = file.join(system[eol]);
ast = gonzales.srcToCSSP(css, undefined, true);

// ast:
// [
// { ln: 1 },
// 'stylesheet',
// [
// { ln: 1 },
// 'ruleset',
// [ { ln: 1 }, 'selector', [ <.rule1> ],
// [ { ln: 1 }, 'block' ]
// ],
// ...
// [
// { ln: 2 }, 's', '\n'
// ],
// [
// { ln: 3 },
// 'ruleset',
// [ { ln: 3 }, 'selector', [ <.rule3> ],
// [ { ln: 3 }, 'block' ]
// ]
// ]
result = result && (ast[6][0].ln === 3);
}

return result;
}


exports.test = main;

if (require.main === module) {
gonzales = require('./../../../../lib/gonzales.cssp.node');

console.log(
main({
srcToCSSP: gonzales.srcToCSSP,
csspToSrc: gonzales.srcToCSSP
}) ? 'PASS' : 'FAIL'
);
}
62 changes: 36 additions & 26 deletions test/cssp/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,42 @@ d_list.forEach(function(rule_dir) {
files = {},
k, a, b, c, src, t, r;

list.forEach(function(f) {
var i = f.lastIndexOf('.');

if (i !== -1) {
ext = f.substring(i + 1);
k = f.substring(0, i);
if (!(k in files)) files[k] = {};
files[k][ext] = 1;
}
});

for (k in files) {
if (files[k].css) {
src = readFile(path + k + '.css').trim();
t = '\'' + rule + '\' / \'' + k + '.';
for (a in funcs) {
if (a in files[k]) {
total++;
r = (((b = funcs[a](src, rule)) == (c = readFile(path + k + '.' + a).trim())));
r && okn++;
if (!r) {
console.log('FAIL: ' + t + a);
console.log('======= expected');
console.log(c);
console.log('======= result');
console.log(b);
if (fs.existsSync(path + 'test.js')) {
r = require(path + 'test.js').test({
csspToSrc: csspToSrc,
srcToCSSP: srcToCSSP
});

total++;
r ? okn++ : console.log('FAIL: ' + rule);
} else {
list.forEach(function(f) {
var i = f.lastIndexOf('.');

if (i !== -1) {
ext = f.substring(i + 1);
k = f.substring(0, i);
if (!(k in files)) files[k] = {};
files[k][ext] = 1;
}
});

for (k in files) {
if (files[k].css) {
src = readFile(path + k + '.css').trim();
t = '\'' + rule + '\' / \'' + k + '.';
for (a in funcs) {
if (a in files[k]) {
total++;
r = (((b = funcs[a](src, rule)) == (c = readFile(path + k + '.' + a).trim())));
r && okn++;
if (!r) {
console.log('FAIL: ' + t + a);
console.log('======= expected');
console.log(c);
console.log('======= result');
console.log(b);
}
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion web/gonzales.cssp.web.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ var getTokens = (function() {
if (!s) return [];

tokens = [];
tn = 0;
ln = 1;

var c, cn;

Expand All @@ -125,7 +127,7 @@ var getTokens = (function() {
parseSpaces(s)
} else if (c in Punctuation) {
pushToken(Punctuation[c], c);
if (c === '\n' || c === '\r') ln++;
if (c === '\n' || c === '\r' && cn !== '\n') ln++;
if (c === ')') urlMode = false;
if (c === '{') blockMode++;
if (c === '}') blockMode--;
Expand Down