summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-07-27 16:48:31 +0200
committerEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-07-27 16:48:31 +0200
commit23579ad5a15377a4832163290b00ab23f504ba14 (patch)
tree249a1b800ffb98a027f87838c7908207b0c43930 /include
parente3205d872acd87d1d3a81e489a1416586ced1236 (diff)
update coding style
Diffstat (limited to 'include')
-rw-r--r--include/object.h16
1 files changed, 12 insertions, 4 deletions
diff --git a/include/object.h b/include/object.h
index 47935d7..6350259 100644
--- a/include/object.h
+++ b/include/object.h
@@ -41,13 +41,21 @@ public:
*/
Object(const Value &value) : Value()
{
- // string types are instantiated
- if (value.isString()) {
+ // when a string is passed in, we are going to make a new instance of the
+ // passed in string
+ if (value.isString())
+ {
+ // instantiate the object
instantiate(value);
+
+ // and call the __construct method
call("__construct");
}
- // otherwise copy the other object
- else operator=(value);
+ else
+ {
+ // this simply copies the other object
+ operator=(value);
+ }
}
/**