Merge pull request #254 from uqbar-project/files-with-dash

Packages with dashes

src/parser.ts

@@ -196,8 +196,10 @@ export const Import: Parser<ImportNode> = node(ImportNode)(() =>
 
 export const name: Parser<Name> = lazy('identifier', () => regex(/[^\W\d]\w*/))
 
+export const packageName: Parser<Name> = lazy('package identifier', () => regex(/[^\W\d][\w-]*/))
+
 export const FullyQualifiedReference: Parser<ReferenceNode<any>> = node(ReferenceNode)(() =>
-  obj({ name: name.sepBy1(key('.')).tieWith('.') })
+  obj({ name: packageName.or(name).sepBy1(key('.')).tieWith('.') })
 )
 
 export const Reference: Parser<ReferenceNode<any>> = node(ReferenceNode)(() =>

src/validator/index.ts

@@ -453,7 +453,7 @@ sourceMapForNodeName)
 
 export const shouldNotUseSpecialCharactersInName = error<Package>(node =>
   !node.fileName ||
-    node.fileName.match(/([A-Za-z._/\d])/g)!.length === node.fileName.length
+    node.fileName.match(/([A-Za-z.\-_/\d])/g)!.length === node.fileName.length
     && node.fileName.match(/\./g)!.length === 1
 , valuesForFileName,
 sourceMapForNodeName)

src/wre/game.ts

@@ -181,4 +181,4 @@ const game: Natives = {
   },
 }
 
-export default game
+export default game

test/parser.test.ts

@@ -1099,6 +1099,9 @@ describe('Wollok parser', () => {
           )
       })
 
+      it('should not parse dashed objects', () => {
+        'object my-object {}'.should.not.be.parsedBy(parser)
+      })
 
       it('should recover from member parse error', () => {
         'object o {var var1 vr var2 var var3}'.should.be.parsedBy(parser)
@@ -2176,6 +2179,10 @@ class c {}`
           'p.o'.should.be.parsedBy(parser).into(new Reference({ name: 'p.o' })).and.be.tracedTo(0, 3)
         })
 
+        it ('should parse fully quelified references with -', () => {
+          'p-p.C'.should.be.parsedBy(parser)
+        })
+
         it('should parse annotated nodes', () => {
           '@A(x = 1) x'.should.be.parsedBy(parser).into(
             new Reference({ name: 'x', metadata: [new Annotation('A', { x: 1 })] })
@@ -2217,7 +2224,6 @@ class c {}`
         it('should not parse fully qualified references with wrong characters', () => {
           'p.*'.should.not.be.parsedBy(parser)
         })
-
       })