Author: kjs
Date: Thu Oct 4 04:26:04 2007
New Revision: 21822
Modified:
trunk/languages/PIR/lib/pir.pg
Log:
languages/PIR:
* some layout updates
* some logical updates
Modified: trunk/languages/PIR/lib/pir.pg
==============================================================================
--- trunk/languages/PIR/lib/pir.pg (original)
+++ trunk/languages/PIR/lib/pir.pg Thu Oct 4 04:26:04 2007
@@ -580,16 +580,13 @@
}
rule macro_def {
- <'.macro'>
- <id>
- <macro_parameters>?
- <?nl>
+ <'.macro'> <id>
+ <macro_parameters>? <?nl>
<macro_body>
}
rule macro_parameters {
- <'('>
- <id_list>?
+ <'('> <id_list>?
<?right_paren>
}
@@ -698,10 +695,7 @@
rule id_list {
<IDENT>
- [
- <','>
- <id>
- ]*
+ [ <','> <id> ]*
}
@@ -810,7 +804,7 @@
}
token macro_id {
- <!keyword> \.\w+
+ <!pir_directive> \.\w+
}
@@ -888,7 +882,6 @@
token keyword {
| <pir_type>
- | <pir_directive>
| <pir_keyword>
| <pasm_instruction> # pasm instructions may be identifiers in IMCC
}
