From 999fe634de374d602ea60a9218391964094966af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B5=D0=B4=D0=BE=D1=80=20=D0=9F=D0=BE=D0=B4=D0=BB?=
 =?UTF-8?q?=D0=B5=D1=81=D0=BD=D0=BE=D0=B2?= <phedor@edu.yar.ru>
Date: Fri, 11 Dec 2015 11:55:34 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klein.php      |  9 ++++----
 readme.md      | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++
 template3.html |  2 +-
 3 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 readme.md

diff --git a/klein.php b/klein.php
index 82aad66..bd3d242 100644
--- a/klein.php
+++ b/klein.php
@@ -6,13 +6,14 @@ class Klein {
     function compile($html) {
         $pattern = array_map(function ($grammar) {
             list(, $result) = $grammar;
-            $body = strtr($grammar[0], [' ' => "\s*", '+' => "\s+", ':var'  => "(\w+(\s*\.\s*\w+)*)", ':id'   => "(\w+)"]);
+            $body = strtr($grammar[0], [' ' => "\s*", '+' => "\s+", ':var' => "(\w+(\s*\.\s*\w+)*)", ':id' => "(\w+)", '{{' => "{{\!?"]);
             return ["/$body/",
                 function ($x) use ($result) {
-                    return "<?php " . preg_replace_callback("/#(\d+)(s?)/", function ($s) use($x) {
+                    $code = "<?php " . preg_replace_callback("/#(\d+)(s?)/", function ($s) use($x) {
                         $pref = $s[2] == 's' ? '$' : '';
                         return implode(", ", array_map(function ($s) use($pref) { return $pref.preg_replace("/\.\s*(\w+)/", "['$1']", $s); }, preg_split("/\s*,\s*/", $x[$s[1]])));
                     }, $result) . " ?>";
+                    return ($x[0][2] == '!') ? "<!-- $code -->" : $code;
                 }];
         }, [
             ["{% for+:id+in+:var %}", "foreach(#2s as \$index => #1s): \$loop = Klein::loop(\$index, #2s);"],
@@ -22,9 +23,9 @@ class Klein {
             ["{% else %}", "else:"],
             ["{% endif %}", "endif;"],
             ["{{ :var }}", "echo #1s;"],
-            ["{{ :id\(( :var (, :var )*)?\) }}", "echo macro_#1(#2s);"],
+            ["{{ :id \(( :var (, :var )*)?\) }}", "echo macro_#1(#2s);"],
             ["{{ :var\|:id }}", "echo #3(#1s);"],
-            ["{% macro+:id\(( :id (, :id )*)?\) %}", "function macro_#1(#2s) {"],
+            ["{% macro+:id \(( :id (, :id )*)?\) %}", "function macro_#1(#2s) {"],
             ["{% endmacro %}", "}"]
         ]);
   
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..c75f5d8
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,61 @@
+#Простой шаблонизатор
+
+#Переменные
+
+Для переменной name=Андрей шаблон
+```html
+<b>Hello, {{ name }}</div>
+```
+преобразуется в 
+```html
+<b>Hello, Андрей</div>
+```
+
+```html
+<b>Hello, {{! name }} </div>
+```
+преобразуется в 
+```html
+<b>Hello, <!-- Андрей --></div>
+```
+
+#Циклы
+
+```html
+<ul>
+    {% for user in users %}
+        <li>Hello, {{ user.name }}</li>
+    {% endfor %}
+</ul>
+```
+
+#Условия
+
+```html
+<ul>
+    {% for user in users %}
+        {% if user.is_russian %}
+            <li>Привет, {{ user.name }}</li>
+        {% else %}
+            <li>Hello, {{ user.name }}</li>
+        {% endif %}
+    {% endfor %}
+</ul>
+```
+
+#Макрос
+
+```html
+{% macro hello(user) %}
+    {% if user.is_russian %}
+        <li>Привет, {{ user.name }}</li>
+    {% else %}
+        <li>Hello, {{ user.name }}</li>
+    {% endif %}
+{% endmacro %}
+<ul>
+    {% for user in users %}
+        {% hello(user) %}
+    {% endfor %}
+</ul>
+```
\ No newline at end of file
diff --git a/template3.html b/template3.html
index ff98917..f5fa1f2 100644
--- a/template3.html
+++ b/template3.html
@@ -1,6 +1,6 @@
 <div>
 {% macro hello(name) %}
-    <em>hello, {{ name }}<em>
+    <em>hello, {{ name }} {{! name }}<em>
 {% endmacro %}
 
 {% for name in names %}