~ubuntu-branches/ubuntu/karmic/webkit/karmic-proposed

« back to all changes in this revision

Viewing changes to JavaScriptCore/parser/ResultType.h

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2009-05-15 18:30:58 UTC
  • mto: (4.4.1 sid) (1.2.2 upstream) (16.1.1 lucid)
  • mto: This revision was merged to the branch mainline in revision 8.
  • Revision ID: james.westby@ubuntu.com-20090515183058-35m5or0ufm5tutud
Tags: upstream-1.1.7
ImportĀ upstreamĀ versionĀ 1.1.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
63
63
            return (m_type & TypeBits) == TypeMaybeNumber;
64
64
        }
65
65
        
 
66
        bool definitelyIsString()
 
67
        {
 
68
            return (m_type & TypeBits) == TypeMaybeString;
 
69
        }
 
70
 
66
71
        bool mightBeNumber()
67
72
        {
68
73
            return m_type & TypeMaybeNumber;
117
122
        {
118
123
            if (op1.definitelyIsNumber() && op2.definitelyIsNumber())
119
124
                return numberTypeCanReuse();
120
 
            if (op1.isNotNumber() || op2.isNotNumber())
 
125
            if (op1.definitelyIsString() || op2.definitelyIsString())
121
126
                return stringType();
122
127
            return stringOrNumberTypeCanReuse();
123
128
        }