[dali_2.3.24] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / builder / json-parser-impl.cpp

diff --git a/dali-toolkit/internal/builder/json-parser-impl.cpp b/dali-toolkit/internal/builder/json-parser-impl.cpp
index 7a2832c..d1fe2ae 100644 (file)
--- a/dali-toolkit/internal/builder/json-parser-impl.cpp
+++ b/dali-toolkit/internal/builder/json-parser-impl.cpp
@@ -1,77 +1,75 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // CLASS HEADER
 #include <dali-toolkit/internal/builder/json-parser-impl.h>
-// EXTERNAL
+
+// EXTERNAL INCLUDES
 #include <cstring>
 
-#include <dali-toolkit/internal/builder/tree-node-manipulator.h>
+// INTERNAL INCLUDES
 #include <dali-toolkit/internal/builder/json-parser-state.h>
+#include <dali-toolkit/internal/builder/tree-node-manipulator.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 namespace
 {
-
 const char ERROR_DESCRIPTION_NONE[] = "No Error";
 
-template <typename IteratorType,typename EndIteratorType>
+template<typename IteratorType, typename EndIteratorType>
 inline IteratorType Advance(IteratorType& iter, EndIteratorType& end, int n)
 {
-  for(int i =0; i < n; ++i)
+  for(int i = 0; i < n; ++i)
   {
     ++iter;
   }
   return iter;
 }
 
-} // anon namespace
-
+} // namespace
 
 JsonParser::JsonParser()
-  : mRoot(NULL),
-    mErrorDescription(ERROR_DESCRIPTION_NONE),
-    mErrorPosition(0),
-    mErrorLine(0),
-    mErrorColumn(0),
-    mNumberOfChars(0),
-    mNumberOfNodes(0)
+: mRoot(NULL),
+  mErrorDescription(ERROR_DESCRIPTION_NONE),
+  mErrorPosition(0),
+  mErrorLine(0),
+  mErrorColumn(0),
+  mNumberOfChars(0),
+  mNumberOfNodes(0)
 {
 }
 
 JsonParser::JsonParser(const TreeNode& tree)
-  : mRoot(NULL),
-    mErrorDescription(ERROR_DESCRIPTION_NONE),
-    mErrorPosition(0),
-    mErrorLine(0),
-    mErrorColumn(0),
-    mNumberOfChars(0),
-    mNumberOfNodes(0)
+: mRoot(NULL),
+  mErrorDescription(ERROR_DESCRIPTION_NONE),
+  mErrorPosition(0),
+  mErrorLine(0),
+  mErrorColumn(0),
+  mNumberOfChars(0),
+  mNumberOfNodes(0)
 {
-  mRoot = TreeNodeManipulator::Copy( tree, mNumberOfNodes, mNumberOfChars );
+  mRoot = TreeNodeManipulator::Copy(tree, mNumberOfNodes, mNumberOfChars);
 
-  mSources.push_back( VectorChar( (sizeof(char) * mNumberOfChars) ) );
+  mSources.push_back(VectorChar((sizeof(char) * mNumberOfChars)));
 
   VectorChar& buffer = mSources.back();
 
@@ -93,40 +91,41 @@ JsonParser::~JsonParser()
   }
 }
 
-int JsonParser::Parse(const std::string& source)
+bool JsonParser::Parse(const std::string& source)
 {
-  mSources.push_back( VectorChar(source.begin(), source.end()) );
+  mSources.push_back(VectorChar(source.begin(), source.end()));
 
   JsonParserState parserState(mRoot);
 
-  if( parserState.ParseJson(mSources.back()) )
+  if(parserState.ParseJson(mSources.back()))
   {
     mRoot = parserState.GetRoot();
 
     mNumberOfChars += parserState.GetParsedStringSize();
     mNumberOfNodes += parserState.GetCreatedNodeCount();
 
-    mErrorDescription   = ERROR_DESCRIPTION_NONE;
-    mErrorPosition      = 0;
-    mErrorLine          = 0;
-    mErrorColumn        = 0;
+    mErrorDescription = ERROR_DESCRIPTION_NONE;
+    mErrorPosition    = 0;
+    mErrorLine        = 0;
+    mErrorColumn      = 0;
   }
   else
   {
-    mErrorDescription   = parserState.GetErrorDescription();
+    mRoot = NULL;
+
+    mErrorDescription = parserState.GetErrorDescription();
     if(NULL == mErrorDescription)
     {
       mErrorDescription = ERROR_DESCRIPTION_NONE;
     }
-    mErrorPosition      = parserState.GetErrorPosition();
-    mErrorLine          = parserState.GetErrorLineNumber();
-    mErrorColumn        = parserState.GetErrorColumn();
+    mErrorPosition = parserState.GetErrorPosition();
+    mErrorLine     = parserState.GetErrorLineNumber();
+    mErrorColumn   = parserState.GetErrorColumn();
   }
 
   return mRoot != NULL;
 }
 
-
 const TreeNode* JsonParser::GetRoot() const
 {
   return mRoot;
@@ -159,7 +158,7 @@ int JsonParser::GetErrorColumn() const
 
 void JsonParser::Pack(void)
 {
-  mSources.push_back( VectorChar( (sizeof(char) * mNumberOfChars) ) );
+  mSources.push_back(VectorChar((sizeof(char) * mNumberOfChars)));
 
   VectorChar& buffer = mSources.back();
 
@@ -169,7 +168,7 @@ void JsonParser::Pack(void)
 
   modify.MoveStrings(start, buffer.end());
 
-  mSources.erase( mSources.begin(), --mSources.end() );
+  mSources.erase(mSources.begin(), --mSources.end());
 }
 
 void JsonParser::Write(std::ostream& output, int indent) const
@@ -178,7 +177,6 @@ void JsonParser::Write(std::ostream& output, int indent) const
   modify.Write(output, indent);
 }
 
-
 } // namespace Internal
 
 } // namespace Toolkit