improve tests & fix array parsing

Author: ichiriac

src/parser.js

@@ -586,7 +586,7 @@ Parser.prototype.parseStatement = function () {
  }
  return {
  kind: 'word',
- value: this.lexer.text
+ value: this.lexer.backup.text
  };
  }
 
@@ -630,16 +630,6 @@ Parser.prototype.readArray = function (endChar) {
  var item = this.parseTopStatement();
  if (item !== null) { // ignore
  item = this.getJsonValue(item);
- if (this.token === '=>') {
- this.token = this.lexer.lex(); // eat
- item = {
- kind: 'key',
- name: item,
- value: this.getJsonValue(
- this.parseTopStatement()
- )
- };
- }
  result.push(item);
  if (this.token !== ',') {
  break;

test/parser.js

@@ -261,4 +261,33 @@ describe('Test parser', function () {
  ast.body[2].kind.should.be.exactly('object');
  should.equal(ast.body[2].value, null);
  });
+
+ it('test getJsonValue', function () {
+ var ast = doc.parse([
+ '/**',
+ ' * @object { foo: { bar: false }, "key": [1, 2, 3] }',
+ ' */'
+ ].join('\n'));
+ ast.body[0].kind.should.be.exactly('object');
+ ast.body[0].value.should.be.eql({foo: {bar: false}, key: [1, 2, 3]});
+ });
+
+ it('test readArray', function () {
+ var ast = doc.parse([
+ '/**',
+ ' * @array [foo => bar, 1, 2, array]',
+ ' */'
+ ].join('\n'));
+ ast.body[0].kind.should.be.exactly('array');
+ ast.body[0].value.should.be.eql([
+ {
+ kind: 'key',
+ name: 'foo',
+ value: 'bar'
+ },
+ 1,
+ 2,
+ 'array'
+ ]);
+ });
 });