Commits

John Rizzo committed 8a9dcfd

- Updated the setup.py file to work with parrot 3.9.0
- Updated the Grammar file so it would build on my mac. Had some odd encoding issues. I'm not sure if this is the right fix.

  • Participants
  • Parent commits 34a3823

Comments (0)

Files changed (2)

File Grammar/Grammar.pg

 proto infix:<+>    is looser(infix:<*>)  is pirop('add')     { ... }
 proto infix:<->    is equiv(infix:<+>)   is pirop('sub')     { ... }
 
-proto infix:«<<»   is looser(infix:<+>)  is pirop('shl')     { ... }
-proto infix:«>>»   is equiv(infix:«<<»)  is pirop('shr')     { ... }
-proto infix:<&>    is looser(infix:«<<»)     { ... }
+proto infix:A<<<A>   is looser(infix:<+>)  is pirop('shl')     { ... }
+proto infix:A<>>A>   is equiv(infix:A<<<A>)  is pirop('shr')     { ... }
+proto infix:<&>    is looser(infix:A<<<A>)     { ... }
 proto infix:<^>    is looser(infix:<&>)      { ... }
 proto infix:<|>    is looser(infix:<^>)      { ... }
 
 proto infix:<==>   is looser(infix:<|>)      { ... }
 proto infix:<!=>   is equiv(infix:<==>)      { ... }
-proto infix:«<=»   is equiv(infix:<==>)      { ... }
-proto infix:«>=»   is equiv(infix:<==>)      { ... }
-proto infix:«<»    is equiv(infix:<==>)      { ... }
-proto infix:«>»    is equiv(infix:<==>)      { ... }
+proto infix:A<<=A>   is equiv(infix:<==>)      { ... }
+proto infix:A<>=A>   is equiv(infix:<==>)      { ... }
+proto infix:A<<A>    is equiv(infix:<==>)      { ... }
+proto infix:A<>A>    is equiv(infix:<==>)      { ... }
 
 
 ## Python reserved words and keywords
     exit(1)
 
 PARROT        = "%s/parrot%s" % (pc['bindir'], pc['exe'])
+PARROT_NQP    = "%s/parrot-nqp%s" % (pc['bindir'], pc['exe'])
 GRAMMAR_GEN   = "%s/%s/library/PGE/Perl6Grammar.pbc" % (pc['libdir'], pc['versiondir'])
 NQP           = "%s/%s/languages/nqp/nqp.pbc" % (pc['libdir'], pc['versiondir'])
 PCT           = "%s/library/PCT.pbc" % pc['libdir']
         spawn([PARROT, GRAMMAR_GEN, '--output=include/gen_grammar.pir', 'Grammar/Grammar.pg'])
 
     if newer('Grammar/Actions.nqp','include/gen_actions.pir'):
-        spawn([PARROT, NQP, '--output=include/gen_actions.pir', '--encoding=fixed_8', '--target=pir', 'Grammar/Actions.nqp'])
+        spawn([PARROT_NQP, '--output=include/gen_actions.pir', '--encoding=fixed_8', '--target=pir', 'Grammar/Actions.nqp'])
 
     if newer_group(SOURCES + BUILTINS_PIR, 'pynie.pbc'):
         spawn([PARROT, '-o', 'pynie.pbc', 'pynie.pir'])