Changeset 28939ac15506b95f59142a06b7d6794a801f8198

Timestamp:

08/27/10 18:32:04 (18 months ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

92c18c14e163e2ab3200ccad6c6c0e6ee5c3e1a6

Parents:

19a2630635324aeed23f74061133ba433a639cd4

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (08/27/10 18:32:04)

Message:

Allow templates access to literal special characters

The variable "_" refers by default now to a structured value having
the following members:

• hash containing "#"
• dollar containing "$"
• obrace containing "{"
• cbrace containing "}"

So, for example, $_.dollar$ in a template will, in general, expand to
the dollar sign.

Closes #75.

Signed-off-by: Antti-Juhani Kaijanaho <antti-juhani@…>

Location:

tlate

Files:

• std_value.cc (added)
• std_value.hh (added)
• tlate-test.cc (modified) (2 diffs)
• var.cc (modified) (3 diffs)

tlate/tlate-test.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -185 +185 @@
                 BOOST_CHECK_EQUAL("\n", tester("\n",am));
         }
+
+        BOOST_AUTO_TEST_CASE(std_hash)
+        {
+                tlate::data_model::ptr am(new tlate::data_model);
+                BOOST_CHECK_EQUAL("#", tester("$_.hash$",am));
+        }
+
+        BOOST_AUTO_TEST_CASE(std_dollar)
+        {
+                tlate::data_model::ptr am(new tlate::data_model);
+                BOOST_CHECK_EQUAL("$", tester("$_.dollar$",am));
+        }
+
+        BOOST_AUTO_TEST_CASE(std_obrace)
+        {
+                tlate::data_model::ptr am(new tlate::data_model);
+                BOOST_CHECK_EQUAL("{", tester("$_.obrace$",am));
+        }
+        BOOST_AUTO_TEST_CASE(std_cbrace)
+        {
+                tlate::data_model::ptr am(new tlate::data_model);
+                BOOST_CHECK_EQUAL("}", tester("$_.cbrace$",am));
+        }
 }

tlate/var.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -18 +18 @@
  */
 
+#include "std_value.hh"
 #include "var.hh"
 
@@ -32 +33 @@
                 if (!rv || rv->is_missing())
                 {
-                        logger::logline ll;
-                        ll << pos() 
-                           << ": access of a missing variable '" << name << "'";
+                        if (name == "_")
+                                rv = std_value::singleton;
+                        else
+                        {
+                                logger::logline ll;
+                                ll << pos() 
+                                   << ": access of a missing variable '"
+                                   << name << "'";
+                        }
                 }
                 return rv;