Remove the SQLITE_ENABLE_TREE_EXPLAIN compile-time option. Add alternative
debugging display routines: sqlite3TreeViewExpr(), sqlite3TreeViewExprList(),
and sqlite3TreeViewSelect().
FossilOrigin-Name: 4ff51325d6b41d0c59e303b573700ec80c51d216
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index b7e4d07..d637df7 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -470,6 +470,11 @@
#define MAX(A,B) ((A)>(B)?(A):(B))
/*
+** Swap two objects of type TYPE.
+*/
+#define SWAP(TYPE,A,B) {TYPE t=A; A=B; B=t;}
+
+/*
** Check to see if this machine uses EBCDIC. (Yes, believe it or
** not, there are still machines out there that use EBCDIC.)
*/
@@ -855,6 +860,7 @@
typedef struct Table Table;
typedef struct TableLock TableLock;
typedef struct Token Token;
+typedef struct TreeView TreeView;
typedef struct Trigger Trigger;
typedef struct TriggerPrg TriggerPrg;
typedef struct TriggerStep TriggerStep;
@@ -2923,6 +2929,17 @@
} a[1];
};
+#ifdef SQLITE_DEBUG
+/*
+** An instance of the TreeView object is used for printing the content of
+** data structures on sqlite3DebugPrintf() using a tree-like view.
+*/
+struct TreeView {
+ int iLevel; /* Which level of the tree we are on */
+ u64 mLine; /* Mask of continuation lines to be drawn */
+};
+#endif /* SQLITE_DEBUG */
+
/*
** Assuming zIn points to the first byte of a UTF-8 character,
** advance zIn to point to the first byte of the next UTF-8 character.
@@ -3087,25 +3104,14 @@
void *sqlite3TestTextToPtr(const char*);
#endif
-/* Output formatting for SQLITE_TESTCTRL_EXPLAIN */
-#if defined(SQLITE_ENABLE_TREE_EXPLAIN)
- void sqlite3ExplainBegin(Vdbe*);
- void sqlite3ExplainPrintf(Vdbe*, const char*, ...);
- void sqlite3ExplainNL(Vdbe*);
- void sqlite3ExplainPush(Vdbe*);
- void sqlite3ExplainPop(Vdbe*);
- void sqlite3ExplainFinish(Vdbe*);
- void sqlite3ExplainSelect(Vdbe*, Select*);
- void sqlite3ExplainExpr(Vdbe*, Expr*);
- void sqlite3ExplainExprList(Vdbe*, ExprList*);
- const char *sqlite3VdbeExplanation(Vdbe*);
-#else
-# define sqlite3ExplainBegin(X)
-# define sqlite3ExplainSelect(A,B)
-# define sqlite3ExplainExpr(A,B)
-# define sqlite3ExplainExprList(A,B)
-# define sqlite3ExplainFinish(X)
-# define sqlite3VdbeExplanation(X) 0
+#if defined(SQLITE_DEBUG)
+ TreeView *sqlite3TreeViewPush(TreeView*,u8);
+ void sqlite3TreeViewPop(TreeView*);
+ void sqlite3TreeViewLine(TreeView*, const char*, ...);
+ void sqlite3TreeViewItem(TreeView*, const char*, u8);
+ void sqlite3TreeViewExpr(TreeView*, const Expr*, u8);
+ void sqlite3TreeViewExprList(TreeView*, const ExprList*, u8, const char*);
+ void sqlite3TreeViewSelect(TreeView*, const Select*, u8);
#endif
@@ -3128,6 +3134,7 @@
Expr *sqlite3ExprFunction(Parse*,ExprList*, Token*);
void sqlite3ExprAssignVarNumber(Parse*, Expr*);
void sqlite3ExprDelete(sqlite3*, Expr*);
+void sqlite3ExprFactor(sqlite3*, Expr*, u8);
ExprList *sqlite3ExprListAppend(Parse*,ExprList*,Expr*);
void sqlite3ExprListSetName(Parse*,ExprList*,Token*,int);
void sqlite3ExprListSetSpan(Parse*,ExprList*,ExprSpan*);