[asterisk-scf-commits] asterisk-scf/release/ice.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  9a79c966fac1d812da2d189984f28f33ecb68885 (commit)
       via  dfddac45a0311dc85149c4004f4d54194dc2ad75 (commit)
       via  03be97bf53202c6bedd0115849e58d2c1793da64 (commit)
      from  33cf82079005773f2d755b68a8859b75ef62456a (commit)

Summary of changes:
 cpp/include/Slice/Parser.h     |    2 ++
 cpp/src/Slice/Parser.cpp       |   13 +++++++++++++
 cpp/src/Slice/RubyUtil.cpp     |    2 +-
 cpp/src/slice2freeze/Main.cpp  |    2 +-
 cpp/src/slice2freezej/Main.cpp |    2 +-
 cpp/src/slice2php/Main.cpp     |    2 +-
 6 files changed, 19 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 9a79c966fac1d812da2d189984f28f33ecb68885
Merge: 33cf820 dfddac4
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Feb 18 17:43:58 2011 -0600

    Merge branch 'slice-plugins'


commit dfddac45a0311dc85149c4004f4d54194dc2ad75
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Feb 18 17:43:21 2011 -0600

    Allow plugins to set/modify default values on class/struct/exception
    data members.

diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index 86ee25b..fdd427e 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -977,6 +977,8 @@ public:
     bool hasDefaultValue() const;
     std::string defaultValue() const;
     std::string defaultLiteral() const;
+    void setDefaultValue(const std::string&);
+    void setDefaultLiteral(const std::string&);
     virtual ContainedType containedType() const;
     virtual bool uses(const ContainedPtr&) const;
     virtual std::string kindOf() const;
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 8eac593..6b10e04 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -5281,6 +5281,19 @@ Slice::DataMember::defaultLiteral() const
     return _defaultLiteral;
 }
 
+void
+Slice::DataMember::setDefaultValue(const string& value)
+{
+    _defaultValue = value;
+    _hasDefaultValue = true;
+}
+
+void
+Slice::DataMember::setDefaultLiteral(const string& literal)
+{
+    _defaultLiteral = literal;
+}
+
 Contained::ContainedType
 Slice::DataMember::containedType() const
 {

commit 03be97bf53202c6bedd0115849e58d2c1793da64
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Fri Feb 18 13:44:24 2011 -0600

    Don't lie to plugins about the language they are being used to generate.

diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp
index 8f30da0..bd1b4b4 100644
--- a/cpp/src/Slice/RubyUtil.cpp
+++ b/cpp/src/Slice/RubyUtil.cpp
@@ -1648,7 +1648,7 @@ Slice::Ruby::generate(const UnitPtr& un, bool all, bool checksum,
         
         Plugin::VisitorList* pluginVisitors;
         Plugin::FACTORY factory = (Plugin::FACTORY) sym;
-        pluginVisitors = factory(Plugin::LanguagePython);
+        pluginVisitors = factory(Plugin::LanguageRuby);
         
         if(pluginVisitors)
         {
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index 8510309..3dcf543 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -1400,7 +1400,7 @@ gen(const string& name, const UnitPtr& u, const vector<string>& includePaths, co
         
         Plugin::VisitorList* pluginVisitors;
         Plugin::FACTORY factory = (Plugin::FACTORY) sym;
-        pluginVisitors = factory(Plugin::LanguagePython);
+        pluginVisitors = factory(Plugin::LanguageCPlusPlus);
         
         if(pluginVisitors)
         {
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
index 7de7dcd..f9ace31 100644
--- a/cpp/src/slice2freezej/Main.cpp
+++ b/cpp/src/slice2freezej/Main.cpp
@@ -277,7 +277,7 @@ FreezeGenerator::generate(UnitPtr& u, const Dict& dict)
         
         Plugin::VisitorList* pluginVisitors;
         Plugin::FACTORY factory = (Plugin::FACTORY) sym;
-        pluginVisitors = factory(Plugin::LanguagePython);
+        pluginVisitors = factory(Plugin::LanguageJava);
         
         if(pluginVisitors)
         {
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index 1cb4770..8b4e768 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -1410,7 +1410,7 @@ generate(const UnitPtr& un, bool all, bool checksum, bool ns,
         
         Plugin::VisitorList* pluginVisitors;
         Plugin::FACTORY factory = (Plugin::FACTORY) sym;
-        pluginVisitors = factory(Plugin::LanguagePython);
+        pluginVisitors = factory(Plugin::LanguagePHP);
         
         if(pluginVisitors)
         {

-----------------------------------------------------------------------


-- 
asterisk-scf/release/ice.git