/ Check-in [717245d4]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix typos in the opcode documentation. Comment changes only. No changes to code.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:717245d48714c08156c9b7636aaa6c3a402bad66
User & Date: drh 2014-08-06 01:08:07
Context
2014-08-06
03:06
In the Win32 VFS, work around InterlockedCompareExchange() being a macro on some platforms (e.g. x64). check-in: 7be244ce user: mistachkin tags: trunk
02:03
Merge all recent changes from trunk. check-in: a353a851 user: drh tags: threads
01:51
Merge 3.8.6 beta changes in from trunk. check-in: b2e01080 user: drh tags: apple-osx
01:25
Merge the latest 3.8.6 beta changes from trunk. check-in: 68a6d5e2 user: drh tags: sessions
01:08
Fix typos in the opcode documentation. Comment changes only. No changes to code. check-in: 717245d4 user: drh tags: trunk
00:29
A simpler fix for ticket [3a88d85f36704eebe1] - one that uses less code. The error message is not quite as good, but as this error has apparently not previously occurred in over 8 years of heavy use, that is not seen as a serious problem. check-in: 0ad1ed8e user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbe.c.

   792    792     pOut->flags = MEM_Int;
   793    793     if( pOp->p2 ) pc = pOp->p2 - 1;
   794    794     break;
   795    795   }
   796    796   
   797    797   /* Opcode:  EndCoroutine P1 * * * *
   798    798   **
   799         -** The instruction at the address in register P1 is an Yield.
          799  +** The instruction at the address in register P1 is a Yield.
   800    800   ** Jump to the P2 parameter of that Yield.
   801    801   ** After the jump, register P1 becomes undefined.
   802    802   **
   803    803   ** See also: InitCoroutine
   804    804   */
   805    805   case OP_EndCoroutine: {           /* in1 */
   806    806     VdbeOp *pCaller;
................................................................................
   985    985   }
   986    986   #endif
   987    987   
   988    988   /* Opcode: String8 * P2 * P4 *
   989    989   ** Synopsis: r[P2]='P4'
   990    990   **
   991    991   ** P4 points to a nul terminated UTF-8 string. This opcode is transformed 
   992         -** into an OP_String before it is executed for the first time.  During
          992  +** into a String before it is executed for the first time.  During
   993    993   ** this transformation, the length of string P4 is computed and stored
   994    994   ** as the P1 parameter.
   995    995   */
   996    996   case OP_String8: {         /* same as TK_STRING, out2-prerelease */
   997    997     assert( pOp->p4.z!=0 );
   998    998     pOp->opcode = OP_String;
   999    999     pOp->p1 = sqlite3Strlen30(pOp->p4.z);
................................................................................
  3509   3509   ** that are used as an unpacked index key. 
  3510   3510   **
  3511   3511   ** Reposition cursor P1 so that  it points to the smallest entry that 
  3512   3512   ** is greater than or equal to the key value. If there are no records 
  3513   3513   ** greater than or equal to the key and P2 is not zero, then jump to P2.
  3514   3514   **
  3515   3515   ** This opcode leaves the cursor configured to move in forward order,
  3516         -** from the begining toward the end.  In other words, the cursor is
         3516  +** from the beginning toward the end.  In other words, the cursor is
  3517   3517   ** configured to use Next, not Prev.
  3518   3518   **
  3519   3519   ** See also: Found, NotFound, SeekLt, SeekGt, SeekLe
  3520   3520   */
  3521   3521   /* Opcode: SeekGT P1 P2 P3 P4 *
  3522   3522   ** Synopsis: key=r[P3@P4]
  3523   3523   **
................................................................................
  4213   4213   /* Opcode: Delete P1 P2 * P4 *
  4214   4214   **
  4215   4215   ** Delete the record at which the P1 cursor is currently pointing.
  4216   4216   **
  4217   4217   ** The cursor will be left pointing at either the next or the previous
  4218   4218   ** record in the table. If it is left pointing at the next record, then
  4219   4219   ** the next Next instruction will be a no-op.  Hence it is OK to delete
  4220         -** a record from within an Next loop.
         4220  +** a record from within a Next loop.
  4221   4221   **
  4222   4222   ** If the OPFLAG_NCHANGE flag of P2 is set, then the row change count is
  4223   4223   ** incremented (otherwise not).
  4224   4224   **
  4225   4225   ** P1 must not be pseudo-table.  It has to be a real table with
  4226   4226   ** multiple rows.
  4227   4227   **
................................................................................
  4276   4276     break;
  4277   4277   }
  4278   4278   
  4279   4279   /* Opcode: SorterCompare P1 P2 P3 P4
  4280   4280   ** Synopsis:  if key(P1)!=trim(r[P3],P4) goto P2
  4281   4281   **
  4282   4282   ** P1 is a sorter cursor. This instruction compares a prefix of the
  4283         -** the record blob in register P3 against a prefix of the entry that 
         4283  +** record blob in register P3 against a prefix of the entry that 
  4284   4284   ** the sorter cursor currently points to.  Only the first P4 fields
  4285   4285   ** of r[P3] and the sorter record are compared.
  4286   4286   **
  4287   4287   ** If either P3 or the sorter contains a NULL in one of their significant
  4288   4288   ** fields (not counting the P4 fields at the end which are ignored) then
  4289   4289   ** the comparison is assumed to be equal.
  4290   4290   **
................................................................................
  5605   5605     }
  5606   5606     break;
  5607   5607   }
  5608   5608   
  5609   5609   /* Opcode: IfNeg P1 P2 P3 * *
  5610   5610   ** Synopsis: r[P1]+=P3, if r[P1]<0 goto P2
  5611   5611   **
  5612         -** Register P1 must contain an intger.  Add literal P3 to the value in
         5612  +** Register P1 must contain an integer.  Add literal P3 to the value in
  5613   5613   ** register P1 then if the value of register P1 is less than zero, jump to P2. 
  5614   5614   */
  5615   5615   case OP_IfNeg: {        /* jump, in1 */
  5616   5616     pIn1 = &aMem[pOp->p1];
  5617   5617     assert( pIn1->flags&MEM_Int );
  5618   5618     pIn1->u.i += pOp->p3;
  5619   5619     VdbeBranchTaken(pIn1->u.i<0, 2);