From 3b114f786fa8c3735a7adeb7de71af02e42c0eb0 Mon Sep 17 00:00:00 2001
From: Anton Lavrik <alavrik@piqi.org>
Date: Sun, 5 Mar 2017 00:45:38 -0800
Subject: [PATCH] Migrate to infix notation for name expansion in .piqi

---
 piqic-ocaml/piqi.ocaml.piqi      | 12 ++++++------
 piqic-ocaml/piqi.piqi-ocaml.piqi |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/piqic-ocaml/piqi.ocaml.piqi b/piqic-ocaml/piqi.ocaml.piqi
index 7f0673b..be7f046 100644
--- a/piqic-ocaml/piqi.ocaml.piqi
+++ b/piqic-ocaml/piqi.ocaml.piqi
@@ -21,22 +21,22 @@
 %
 
 .extend [
-    (.typedef int uint)
+    .typedef* [ int uint ]
     .with.ocaml-type "int"
 ]
 
 .extend [
-    (.typedef int32 uint32)
+    .typedef* [ int32 uint32 ]
     .with.ocaml-type "int32"
 ]
 
 .extend [
-    (.typedef int64 uint64)
+    .typedef* [ int64 uint64 ]
     .with.ocaml-type "int64"
 ]
 
 .extend [
-    (.typedef float64 float32)
+    .typedef* [ float64 float32 ]
     .with.ocaml-type "float"
 ]
 
@@ -65,7 +65,7 @@
 ]
 
 .extend [
-    (.field piqi.module import.module)
+    .field* [ piqi.module import.module ]
 
     .with.ocaml-name "modname"
 ]
@@ -84,5 +84,5 @@
 ]
 
 
-(.custom-field ocaml-type ocaml-name)
+.custom-field* [ ocaml-type ocaml-name ]
 
diff --git a/piqic-ocaml/piqi.piqi-ocaml.piqi b/piqic-ocaml/piqi.piqi-ocaml.piqi
index c79140b..3f06a5c 100644
--- a/piqic-ocaml/piqi.piqi-ocaml.piqi
+++ b/piqic-ocaml/piqi.piqi-ocaml.piqi
@@ -26,7 +26,7 @@
 
 
 .extend [
-    (.typedef record field variant option enum alias list import function)
+    .typedef* [ record field variant option enum alias list import function ]
 
     .with.field [
         .name ocaml-name
@@ -37,7 +37,7 @@
 
 
 .extend [
-    (.typedef piqi import)
+    .typedef* [ piqi import ]
 
     .with.field [
         .name ocaml-module
@@ -60,7 +60,7 @@
 
 % flag for representing repeated fields and lists as OCaml arrays
 .extend [
-    (.typedef field list)
+    .typedef* [ field list ]
 
     .with.field [
         .name ocaml-array