From 8d5161bf33528459447ee1ca02006ec0252db196 Mon Sep 17 00:00:00 2001 From: eschnett Date: Wed, 15 May 2013 23:08:47 +0000 Subject: Move all of Piraha into cctki_piraha namespace Change namespace "piraha" to "cctki_piraha", as per Cactus naming standard. Move smart_ptr into this namespace as well. git-svn-id: http://svn.cactuscode.org/flesh/trunk@5012 17b73243-c579-4c4c-a9d2-2d5706c11dac --- src/piraha/Grammar.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/piraha/Grammar.cc') diff --git a/src/piraha/Grammar.cc b/src/piraha/Grammar.cc index 5a516358..66aca571 100644 --- a/src/piraha/Grammar.cc +++ b/src/piraha/Grammar.cc @@ -1,6 +1,6 @@ #include "Piraha.hpp" -namespace piraha { +namespace cctki_piraha { extern smart_ptr compile(smart_ptr g,bool ignCase,smart_ptr gram); @@ -8,7 +8,7 @@ smart_ptr pegGrammar = AutoGrammar::reparserGenerator(); void compile(smart_ptr thisg,std::string name,smart_ptr g) { thisg->default_rule = name; - smart_ptr p = piraha::compile(g,false,thisg); + smart_ptr p = cctki_piraha::compile(g,false,thisg); thisg->patterns.put(name,p); } void compile(smart_ptr thisg,std::string name,std::string pattern) { @@ -16,7 +16,7 @@ void compile(smart_ptr thisg,std::string name,std::string pattern) { smart_ptr m = new Matcher(pegGrammar,"pattern",pattern.c_str()); smart_ptr g = m.dup(); if(m->matches()) { - smart_ptr p = piraha::compile(g,false,thisg); + smart_ptr p = cctki_piraha::compile(g,false,thisg); thisg->patterns.put(name,p); } else { std::cout << "Could not compile(" << name << "," << pattern << ")" << std::endl; -- cgit v1.2.3