Franco Castellacci 9 лет назад
Родитель
Сommit
f466a7a4aa
3 измененных файлов с 57 добавлено и 57 удалено
  1. 2 2
      lib/Parser/Parse.cpp
  2. 48 48
      lib/Parser/Scan.cpp
  3. 7 7
      lib/Parser/ptree.h

+ 2 - 2
lib/Parser/Parse.cpp

@@ -6433,7 +6433,7 @@ ParseNodePtr Parser::GenerateModuleFunctionWrapper()
 {
     ParseNodePtr pnodeFnc = ParseFncDecl<buildAST>(fFncModule, nullptr, false, true, true);
     ParseNodePtr callNode = CreateCallNode(knopCall, pnodeFnc, nullptr);
-	 
+     
     return callNode;
 }
 
@@ -8231,7 +8231,7 @@ ParseNodePtr Parser::ParseExpr(int oplMin,
     {
         ichMin = m_pscan->IchMinTok();
         BOOL fLikelyPattern = FALSE;
-		//FCASTE: parsing of terms, add here the type information parsing
+        //FCASTE: parsing of terms, add here the type information parsing
         pnode = ParseTerm<buildAST>(TRUE, pNameHint, &hintLength, &hintOffset, &term, fUnaryOrParen, &fCanAssign, IsES6DestructuringEnabled() ? &fLikelyPattern : nullptr, &fIsDotOrIndex);
         if (pfLikelyPattern != nullptr)
         {

+ 48 - 48
lib/Parser/Scan.cpp

@@ -1648,10 +1648,10 @@ tokens Scanner<EncodingPolicy>::ScanStringConstant(OLECHAR delim, EncodedCharPtr
 template<typename EncodingPolicy>
 tokens Scanner<EncodingPolicy>::ScanAnnotations(EncodedCharPtr *pp)
 {
-	EncodedCharPtr p = *pp;
-	EncodedCharPtr last = m_pchLast;
-	OLECHAR ch;
-	//FCASTE: IMPORTANT
+    EncodedCharPtr p = *pp;
+    EncodedCharPtr last = m_pchLast;
+    OLECHAR ch;
+    //FCASTE: IMPORTANT
     for (;;)
     {
         switch ((ch = this->ReadFirst(p, last)))
@@ -1687,48 +1687,48 @@ tokens Scanner<EncodingPolicy>::ScanAnnotations(EncodedCharPtr *pp)
             default:
                 Error(ERRsyntax);
             }
-		case kchLS:         // 0x2028, classifies as new line
-		case kchPS:         // 0x2029, classifies as new line
-		LEcmaLineBreak:
-			goto LLineBreak;
-
-		case kchRET:
-		case kchNWL:
-		LLineBreak:
-			m_fHadEol = TRUE;
-			m_currentCharacter = p;
-			ScanNewLine(ch);
-			p = m_currentCharacter;
-			break;
-
-		case kchNUL:
-			if (p >= last)
-			{
-				m_currentCharacter = p - 1;
-				*pp = p - 1;
-				if (m_fSyntaxColor)
-				{
-					m_scanState = ScanStateMultiLineComment;
-					return tkComment;
-				}
-				Error(ERRnoCmtEnd);
-			}
-			break;
-
-		default:
-			if (this->IsMultiUnitChar(ch))
-			{
-				ch = this->template ReadRest<true>(ch, p, last);
-				switch (ch)
-				{
-				case kchLS:
-				case kchPS:
-					goto LEcmaLineBreak;
-				}
-			}
-			break;
-		}
-	}
+        case kchLS:         // 0x2028, classifies as new line
+        case kchPS:         // 0x2029, classifies as new line
+        LEcmaLineBreak:
+            goto LLineBreak;
+
+        case kchRET:
+        case kchNWL:
+        LLineBreak:
+            m_fHadEol = TRUE;
+            m_currentCharacter = p;
+            ScanNewLine(ch);
+            p = m_currentCharacter;
+            break;
+
+        case kchNUL:
+            if (p >= last)
+            {
+                m_currentCharacter = p - 1;
+                *pp = p - 1;
+                if (m_fSyntaxColor)
+                {
+                    m_scanState = ScanStateMultiLineComment;
+                    return tkComment;
+                }
+                Error(ERRnoCmtEnd);
+            }
+            break;
+
+        default:
+            if (this->IsMultiUnitChar(ch))
+            {
+                ch = this->template ReadRest<true>(ch, p, last);
+                switch (ch)
+                {
+                case kchLS:
+                case kchPS:
+                    goto LEcmaLineBreak;
+                }
+            }
+            break;
+        }
+    }
 }
 
 /*****************************************************************************
@@ -1743,7 +1743,7 @@ tokens Scanner<EncodingPolicy>::SkipComment(EncodedCharPtr *pp, /* out */ bool*
     *containTypeDef = false;
     EncodedCharPtr last = m_pchLast;
     OLECHAR ch;
-	//FCASTE: IMPORTANT
+    //FCASTE: IMPORTANT
     for (;;)
     {
         switch((ch = this->ReadFirst(p, last)))
@@ -2179,7 +2179,7 @@ LIdentifier:
             Assert(chType == _C_RC);
             token = tkRCurly;
             break;
-			
+            
         case '\\':
             pchT = p - 1;
             token = ScanIdentifier(identifyKwds, &pchT);

+ 7 - 7
lib/Parser/ptree.h

@@ -603,13 +603,13 @@ struct PnFinally : PnStmt
 enum class JsType : byte 
 {
     Unknown,
-	Object,
-	String,
-	Int,
-	Float,
-	Bool,
-	Array,
-	Function
+    Object,
+    String,
+    Int,
+    Float,
+    Bool,
+    Array,
+    Function
 };
 
 struct ParseNode