OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2005 Maksim Orlovich <maksim@kde.org> | 2 * Copyright 2005 Maksim Orlovich <maksim@kde.org> |
3 * Copyright (C) 2006 Apple Computer, Inc. | 3 * Copyright (C) 2006 Apple Computer, Inc. |
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
5 * | 5 * |
6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
8 * are met: | 8 * are met: |
9 * | 9 * |
10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
474 Parser* oldParser = currentParser; | 474 Parser* oldParser = currentParser; |
475 currentParser = this; | 475 currentParser = this; |
476 int parseError = xpathyyparse(this); | 476 int parseError = xpathyyparse(this); |
477 currentParser = oldParser; | 477 currentParser = oldParser; |
478 | 478 |
479 if (parseError) { | 479 if (parseError) { |
480 #if !ENABLE(OILPAN) | 480 #if !ENABLE(OILPAN) |
481 while (!m_parseNodes.isEmpty()) | 481 while (!m_parseNodes.isEmpty()) |
482 delete m_parseNodes.takeAny(); | 482 delete m_parseNodes.takeAny(); |
483 | 483 |
484 HashSet<Vector<OwnPtr<Predicate> >*>::iterator pend = m_predicateVectors
.end(); | 484 for (auto& predicate : m_predicateVectors) |
485 for (HashSet<Vector<OwnPtr<Predicate> >*>::iterator it = m_predicateVect
ors.begin(); it != pend; ++it) | 485 delete predicate; |
486 delete *it; | |
487 m_predicateVectors.clear(); | 486 m_predicateVectors.clear(); |
488 | 487 |
489 HashSet<Vector<OwnPtr<Expression> >*>::iterator eend = m_expressionVecto
rs.end(); | 488 for (auto& expression : m_expressionVectors) |
490 for (HashSet<Vector<OwnPtr<Expression> >*>::iterator it = m_expressionVe
ctors.begin(); it != eend; ++it) | 489 delete expression; |
491 delete *it; | |
492 m_expressionVectors.clear(); | 490 m_expressionVectors.clear(); |
493 | 491 |
494 m_nodeTests.clear(); | 492 m_nodeTests.clear(); |
495 #endif | 493 #endif |
496 | 494 |
497 m_strings.clear(); | 495 m_strings.clear(); |
498 | 496 |
499 m_topExpr = nullptr; | 497 m_topExpr = nullptr; |
500 | 498 |
501 if (m_gotNamespaceError) | 499 if (m_gotNamespaceError) |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
632 #if !ENABLE(OILPAN) | 630 #if !ENABLE(OILPAN) |
633 if (t == 0) | 631 if (t == 0) |
634 return; | 632 return; |
635 | 633 |
636 ASSERT(m_nodeTests.contains(t)); | 634 ASSERT(m_nodeTests.contains(t)); |
637 | 635 |
638 m_nodeTests.remove(t); | 636 m_nodeTests.remove(t); |
639 #endif | 637 #endif |
640 } | 638 } |
641 | 639 |
OLD | NEW |