/ Check-in [3b34e95c]
Login

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

Overview
Comment:Make the debugging line numbers in the amalgamation more accurate.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 3b34e95ca85a6dd7d0766e43035a6cec4bc724a1
User & Date: mistachkin 2015-07-15 21:00:33
Context
2015-07-15
23:15
Enable memory-mapped I/O on FreeBSD and DragonFly. check-in: 2cdd6479 user: drh tags: trunk
21:00
Make the debugging line numbers in the amalgamation more accurate. check-in: 3b34e95c user: mistachkin tags: trunk
18:35
Fix some harmless compiler warnings. check-in: 110cd84f user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to tool/mksqlite3c-noext.tcl.

   176    176             if {$hdr!="os_common.h" && $hdr!="hwtime.h"} {
   177    177               set available_hdr($hdr) 0
   178    178             }
   179    179             section_comment "Include $hdr in the middle of $tail"
   180    180             copy_file tsrc/$hdr
   181    181             section_comment "Continuing where we left off in $tail"
   182    182             if {$linemacros} {puts $out "#line [expr {$ln+1}] \"$filename\""}
          183  +        } else {
          184  +          # Comment out the entire line, replacing any nested comment
          185  +          # begin/end markers with the harmless substring "**".
          186  +          puts $out "/* [string map [list /* ** */ **] $line] */"
   183    187           }
   184    188         } elseif {![info exists seen_hdr($hdr)]} {
   185    189           if {![regexp {/\*\s+amalgamator:\s+dontcache\s+\*/} $line]} {
   186    190             set seen_hdr($hdr) 1
   187    191           }
   188    192           puts $out $line
   189    193         } elseif {[regexp {/\*\s+amalgamator:\s+keep\s+\*/} $line]} {

Changes to tool/mksqlite3c.tcl.

   184    184             if {$hdr!="os_common.h" && $hdr!="hwtime.h"} {
   185    185               set available_hdr($hdr) 0
   186    186             }
   187    187             section_comment "Include $hdr in the middle of $tail"
   188    188             copy_file tsrc/$hdr
   189    189             section_comment "Continuing where we left off in $tail"
   190    190             if {$linemacros} {puts $out "#line [expr {$ln+1}] \"$filename\""}
          191  +        } else {
          192  +          # Comment out the entire line, replacing any nested comment
          193  +          # begin/end markers with the harmless substring "**".
          194  +          puts $out "/* [string map [list /* ** */ **] $line] */"
   191    195           }
   192    196         } elseif {![info exists seen_hdr($hdr)]} {
   193    197           if {![regexp {/\*\s+amalgamator:\s+dontcache\s+\*/} $line]} {
   194    198             set seen_hdr($hdr) 1
   195    199           }
   196    200           puts $out $line
   197    201         } elseif {[regexp {/\*\s+amalgamator:\s+keep\s+\*/} $line]} {