From 8850bab60dcb6405e597265ca03c35691d82c1ab Mon Sep 17 00:00:00 2001
From: Andywoww <andywoww@outlook.com>
Date: Thu, 13 Jul 2023 19:41:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=A5=E5=B9=B2BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 calculator/calcer.cpp  | 102 ++++++++++++++--
 calculator/calcer.h    |   5 +
 calculator/calcer.ui   | 256 +++++++++++++++++++++++++++--------------
 calculator/calcero.cpp |  42 ++++++-
 calculator/calcero.h   |   2 +
 5 files changed, 306 insertions(+), 101 deletions(-)

diff --git a/calculator/calcer.cpp b/calculator/calcer.cpp
index 7f70a85..6a9c853 100644
--- a/calculator/calcer.cpp
+++ b/calculator/calcer.cpp
@@ -6,13 +6,17 @@ calcer::calcer(QWidget *parent)
     , ui(new Ui::calcer)
 {
     setWindowFlags(windowFlags()& ~Qt::WindowMaximizeButtonHint);
-    setFixedSize(339,582);
+    setFixedSize(392,581);
     ui->setupUi(this);
     ui->textEdit->setReadOnly(true);
     ui->textEdit2->setReadOnly(true);
     ui->textEdit->setText("0");
     ui->textEdit2->setText("0");
     ss=0;
+    connect(ui->pushe,&QPushButton::clicked,this,&calcer::pushe);
+    connect(ui->pushpi,&QPushButton::clicked,this,&calcer::pushpi);
+    connect(ui->pushx2,&QPushButton::clicked,this,&calcer::pushx2);
+    connect(ui->pushxn,&QPushButton::clicked,this,&calcer::pushxn);
     connect(ui->pushn0,&QPushButton::clicked,this,&calcer::pushn0);
     connect(ui->pushn1,&QPushButton::clicked,this,&calcer::pushn1);
     connect(ui->pushn2,&QPushButton::clicked,this,&calcer::pushn2);
@@ -43,6 +47,75 @@ void calcer::keyPressEvent(QKeyEvent *event){
             }
             break;
     }
+    if(event->modifiers() == Qt::ControlModifier) { // 如果按下了CTRL键
+        if(event->key() == Qt::Key_V){
+            QClipboard *clip=QApplication::clipboard();
+            QString sa=clip->text();
+            std::string s=sa.toStdString();
+            if(s[s.length()-1]=='.')s.erase(s.end()-1);
+            int cnt=0;
+            string::iterator it;     //指向string类的迭代器。你可以理解为指针
+            for(it=s.begin();it!=s.end();it++){
+                if(!((*it>='0'&&*it<='9')||*it=='('||*it==')'||*it=='+'||*it=='-'||*it=='*'||*it=='/'||*it=='^')){
+                    s.erase(it);
+                    it--;
+                }
+            }
+            for(int i=0;i<s.length();i++){
+                if(s[i]=='('||s[i]==')')cnt++;
+            }
+            if(!isdigit(s.back())&&s.back()!='('){
+                if(s.back()=='^')s+='1';
+                else s+='0';
+            }
+            if(cnt%2!=0)s+=')';
+            sa=QString::fromStdString(s);
+            if(sa[0].isDigit()&&ui->textEdit->toPlainText()=="0")ui->textEdit->setText(sa);
+            else ui->textEdit->setText(ui->textEdit->toPlainText()+sa);
+        }
+    }
+}
+void calcer::pushxn(){
+    QString s=ui->textEdit->toPlainText();
+    if(s[s.length()-1]=='=')s.erase(s.end()-1);
+    QChar a=s[s.length()-1];
+    if(a=='.')s.erase(s.end()-1);
+    a=s[s.length()-1];
+    if(a.isDigit()||a==')')
+        s+='^';
+    ui->textEdit->setText(s);
+    return;
+}
+void calcer::pushe(){
+    QString s=ui->textEdit->toPlainText();
+    if(s=="0")s="";
+    if(!s.isEmpty()){
+        QChar a=s.back();
+        if(!a.isDigit())s+="2.7182818284590452353602874713527";
+    }else s="2.7182818284590452353602874713527";
+    ui->textEdit->setText(s);
+    return;
+}
+void calcer::pushpi(){
+    QString s=ui->textEdit->toPlainText();
+    if(s=="0")s="";
+    if(!s.isEmpty()){
+        QChar a=s.back();
+        if(!a.isDigit())s+="3.1415926535897932384626433832795";
+    }else s="3.1415926535897932384626433832795";
+    ui->textEdit->setText(s);
+    return;
+}
+void calcer::pushx2(){
+    QString s=ui->textEdit->toPlainText();
+    if(s[s.length()-1]=='=')s.erase(s.end()-1);
+    QChar a=s[s.length()-1];
+    if(a=='.')s.erase(s.end()-1);
+    a=s[s.length()-1];
+    if(a.isDigit()||a==')')
+        s+="^2";
+    ui->textEdit->setText(s);
+    return;
 }
 void calcer::pushb(){
     QString s=ui->textEdit->toPlainText();
@@ -133,6 +206,7 @@ void calcer::pushn9(){
 }
 void calcer::pushjia(){
     QString s=ui->textEdit->toPlainText();
+    if(s[s.length()-1]=='=')s.erase(s.end()-1);
     QChar a=s[s.length()-1];
     if(a=='.')s.erase(s.end()-1);
     a=s[s.length()-1];
@@ -143,6 +217,7 @@ void calcer::pushjia(){
 }
 void calcer::pushjian(){
     QString s=ui->textEdit->toPlainText();
+    if(s[s.length()-1]=='=')s.erase(s.end()-1);
     if(s=="0")s="";
     else{
         QChar a=s[s.length()-1];
@@ -150,12 +225,14 @@ void calcer::pushjian(){
     }
     /*QChar a=s[s.length()-1];
     if(a.isDigit())*/
-    s+='-';
+    QChar a=s[s.length()-1];
+    if(a.isDigit()||a=='(')s+='-';
     ui->textEdit->setText(s);
     return;
 }
 void calcer::pushcheng(){
     QString s=ui->textEdit->toPlainText();
+    if(s[s.length()-1]=='=')s.erase(s.end()-1);
     QChar a=s[s.length()-1];
     if(a=='.')s.erase(s.end()-1);
     a=s[s.length()-1];
@@ -166,6 +243,7 @@ void calcer::pushcheng(){
 }
 void calcer::pushchu(){
     QString s=ui->textEdit->toPlainText();
+    if(s[s.length()-1]=='=')s.erase(s.end()-1);
     if(s=="0"){s+='/';}
     else{
         QChar a=s[s.length()-1];
@@ -205,25 +283,34 @@ void calcer::pushnd(){
 void calcer::pushdy(){
     calcs a;
     std::string s=ui->textEdit->toPlainText().toStdString();
+    if(s[s.length()-1]=='=')s.pop_back();
     if(s[s.length()-1]=='.')s.erase(s.end()-1);
+    if(!isdigit(s.back())&&s.back()!='('){
+        if(s.back()=='^')s+='1';
+        else s+='0';
+    }
+    int cnt=0;
     for(int i=0;i<s.length();i++){
-        if(s[i]=='-'){
+        /*if(s[i]=='-'){
             if(i==0)s.insert(0,1,'0');
             else if(s[i-1]=='(')s.insert(i,1,'0');
-        }
+        }*/
+        if(s[i]=='('||s[i]==')')cnt++;
     }
+    if(cnt%2!=0)s+=')';
     std::cout<<s<<std::endl;
     a.mid2last(s);
+    QString y=QString::fromStdString(s);
+    y+='=';
     s=a.calc();
-    QString y=ui->textEdit->toPlainText();
-    if(y[y.length()-1]=='.'||y[y.length()-1]=='=')y.erase(y.end()-1);
-    ui->textEdit->setText(y+'=');
+    ui->textEdit->setText(y);
     QString k=QString::fromStdString(s);
     ui->textEdit2->setText(k);
     return;
 }
 void calcer::pushl(){
     QString s=ui->textEdit->toPlainText();
+    if(s[s.length()-1]=='=')s.erase(s.end()-1);
     if(s=="0")s="";
     if(!ss){
         s+='(';
@@ -234,6 +321,7 @@ void calcer::pushl(){
 }
 void calcer::pushr(){
     QString s=ui->textEdit->toPlainText();
+    if(s[s.length()-1]=='=')s.erase(s.end()-1);
     if(s=="0")s="";
     if(ss){
         s+=')';
diff --git a/calculator/calcer.h b/calculator/calcer.h
index 77be6ef..fbb6971 100644
--- a/calculator/calcer.h
+++ b/calculator/calcer.h
@@ -4,6 +4,7 @@
 #include <QMainWindow>
 #include <QKeyEvent>
 #include <string>
+#include <QClipboard>
 QT_BEGIN_NAMESPACE
 namespace Ui { class calcer; }
 QT_END_NAMESPACE
@@ -20,7 +21,11 @@ class calcer : public QMainWindow
     void keyPressEvent(QKeyEvent *event);
 public slots:
     bool check(std::string *s);
+    void pushe();
+    void pushpi();
     void pushnd();
+    void pushx2();
+    void pushxn();
     void pushb();
     void pushc();
     void pushn0();
diff --git a/calculator/calcer.ui b/calculator/calcer.ui
index 0be1f9c..d73e11f 100644
--- a/calculator/calcer.ui
+++ b/calculator/calcer.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>339</width>
-    <height>582</height>
+    <width>392</width>
+    <height>581</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -22,7 +22,7 @@
      <rect>
       <x>10</x>
       <y>10</y>
-      <width>321</width>
+      <width>377</width>
       <height>536</height>
      </rect>
     </property>
@@ -33,8 +33,8 @@
      <property name="horizontalSpacing">
       <number>0</number>
      </property>
-     <item row="2" column="1">
-      <widget class="QPushButton" name="pushn2">
+     <item row="4" column="1">
+      <widget class="QPushButton" name="pushn5">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -47,15 +47,15 @@
         </font>
        </property>
        <property name="text">
-        <string>2</string>
+        <string>5</string>
        </property>
        <property name="shortcut">
-        <string>2</string>
+        <string>5</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
-      <widget class="QPushButton" name="pushn5">
+     <item row="3" column="2">
+      <widget class="QPushButton" name="pushn3">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -68,15 +68,36 @@
         </font>
        </property>
        <property name="text">
-        <string>5</string>
+        <string>3</string>
        </property>
        <property name="shortcut">
-        <string>5</string>
+        <string>3</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="0">
+      <widget class="QPushButton" name="pushn0">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>60</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>15</pointsize>
+        </font>
+       </property>
+       <property name="text">
+        <string>0</string>
+       </property>
+       <property name="shortcut">
+        <string>0</string>
        </property>
       </widget>
      </item>
      <item row="4" column="0">
-      <widget class="QPushButton" name="pushn7">
+      <widget class="QPushButton" name="pushn4">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -89,15 +110,15 @@
         </font>
        </property>
        <property name="text">
-        <string>7</string>
+        <string>4</string>
        </property>
        <property name="shortcut">
-        <string>7</string>
+        <string>4</string>
        </property>
       </widget>
      </item>
-     <item row="7" column="2">
-      <widget class="QPushButton" name="pushb">
+     <item row="2" column="3">
+      <widget class="QPushButton" name="pushc">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -110,15 +131,15 @@
         </font>
        </property>
        <property name="text">
-        <string>BACK</string>
+        <string>C</string>
        </property>
        <property name="shortcut">
-        <string>Backspace</string>
+        <string>C</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="3">
-      <widget class="QPushButton" name="pushcheng">
+     <item row="5" column="0">
+      <widget class="QPushButton" name="pushn7">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -131,15 +152,15 @@
         </font>
        </property>
        <property name="text">
-        <string>×</string>
+        <string>7</string>
        </property>
        <property name="shortcut">
-        <string>*</string>
+        <string>7</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="3">
-      <widget class="QPushButton" name="pushjia">
+     <item row="6" column="3">
+      <widget class="QPushButton" name="pushchu">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -152,25 +173,40 @@
         </font>
        </property>
        <property name="text">
-        <string>+</string>
+        <string>÷</string>
        </property>
        <property name="shortcut">
-        <string>+</string>
+        <string>/</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="0" colspan="4">
-      <widget class="QTextEdit" name="textEdit">
+     <item row="4" column="3">
+      <widget class="QPushButton" name="pushjian">
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>0</height>
+         <height>60</height>
         </size>
        </property>
-       <property name="maximumSize">
+       <property name="font">
+        <font>
+         <pointsize>15</pointsize>
+        </font>
+       </property>
+       <property name="text">
+        <string>-</string>
+       </property>
+       <property name="shortcut">
+        <string>-</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QPushButton" name="pushnd">
+       <property name="minimumSize">
         <size>
-         <width>16777215</width>
-         <height>81</height>
+         <width>0</width>
+         <height>60</height>
         </size>
        </property>
        <property name="font">
@@ -178,10 +214,16 @@
          <pointsize>15</pointsize>
         </font>
        </property>
+       <property name="text">
+        <string>.</string>
+       </property>
+       <property name="shortcut">
+        <string>.</string>
+       </property>
       </widget>
      </item>
-     <item row="5" column="0">
-      <widget class="QPushButton" name="pushn0">
+     <item row="3" column="3">
+      <widget class="QPushButton" name="pushjia">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -194,14 +236,14 @@
         </font>
        </property>
        <property name="text">
-        <string>0</string>
+        <string>+</string>
        </property>
        <property name="shortcut">
-        <string>0</string>
+        <string>+</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="2">
+     <item row="6" column="2">
       <widget class="QPushButton" name="pushdy">
        <property name="minimumSize">
         <size>
@@ -222,8 +264,8 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <widget class="QPushButton" name="pushn4">
+     <item row="3" column="1">
+      <widget class="QPushButton" name="pushn2">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -236,15 +278,15 @@
         </font>
        </property>
        <property name="text">
-        <string>4</string>
+        <string>2</string>
        </property>
        <property name="shortcut">
-        <string>4</string>
+        <string>2</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
-      <widget class="QPushButton" name="pushn8">
+     <item row="2" column="0">
+      <widget class="QPushButton" name="pushl">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -257,14 +299,14 @@
         </font>
        </property>
        <property name="text">
-        <string>8</string>
+        <string>(</string>
        </property>
        <property name="shortcut">
-        <string>8</string>
+        <string>(</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="2">
+     <item row="4" column="2">
       <widget class="QPushButton" name="pushn6">
        <property name="minimumSize">
         <size>
@@ -285,8 +327,8 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="3">
-      <widget class="QPushButton" name="pushjian">
+     <item row="5" column="1">
+      <widget class="QPushButton" name="pushn8">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -299,15 +341,36 @@
         </font>
        </property>
        <property name="text">
-        <string>-</string>
+        <string>8</string>
        </property>
        <property name="shortcut">
-        <string>-</string>
+        <string>8</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QPushButton" name="pushn1">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>60</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>15</pointsize>
+        </font>
+       </property>
+       <property name="text">
+        <string>1</string>
+       </property>
+       <property name="shortcut">
+        <string>1</string>
        </property>
       </widget>
      </item>
      <item row="2" column="2">
-      <widget class="QPushButton" name="pushn3">
+      <widget class="QPushButton" name="pushb">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -320,15 +383,15 @@
         </font>
        </property>
        <property name="text">
-        <string>3</string>
+        <string>BACK</string>
        </property>
        <property name="shortcut">
-        <string>3</string>
+        <string>Backspace</string>
        </property>
       </widget>
      </item>
-     <item row="7" column="3">
-      <widget class="QPushButton" name="pushc">
+     <item row="5" column="3">
+      <widget class="QPushButton" name="pushcheng">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -341,14 +404,14 @@
         </font>
        </property>
        <property name="text">
-        <string>C</string>
+        <string>×</string>
        </property>
        <property name="shortcut">
-        <string>C</string>
+        <string>*</string>
        </property>
       </widget>
      </item>
-     <item row="7" column="1">
+     <item row="2" column="1">
       <widget class="QPushButton" name="pushr">
        <property name="minimumSize">
         <size>
@@ -369,8 +432,8 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="3">
-      <widget class="QPushButton" name="pushchu">
+     <item row="5" column="2">
+      <widget class="QPushButton" name="pushn9">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -383,14 +446,35 @@
         </font>
        </property>
        <property name="text">
-        <string>÷</string>
+        <string>9</string>
        </property>
        <property name="shortcut">
-        <string>/</string>
+        <string>9</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="4">
+      <widget class="QPushButton" name="pushe">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>60</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>15</pointsize>
+        </font>
+       </property>
+       <property name="text">
+        <string>e</string>
+       </property>
+       <property name="shortcut">
+        <string>E</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="0" colspan="4">
+     <item row="1" column="0" colspan="5">
       <widget class="QTextEdit" name="textEdit2">
        <property name="minimumSize">
         <size>
@@ -411,12 +495,18 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
-      <widget class="QPushButton" name="pushn1">
+     <item row="0" column="0" colspan="5">
+      <widget class="QTextEdit" name="textEdit">
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>60</height>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>81</height>
         </size>
        </property>
        <property name="font">
@@ -424,16 +514,10 @@
          <pointsize>15</pointsize>
         </font>
        </property>
-       <property name="text">
-        <string>1</string>
-       </property>
-       <property name="shortcut">
-        <string>1</string>
-       </property>
       </widget>
      </item>
-     <item row="4" column="2">
-      <widget class="QPushButton" name="pushn9">
+     <item row="3" column="4">
+      <widget class="QPushButton" name="pushpi">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -446,15 +530,12 @@
         </font>
        </property>
        <property name="text">
-        <string>9</string>
-       </property>
-       <property name="shortcut">
-        <string>9</string>
+        <string>π</string>
        </property>
       </widget>
      </item>
-     <item row="7" column="0">
-      <widget class="QPushButton" name="pushl">
+     <item row="4" column="4">
+      <widget class="QPushButton" name="pushx2">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -467,15 +548,12 @@
         </font>
        </property>
        <property name="text">
-        <string>(</string>
-       </property>
-       <property name="shortcut">
-        <string>(</string>
+        <string>x²</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
-      <widget class="QPushButton" name="pushnd">
+     <item row="5" column="4">
+      <widget class="QPushButton" name="pushxn">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -488,10 +566,10 @@
         </font>
        </property>
        <property name="text">
-        <string>.</string>
+        <string>x^n</string>
        </property>
        <property name="shortcut">
-        <string>.</string>
+        <string>^</string>
        </property>
       </widget>
      </item>
@@ -503,7 +581,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>339</width>
+     <width>392</width>
      <height>22</height>
     </rect>
    </property>
diff --git a/calculator/calcero.cpp b/calculator/calcero.cpp
index ff6ff36..85625f7 100644
--- a/calculator/calcero.cpp
+++ b/calculator/calcero.cpp
@@ -5,6 +5,10 @@ void calcs::mid2last(string a){
     stack<char>signs;
     string lastf;
     for(int i=0;i<a.length();i++){
+        if(a[i]=='-'){
+            if(i==0){lastf.push_back(a[i]);i++;}
+            else if(a[i-1]=='('){lastf.push_back(a[i]);i++;}
+        }
         if((a[i]>='0'&&a[i]<='9')||a[i]=='.')lastf.push_back(a[i]);
         else{
             if(lastf[lastf.length()-1]=='.')lastf.pop_back();
@@ -39,6 +43,21 @@ void calcs::mid2last(string a){
                     break;
                 }
             }
+            if((a[i]=='^')){
+                while(1){
+                    string s(1,a[i]);
+                    if(signs.empty()||signs.top()=='(')signs.push(a[i]);
+                    else if((signs.top()=='+'||signs.top()=='-'))signs.push(a[i]);
+                    else{
+                        s.pop_back();
+                        s+=signs.top();
+                        signs.pop();
+                        last.push(s);
+                        continue;
+                    }
+                    break;
+                }
+            }
             if(a[i]=='('){
                 signs.push('(');
             }
@@ -71,12 +90,22 @@ string calcs::calc(){
     try{
         while(!ls2.empty()){
             string x=ls2.top();
-            if(x.front()>='0')datas.push(x);
+            if(x.front()>='0'&&x.front()<='9'||x.length()>1)datas.push(x);
             else{
-                double s1=stod(datas.top());
+                string s=datas.top();
+                double s1,s2;
+                stringstream ss;
+                ss<<fixed<<setprecision(100)<<s;
+                ss>>s1;
+                ss.clear();
+                ss.str("");
                 datas.pop();
                 if(datas.empty())(throw -1);
-                double s2=stod(datas.top());
+                s=datas.top();
+                ss<<fixed<<setprecision(100)<<s;
+                ss>>s2;
+                ss.clear();
+                ss.str("");
                 datas.pop();
                 double res;
                 if(x=="+")res=s1+s2;
@@ -86,8 +115,11 @@ string calcs::calc(){
                     if(s1==0)throw -1;
                     res=s2/s1;
                 }
-                string y=to_string(res);
-                char *p=&y[y.length()-1];
+                if(x=="^")res=pow(s2,s1);
+                ss<<fixed<<setprecision(100)<<res;
+                string y=ss.str();
+                ss.clear();
+                ss.str("");
                 int pos=y.find('.');
                 if(pos!=string::npos){
                     int i=y.length()-1;
diff --git a/calculator/calcero.h b/calculator/calcero.h
index 3469411..15efa8c 100644
--- a/calculator/calcero.h
+++ b/calculator/calcero.h
@@ -1,8 +1,10 @@
 #include<iostream>
+#include<iomanip>
 #include<cstdio>
 #include<stack>
 #include<queue>
 #include<iostream>
+#include<cmath>
 #include<string>
 #include<algorithm>
 #include<sstream>