[Gnash-commit] /srv/bzr/gnash/avm2 r9718: minor reformatting.

[rob]

------------------------------------------------------------
revno: 9718
committer: address@hidden
branch nick: avm2
timestamp: Sat 2009-05-02 12:37:06 -0600
message:
  minor reformatting.
modified:
  libcore/vm/Machine.cpp
  libcore/vm/asName.h

=== modified file 'libcore/vm/Machine.cpp'
--- a/libcore/vm/Machine.cpp    2009-04-01 14:22:00 +0000
+++ b/libcore/vm/Machine.cpp    2009-05-02 18:37:06 +0000
@@ -1175,19 +1175,18 @@
                boost::uint32_t argc = mStream->read_V32();
                std::auto_ptr< std::vector<as_value> > args = get_args(argc);
                //TODO: If multiname is runtime also pop namespace and/or name 
values.
-        if ( a.isRuntime() )
-        {
-            log_unimpl("ABC_ACTION_CALL* with runtime multiname");
-        }
+                if ( a.isRuntime() ) {
+                    log_unimpl("ABC_ACTION_CALL* with runtime multiname");
+                }
                as_value object_val = pop_stack();
-
+                
                as_object *object = object_val.to_object().get();
                if (!object) {
-            IF_VERBOSE_ASCODING_ERRORS(
+                    IF_VERBOSE_ASCODING_ERRORS(
                        log_aserror(_("Can't call a method of a value that 
doesn't cast to an object (%s)."),
-                object_val);
-            )
-               }
+                                    object_val);
+                        )
+                        }
                else{
 
                        as_value property = 
object->getMember(a.getGlobalName(),0);
@@ -1200,19 +1199,19 @@
 
                        }
                        else{
-                IF_VERBOSE_ASCODING_ERRORS(
+                            IF_VERBOSE_ASCODING_ERRORS(
                                log_aserror(_("Property '%s' of object '%s' is 
'%s', "
-                        "cannot call as method"),
-                        mPoolObject->stringPoolAt(a.getABCName()),
-                        object_val, property);
-                )
-                       }
-
+                                              "cannot call as method"),
+                                            
mPoolObject->stringPoolAt(a.getABCName()),
+                                            object_val, property);
+                                )
+                                }
+                        
                }
-                       if (opcode == SWF::ABC_ACTION_CALLPROPERTY) {
-                               push_stack(result);
-                       }
-
+                if (opcode == SWF::ABC_ACTION_CALLPROPERTY) {
+                    push_stack(result);
+                }
+                
 /*             int shift = completeName(a, argc);
                ENSURE_OBJECT(mStack.top(shift + argc));
                as_object *obj = mStack.top(argc + shift).to_object().get();

=== modified file 'libcore/vm/asName.h'
--- a/libcore/vm/asName.h       2009-03-25 11:02:48 +0000
+++ b/libcore/vm/asName.h       2009-05-02 18:37:06 +0000
@@ -50,15 +50,15 @@
                _namespace(0)
        {}
 
-    void setFlags(Kind kind) {
-        _flags = kind;
-    }
-
-    boost::uint8_t flags() const {
-        return _flags;
-    }
-
-    /// If true, the name needs a run-time string value to complete it.
+        void setFlags(Kind kind) {
+          _flags = kind;
+        }
+        
+        boost::uint8_t flags() const {
+          return _flags;
+        }
+
+        /// If true, the name needs a run-time string value to complete it.
        bool isRuntime() { return _flags & FLAG_RTNAME; }
 
        /// If true, the name needs a run-time namespace to complete it.
@@ -82,13 +82,13 @@
 
        Property* findProperty();
     
-    void namespaceSet(std::vector<asNamespace*>* v) {
-        _namespaceSet = v;
-    }
+        void namespaceSet(std::vector<asNamespace*>* v) {
+          _namespaceSet = v;
+        }
 
-    const std::vector<asNamespace*>* namespaceSet() const {
-        return _namespaceSet;
-    }
+        const std::vector<asNamespace*>* namespaceSet() const {
+          return _namespaceSet;
+        }
 
 private:
 
@@ -101,9 +101,9 @@
                FLAG_NSSET = 0x10
        };
 
-    boost::uint8_t _flags;
-
-    std::vector<asNamespace*>* _namespaceSet;
+        boost::uint8_t _flags;
+        
+        std::vector<asNamespace*>* _namespaceSet;
 
        string_table::key _abcName;
        string_table::key _globalName;