Changeset 269

Timestamp:

11/28/09 23:58:23 (2 years ago)

Author:

walter

Message:

bugzilla 3481, only

Files:

• trunk/src/expression.c (modified) (3 diffs)
• trunk/src/expression.h (modified) (1 diff)
• trunk/src/idgen.c (modified) (2 diffs)
• trunk/src/lexer.c (modified) (3 diffs)
• trunk/src/lexer.h (modified) (2 diffs)
• trunk/src/opover.c (modified) (2 diffs)
• trunk/src/parse.c (modified) (2 diffs)

trunk/src/expression.c

@@ -124 +124 @@
-    precedence[TOKdiv] = PREC_mul;
-    precedence[TOKmod] = PREC_mul;
+    precedence[TOKpow] = PREC_mul;
-
-    precedence[TOKadd] = PREC_add;
@@ -183 +184 @@
-    precedence[TOKdivass] = PREC_assign;
-    precedence[TOKmodass] = PREC_assign;
+    //precedence[TOKpowass] = PREC_assign;
-    precedence[TOKshlass] = PREC_assign;
-    precedence[TOKshrass] = PREC_assign;
@@ -9772 +9774 @@
-}
-
+PowExp::PowExp(Loc loc, Expression *e1, Expression *e2)
+    : BinExp(loc, TOKpow, sizeof(PowExp), e1, e2)
+{
+}
+
+Expression *PowExp::semantic(Scope *sc)
+{   Expression *e;
+
+    if (type)
+    return this;
+
+    BinExp::semanticp(sc);
+    e = op_overload(sc);
+    if (e)
+    return e;
+
+    static int importMathChecked = 0;
+    if (!importMathChecked)
+    {
+    importMathChecked = 1;
+    for (int i = 0; i < Module::amodules.dim; i++)
+    {   Module *mi = (Module *)Module::amodules.data[i];
+        //printf("\t[%d] %s\n", i, mi->toChars());
+        if (mi->ident == Id::math &&
+        mi->parent->ident == Id::std &&
+        !mi->parent->parent)
+        goto L1;
+    }
+    error("must import std.math to use ^^ operator");
+
+     L1: ;
+    }
+
+    assert(e1->type && e2->type);
+    if ( (e1->type->isintegral() || e1->type->isfloating()) &&
+     (e2->type->isintegral() || e2->type->isfloating()))
+    {
+    // For built-in numeric types, there are three cases:
+    // x ^^ 1   ----> x
+    // x ^^ 0.5 ----> sqrt(x)
+    // x ^^ y   ----> pow(x, y)
+    // TODO: backend support, especially for  e1 ^^ 2.
+    bool wantSqrt = false;  
+    e2 = e2->optimize(0);
+    if ((e2->op == TOKfloat64 && e2->toReal() == 1.0) ||
+        (e2->op == TOKint64 && e2->toInteger() == 1))
+    {
+        return e1;  // Replace x ^^ 1 with x.
+    }
+
+    e = new IdentifierExp(loc, Id::empty);
+    e = new DotIdExp(loc, e, Id::std);
+    e = new DotIdExp(loc, e, Id::math);
+    if (e2->op == TOKfloat64 && e2->toReal() == 0.5)
+    {   // Replace e1 ^^ 0.5 with .std.math.sqrt(x)
+        e = new CallExp(loc, new DotIdExp(loc, e, Id::_sqrt), e1);
+    }
+    else 
+    {   // Replace e1 ^^ e2 with .std.math.pow(e1, e2)
+        e = new CallExp(loc, new DotIdExp(loc, e, Id::_pow), e1, e2);   
+    }   
+    e = e->semantic(sc);
+    return e;
+    }
+    error("%s ^^ %s is not supported", e1->type->toChars(), e2->type->toChars() );
+    return new ErrorExp();
+}
+
-/************************************************************/
-

trunk/src/expression.h

@@ -1299 +1299 @@
-};
-
+#if DMDV2
+struct PowExp : BinExp
+{
+    PowExp(Loc loc, Expression *e1, Expression *e2);
+    Expression *semantic(Scope *sc);
+
+    // For operator overloading
+    Identifier *opId();
+    Identifier *opId_r();
+};
+#endif
+
-struct ShlExp : BinExp
-{

trunk/src/idgen.c

@@ -212 +212 @@
-    { "opDispatch" },
-    { "opImplicitCast" },
+    { "pow", "opPow" },
+    { "pow_r", "opPow_r" },
+    //{ "powass", "opPowAssign" },
-
-    { "classNew", "new" },
@@ -272 +275 @@
-    { "tan" },
-    { "_sqrt", "sqrt" },
+    { "_pow", "pow" },
-    { "fabs" },
-

trunk/src/lexer.c

@@ -1152 +1152 @@
-        return;
-
+#if DMDV2
+        case '^':
+        p++;
+        if (*p == '^')
+        {   p++;
+#if 0
+            if (*p == '=')
+            {   p++;
+            t->value = TOKpowass;  // ^^=
+            }
+            else
+#endif
+            t->value = TOKpow;     // ^^
+        }
+        else if (*p == '=')
+        {   p++;
+            t->value = TOKxorass;    // ^=
+        }
+        else
+            t->value = TOKxor;       // ^
+        return;
+#endif
+
-#define SINGLE(c,tok) case c: p++; t->value = tok; return;
-
@@ -1182 +1205 @@
-        DOUBLE('*', TOKmul, '=', TOKmulass)
-        DOUBLE('%', TOKmod, '=', TOKmodass)
+#if DMDV1
-        DOUBLE('^', TOKxor, '=', TOKxorass)
-
+
-#undef DOUBLE
-
@@ -3085 +3109 @@
-    Token::tochars[TOKidentifier]   = "identifier";
-    Token::tochars[TOKat]       = "@";
+    Token::tochars[TOKpow]      = "^^";
+    //Token::tochars[TOKpowass]     = "^^=";
-
-     // For debugging

trunk/src/lexer.h

@@ -33 +33 @@
-    &   |   ^   &=  |=  ^=
-    =   !   ~   @
+    ^^  ^^=
-    ++  --
-    .   ->  :   ,
@@ -163 +164 @@
-    TOKshared,
-    TOKat,
+    TOKpow,
+    //TOKpowass,
-#endif
-

trunk/src/opover.c

@@ -105 +105 @@
-Identifier *ModExp::opId()   { return Id::mod; }
-Identifier *ModExp::opId_r() { return Id::mod_r; }
+
+#if DMDV2
+Identifier *PowExp::opId()   { return Id::pow; }
+Identifier *PowExp::opId_r() { return Id::pow_r; }
+#endif
-
-Identifier *ShlExp::opId()   { return Id::shl; }
@@ -143 +148 @@
-Identifier *UshrAssignExp::opId()  { return Id::ushrass; }
-Identifier * CatAssignExp::opId()  { return Id::catass;  }
+//Identifier * PowAssignExp::opId()  { return Id::powass;  }
-
-int EqualExp::isCommutative()  { return TRUE; }

trunk/src/parse.c

@@ -5603 +5603 @@
-    {
-        case TOKmul: nextToken(); e2 = parseUnaryExp(); e = new MulExp(loc,e,e2); continue;
-
-
+
+
+
-
-        default:
@@ -5949 +5950 @@
-        X(TOKdivass,    DivAssignExp);
-        X(TOKmodass,    ModAssignExp);
+        //X(TOKpowass,    PowAssignExp);
-        X(TOKandass,    AndAssignExp);
-        X(TOKorass,     OrAssignExp);