diff
stringlengths 41
2.03M
| msg
stringlengths 1
1.5k
⌀ | repo
stringlengths 5
40
| sha
stringlengths 40
40
| time
stringlengths 20
20
|
|---|---|---|---|---|
mmm a / package . xml <nl> ppp b / package . xml <nl> <nl> < email > grpc - packages @ google . com < / email > <nl> < active > yes < / active > <nl> < / lead > <nl> - < date > 2016 - 05 - 19 < / date > <nl> + < date > 2016 - 06 - 30 < / date > <nl> < time > 16 : 06 : 07 < / time > <nl> < version > <nl> < release > 0 . 15 . 0 < / release > <nl> <nl> < / stability > <nl> < license > BSD < / license > <nl> < notes > <nl> - - TBD <nl> + - Fix shutdown hang problem # 4017 <nl> < / notes > <nl> < contents > <nl> < dir baseinstalldir = " / " name = " / " > <nl> Update to wrap gRPC C Core version 0 . 10 . 0 <nl> < license > BSD < / license > <nl> < notes > <nl> - Simplify gRPC PHP installation # 4517 <nl> + - Wrap gRPC core library version 0 . 13 <nl> < / notes > <nl> < / release > <nl> < release > <nl> Update to wrap gRPC C Core version 0 . 10 . 0 <nl> < date > 2016 - 04 - 19 < / date > <nl> < license > BSD < / license > <nl> < notes > <nl> + - wrap grpc C core version 0 . 14 . 0 <nl> - destroy grpc_byte_buffer after startBatch # 6096 <nl> < / notes > <nl> < / release > <nl> < release > <nl> < version > <nl> - < release > 0 . 14 . 2 < / release > <nl> - < api > 0 . 14 . 2 < / api > <nl> + < release > 0 . 15 . 0 < / release > <nl> + < api > 0 . 15 . 0 < / api > <nl> < / version > <nl> < stability > <nl> < release > beta < / release > <nl> Update to wrap gRPC C Core version 0 . 10 . 0 <nl> < license > BSD < / license > <nl> < notes > <nl> - Updated functions with TSRM macros for ZTS support # 6607 <nl> + - Load default roots . pem via grpc_set_ssl_roots_override_callback # 6848 <nl> + < / notes > <nl> + < / release > <nl> + < release > <nl> + < version > <nl> + < release > 0 . 15 . 1 < / release > <nl> + < api > 0 . 15 . 1 < / api > <nl> + < / version > <nl> + < stability > <nl> + < release > beta < / release > <nl> + < api > beta < / api > <nl> + < / stability > <nl> + < date > 2016 - 06 - 30 < / date > <nl> + < license > BSD < / license > <nl> + < notes > <nl> + - Fix shutdown hang problem # 4017 <nl> < / notes > <nl> < / release > <nl> < / changelog > <nl> mmm a / src / php / ext / grpc / call . c <nl> ppp b / src / php / ext / grpc / call . c <nl> PHP_METHOD ( Call , __construct ) { <nl> call - > wrapped = grpc_channel_create_call ( <nl> channel - > wrapped , NULL , GRPC_PROPAGATE_DEFAULTS , completion_queue , method , <nl> host_override , deadline - > wrapped , NULL ) ; <nl> + call - > owned = true ; <nl> } <nl> <nl> / * * <nl> mmm a / templates / package . xml . template <nl> ppp b / templates / package . xml . template <nl> <nl> < email > grpc - packages @ google . com < / email > <nl> < active > yes < / active > <nl> < / lead > <nl> - < date > 2016 - 05 - 19 < / date > <nl> + < date > 2016 - 06 - 30 < / date > <nl> < time > 16 : 06 : 07 < / time > <nl> < version > <nl> < release > $ { settings . php_version . php ( ) } < / release > <nl> <nl> < / stability > <nl> < license > BSD < / license > <nl> < notes > <nl> - - TBD <nl> + - Fix shutdown hang problem # 4017 <nl> < / notes > <nl> < contents > <nl> < dir baseinstalldir = " / " name = " / " > <nl> <nl> < license > BSD < / license > <nl> < notes > <nl> - Simplify gRPC PHP installation # 4517 <nl> + - Wrap gRPC core library version 0 . 13 <nl> < / notes > <nl> < / release > <nl> < release > <nl> <nl> < date > 2016 - 04 - 19 < / date > <nl> < license > BSD < / license > <nl> < notes > <nl> + - wrap grpc C core version 0 . 14 . 0 <nl> - destroy grpc_byte_buffer after startBatch # 6096 <nl> < / notes > <nl> < / release > <nl> < release > <nl> < version > <nl> - < release > 0 . 14 . 2 < / release > <nl> - < api > 0 . 14 . 2 < / api > <nl> + < release > 0 . 15 . 0 < / release > <nl> + < api > 0 . 15 . 0 < / api > <nl> < / version > <nl> < stability > <nl> < release > beta < / release > <nl> <nl> < license > BSD < / license > <nl> < notes > <nl> - Updated functions with TSRM macros for ZTS support # 6607 <nl> + - Load default roots . pem via grpc_set_ssl_roots_override_callback # 6848 <nl> + < / notes > <nl> + < / release > <nl> + < release > <nl> + < version > <nl> + < release > 0 . 15 . 1 < / release > <nl> + < api > 0 . 15 . 1 < / api > <nl> + < / version > <nl> + < stability > <nl> + < release > beta < / release > <nl> + < api > beta < / api > <nl> + < / stability > <nl> + < date > 2016 - 06 - 30 < / date > <nl> + < license > BSD < / license > <nl> + < notes > <nl> + - Fix shutdown hang problem # 4017 <nl> < / notes > <nl> < / release > <nl> < / changelog > <nl>
|
Merge pull request from stanley - cheung / php - fix - call - destroy - 0 - 15
|
grpc/grpc
|
d3812c9318c4d0336897fd2d666be908fa1a7953
|
2016-06-30T20:32:51Z
|
mmm a / buildscripts / packager . py <nl> ppp b / buildscripts / packager . py <nl> <nl> import time <nl> <nl> # The MongoDB names for the architectures we support . <nl> - ARCH_CHOICES = [ " x86_64 " , " arm64 " , " s390x " ] <nl> + ARCH_CHOICES = [ " x86_64 " , " arm64 " , " aarch64 " , " s390x " ] <nl> <nl> # Made up names for the flavors of distribution we package for . <nl> DISTROS = [ " suse " , " debian " , " redhat " , " ubuntu " , " amazon " , " amazon2 " ] <nl> def archname ( self , arch ) : <nl> return " s390x " <nl> elif arch . endswith ( " 86 " ) : <nl> return " i686 " <nl> + elif arch = = " arm64 " : <nl> + return " arm64 " <nl> + elif arch = = " aarch64 " : <nl> + return " aarch64 " <nl> return " x86_64 " <nl> else : <nl> raise Exception ( " BUG : unsupported platform ? " ) <nl> def build_os ( self , arch ) : <nl> " suse11 " for suse , etc . <nl> " " " <nl> # Community builds only support amd64 <nl> - if arch not in [ ' x86_64 ' , ' ppc64le ' , ' s390x ' , ' arm64 ' ] : <nl> + if arch not in [ ' x86_64 ' , ' ppc64le ' , ' s390x ' , ' arm64 ' , ' aarch64 ' ] : <nl> raise Exception ( " BUG : unsupported architecture ( % s ) " % arch ) <nl> <nl> if re . search ( " ( suse ) " , self . dname ) : <nl> mmm a / buildscripts / packager_enterprise . py <nl> ppp b / buildscripts / packager_enterprise . py <nl> <nl> import packager # pylint : disable = wrong - import - position <nl> <nl> # The MongoDB names for the architectures we support . <nl> - ARCH_CHOICES = [ " x86_64 " , " ppc64le " , " s390x " , " arm64 " ] <nl> + ARCH_CHOICES = [ " x86_64 " , " ppc64le " , " s390x " , " arm64 " , " aarch64 " ] <nl> <nl> # Made up names for the flavors of distribution we package for . <nl> DISTROS = [ " suse " , " debian " , " redhat " , " ubuntu " , " amazon " , " amazon2 " ] <nl> def build_os ( self , arch ) : # pylint : disable = too - many - branches <nl> if arch = = " arm64 " : <nl> if self . dname = = ' ubuntu ' : <nl> return [ " ubuntu1604 " , " ubuntu1804 " , " ubuntu2004 " ] <nl> + if arch = = " aarch64 " : <nl> if self . dname = = ' redhat ' : <nl> return [ " rhel82 " ] <nl> return [ ] <nl> mmm a / etc / evergreen . yml <nl> ppp b / etc / evergreen . yml <nl> buildvariants : <nl> compile_flags : - - ssl MONGO_DISTMOD = rhel82 - j $ ( grep - c ^ processor / proc / cpuinfo ) CCFLAGS = " - march = armv8 - a + crc - mtune = generic " - - variables - files = etc / scons / mongodbtoolchain_v3_gcc . vars <nl> has_packages : true <nl> packager_script : packager_enterprise . py <nl> - packager_arch : arm64 <nl> + packager_arch : aarch64 <nl> packager_distro : rhel82 <nl> repo_edition : enterprise <nl> scons_cache_scope : shared <nl> buildvariants : <nl> compile_flags : - - ssl MONGO_DISTMOD = rhel82 - j $ ( grep - c ^ processor / proc / cpuinfo ) CCFLAGS = " - march = armv8 - a + crc - mtune = generic " - - variables - files = etc / scons / mongodbtoolchain_v3_gcc . vars <nl> has_packages : true <nl> packager_script : packager . py <nl> - packager_arch : arm64 <nl> + packager_arch : aarch64 <nl> packager_distro : rhel82 <nl> repo_edition : org <nl> scons_cache_scope : shared <nl>
|
SERVER - 53037 fix packager script for rhel8 arm64
|
mongodb/mongo
|
1f0c52dd09fe3ecfca374d16326e4e782e3b037a
|
2020-12-07T23:33:05Z
|
new file mode 100644 <nl> index 00000000000 . . 4fdc3f95404 <nl> mmm / dev / null <nl> ppp b / src / ast / OWNERS <nl> <nl> + set noparent <nl> + <nl> + adamk @ chromium . org <nl> + bmeurer @ chromium . org <nl> + littledan @ chromium . org <nl> + mstarzinger @ chromium . org <nl> + rossberg @ chromium . org <nl> + <nl> new file mode 100644 <nl> index 00000000000 . . 6ab28fad547 <nl> mmm / dev / null <nl> ppp b / src / js / OWNERS <nl> <nl> + set noparent <nl> + <nl> + adamk @ chromium . org <nl> + rossberg @ chromium . org <nl> + ulan @ chromium . org <nl> + yangguo @ chromium . org <nl> + <nl> new file mode 100644 <nl> index 00000000000 . . a5daeb3b72a <nl> mmm / dev / null <nl> ppp b / src / parsing / OWNERS <nl> <nl> + set noparent <nl> + <nl> + adamk @ chromium . org <nl> + littledan @ chromium . org <nl> + marja @ chromium . org <nl> + rossberg @ chromium . org <nl> + <nl>
|
Add more OWNER files
|
v8/v8
|
063920e2e4a975ac01cc5284a711de2c98e03bde
|
2015-12-07T12:52:12Z
|
mmm a / admin / static / coffee / dataexplorer . coffee <nl> ppp b / admin / static / coffee / dataexplorer . coffee <nl> module ' DataExplorerView ' , - > <nl> is_at_bottom : is_at_bottom <nl> else <nl> if @ $ ( ' . no_history ' ) . length isnt 0 <nl> - @ $ ( ' . no_history ' ) . show ( ) <nl> + @ $ ( ' . no_history ' ) . remove ( ) <nl> <nl> <nl> clear_history : ( event ) = > <nl>
|
Err , fix stupid bug
|
rethinkdb/rethinkdb
|
98c35c10b737739a263d303738f633d638ee342f
|
2013-02-22T01:56:25Z
|
mmm a / CHANGELOG <nl> ppp b / CHANGELOG <nl> v1 . 1 . 0 ( XXXX - XX - XX ) <nl> <nl> * fixed issue # 309 : renamed stub " import " button from web interface <nl> <nl> + * fixed issue # 307 : show waitForSync in collections overview in web interface , <nl> + make waitForSync and journalSize editable in web interface <nl> + <nl> * fixed issue # 306 : naming in web interface <nl> <nl> * fixed issue # 304 : do not clear AQL query text input when switching tabs in <nl> mmm a / html / admin / index . html <nl> ppp b / html / admin / index . html <nl> <nl> < th > Name < / th > <nl> < th > Type < / th > <nl> < th > Status < / th > <nl> + < th > WaitForSync < / th > <nl> < th > Datafile Sizes < / th > <nl> < th > Number of Documents < / th > <nl> < / tr > <nl> <nl> < input type = " text " class = " smallInput " id = " createCollName " > < / input > <nl> < / td > <nl> < td class = " longTD " > New collection name . < / td > <nl> - < / tr > <nl> < / tr > <nl> - < tr > < td > journalSize : < / td > < / td > <nl> + < tr > < td > journalSize : < / td > <nl> < td > <nl> < input type = " text " onkeypress = ' validate ( event ) ' class = " smallInput " id = " createCollSize " > < / input > <nl> < / td > <nl> <nl> < / td > < / tr > <nl> < tr > < td > waitForSync : < / td > < td > <nl> < form action = " # " id = " waitForSyncForm " > <nl> - < input type = " radio " name = " waitForSync " value = true > yes < / input > <nl> - < input type = " radio " name = " waitForSync " value = false checked > no < / input > <nl> + < input type = " radio " name = " waitForSync " value = " true " > yes < / input > <nl> + < input type = " radio " name = " waitForSync " value = " false " checked > no < / input > <nl> < / form > <nl> < / td > <nl> < td class = " longTD " > If true then the data is synchronised to disk before returning from a create or update of an document . <nl> < / td > <nl> < / tr > <nl> - < tr > < td > type : < / td > < td > <nl> + < tr > < td > Type : < / td > < td > <nl> < form action = " # " id = " typeForm " > <nl> < input type = " radio " name = " type " value = " 2 " checked > document < / input > <nl> < input type = " radio " name = " type " value = " 3 " > edge < / input > <nl> <nl> < td class = " first " align = " left " > Name : < / td > <nl> < td class = " longTD " > < input id = " editCollectionName " type = " text " placeholder = " unknown " name = " username " > < / td > <nl> < / tr > <nl> + < tr > <nl> + < td class = " first " align = " left " > journalSize : < / td > <nl> + < td > <nl> + < input type = " text " onkeypress = ' validate ( event ) ' class = " smallInput " id = " editCollectionJournalSize " > < / input > <nl> + < / td > <nl> + < / tr > <nl> + < tr > <nl> + < td > waitForSync : < / td > <nl> + < td > <nl> + < form action = " # " id = " waitForSyncForm " > <nl> + < input type = " radio " name = " editWaitForSync " value = " true " > yes < / input > <nl> + < input type = " radio " name = " editWaitForSync " value = " false " > no < / input > <nl> + < / form > <nl> + < / td > <nl> + < / tr > <nl> < tr > <nl> < td class = " first " align = " left " > ID : < / td > <nl> < td id = " editCollectionID " > unknown < / td > <nl> <nl> < td class = " first " align = " left " > Status : < / td > <nl> < td id = " editCollectionStatus " > unknown < / td > <nl> < / tr > <nl> + < tr > <nl> + < td class = " first " align = " left " > Type : < / td > <nl> + < td id = " editCollectionType " > - < / td > <nl> + < / tr > <nl> < / table > <nl> < / div > <nl> <nl> mmm a / html / admin / js / master . js <nl> ppp b / html / admin / js / master . js <nl> var collectionTable = $ ( ' # collectionsTableID ' ) . dataTable ( { <nl> " bAutoWidth " : false , <nl> " iDisplayLength " : - 1 , <nl> " bJQueryUI " : true , <nl> - " aoColumns " : [ { " sWidth " : " 150px " , " bSortable " : false , " sClass " : " leftCell " } , { " sWidth " : " 200px " } , { " sWidth " : " 200px " } , { " sWidth " : " 150px " } , null , { " sWidth " : " 200px " } , { " sWidth " : " 200px " , " sClass " : " rightCell " } ] , <nl> - " aoColumnDefs " : [ { " sClass " : " alignRight " , " aTargets " : [ 5 , 6 ] } ] , <nl> + " aoColumns " : [ { " sWidth " : " 150px " , " bSortable " : false , " sClass " : " leftCell " } , { " sWidth " : " 200px " } , { " sWidth " : " 200px " } , { " sWidth " : " 150px " } , null , { " sWidth " : " 100px " } , { " sWidth " : " 200px " } , { " sWidth " : " 200px " , " sClass " : " rightCell " } ] , <nl> + " aoColumnDefs " : [ { " sClass " : " alignRight " , " aTargets " : [ 6 , 7 ] } ] , <nl> " oLanguage " : { " sEmptyTable " : " No collections " } <nl> } ) ; <nl> <nl> var logTable = $ ( ' # logTableID ' ) . dataTable ( { <nl> <nl> $ . ajax ( { <nl> type : " GET " , <nl> - url : " / _api / collection / " + collectionID , <nl> + url : " / _api / collection / " + collectionID + " / properties " , <nl> contentType : " application / json " , <nl> processData : false , <nl> success : function ( data ) { <nl> var logTable = $ ( ' # logTableID ' ) . dataTable ( { <nl> $ ( ' # nav2 ' ) . text ( ' Edit : ' + collectionName ) ; <nl> $ ( ' # editCollectionName ' ) . val ( data . name ) ; <nl> $ ( ' # editCollectionID ' ) . text ( data . id ) ; <nl> + $ ( ' # editCollectionType ' ) . text ( collectionType ( data ) ) ; <nl> + $ ( ' # editCollectionJournalSize ' ) . val ( data . journalSize / 1024 / 1024 ) ; <nl> + $ ( ' input : radio [ name = editWaitForSync ] [ value = ' + String ( data . waitForSync ) + ' ] ' ) . attr ( " checked " , " checked " ) ; <nl> <nl> switch ( data . status ) { <nl> case 1 : tmpStatus = " new born collection " ; break ; <nl> var lastFormatQuestion = true ; <nl> $ ( ' # saveEditedCollection ' ) . live ( ' click ' , function ( ) { <nl> var newColName = $ ( ' # editCollectionName ' ) . val ( ) ; <nl> var currentid = $ ( ' # editCollectionID ' ) . text ( ) ; <nl> + var journalSize = JSON . parse ( $ ( ' # editCollectionJournalSize ' ) . val ( ) * 1024 * 1024 ) ; <nl> + var wfscheck = $ ( ' input : radio [ name = editWaitForSync ] : checked ' ) . val ( ) ; <nl> <nl> - if ( newColName = = checkCollectionName ) { <nl> - alert ( " Nothing to do . . . " ) ; <nl> - return 0 ; <nl> - } <nl> - <nl> + var wfs = ( wfscheck = = " true " ) ; <nl> + var failed = false ; <nl> + <nl> + if ( newColName ! = checkCollectionName ) { <nl> $ . ajax ( { <nl> type : " PUT " , <nl> - url : " / _api / collection / " + currentid + " / rename " , <nl> + async : false , / / sequential calls ! <nl> + url : " / _api / collection / " + checkCollectionName + " / rename " , <nl> data : ' { " name " : " ' + newColName + ' " } ' , <nl> contentType : " application / json " , <nl> processData : false , <nl> success : function ( data ) { <nl> alert ( " Collection renamed " ) ; <nl> - window . location . href = " " ; <nl> - $ ( ' # subCenterView ' ) . hide ( ) ; <nl> - $ ( ' # centerView ' ) . show ( ) ; <nl> - drawCollectionsTable ( ) ; <nl> } , <nl> error : function ( data ) { <nl> alert ( getErrorMessage ( data ) ) ; <nl> + failed = true ; <nl> + } <nl> + } ) ; <nl> + } <nl> + <nl> + if ( ! failed ) { <nl> + $ . ajax ( { <nl> + type : " PUT " , <nl> + async : false , / / sequential calls ! <nl> + url : " / _api / collection / " + newColName + " / properties " , <nl> + data : ' { " waitForSync " : ' + JSON . stringify ( wfs ) + ' , " journalSize " : ' + JSON . stringify ( journalSize ) + ' } ' , <nl> + contentType : " application / json " , <nl> + processData : false , <nl> + success : function ( data ) { <nl> + alert ( " Saved collection properties " ) ; <nl> + } , <nl> + error : function ( data ) { <nl> + alert ( getErrorMessage ( data ) ) ; <nl> + failed = true ; <nl> } <nl> } ) ; <nl> + } <nl> + <nl> + if ( ! failed ) { <nl> + window . location . href = " " ; <nl> + $ ( ' # subCenterView ' ) . hide ( ) ; <nl> + $ ( ' # centerView ' ) . show ( ) ; <nl> + drawCollectionsTable ( ) ; <nl> + } <nl> + else { <nl> + return 0 ; <nl> + } <nl> + <nl> } ) ; <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> function drawCollectionsTable ( ) { <nl> else if ( tempStatus = = 2 ) { <nl> tempStatus = " unloaded " ; <nl> items . push ( [ ' < button class = " enabled " id = " delete " > < img src = " / _admin / html / media / icons / round_minus_icon16 . png " width = " 16 " height = " 16 " > < / button > < button class = " enabled " id = " load " > < img src = " / _admin / html / media / icons / connect_icon16 . png " width = " 16 " height = " 16 " > < / button > < button > < img src = " / _admin / html / media / icons / zoom_icon16_nofunction . png " width = " 16 " height = " 16 " class = " nofunction " > < / img > < / button > < button > < img src = " / _admin / html / media / icons / doc_edit_icon16_nofunction . png " width = " 16 " height = " 16 " class = " nofunction " > < / img > < / button > ' , <nl> - val . id , val . name , collectionType ( val ) , tempStatus , " - " , " - " ] ) ; <nl> + val . id , val . name , collectionType ( val ) , tempStatus , " " , " - " , " - " ] ) ; <nl> } <nl> else if ( tempStatus = = 3 ) { <nl> tempStatus = " < font color = \ " green \ " > loaded < / font > " ; <nl> var alive ; <nl> var size ; <nl> + var waitForSync ; <nl> <nl> $ . ajax ( { <nl> type : " GET " , <nl> function drawCollectionsTable ( ) { <nl> success : function ( data ) { <nl> size = data . figures . journals . fileSize + data . figures . datafiles . fileSize ; <nl> alive = data . figures . alive . count ; <nl> + waitForSync = data . waitForSync ; <nl> } , <nl> error : function ( data ) { <nl> } <nl> } ) ; <nl> <nl> items . push ( [ ' < button class = " enabled " id = " delete " > < img src = " / _admin / html / media / icons / round_minus_icon16 . png " width = " 16 " height = " 16 " title = " Delete " > < / button > < button class = " enabled " id = " unload " > < img src = " / _admin / html / media / icons / not_connected_icon16 . png " width = " 16 " height = " 16 " title = " Unload " > < / button > < button class = " enabled " id = " showdocs " > < img src = " / _admin / html / media / icons / zoom_icon16 . png " width = " 16 " height = " 16 " title = " Show Documents " > < / button > < button class = " enabled " id = " edit " title = " Edit " > < img src = " / _admin / html / media / icons / doc_edit_icon16 . png " width = " 16 " height = " 16 " > < / button > ' , <nl> - val . id , val . name , collectionType ( val ) , tempStatus , bytesToSize ( size ) , alive ] ) ; <nl> + val . id , val . name , collectionType ( val ) , tempStatus , waitForSync ? " yes " : " no " , bytesToSize ( size ) , alive ] ) ; <nl> } <nl> else if ( tempStatus = = 4 ) { <nl> tempStatus = " in the process of being unloaded " ; <nl> items . push ( [ ' < button id = " delete " > < img src = " / _admin / html / media / icons / round_minus_icon16_nofunction . png " class = " nofunction " width = " 16 " height = " 16 " > < / button > < button class = " enabled " id = " load " > < img src = " / _admin / html / media / icons / connect_icon16 . png " width = " 16 " height = " 16 " > < / button > < button > < img src = " / _admin / html / media / icons / zoom_icon16_nofunction . png " width = " 16 " height = " 16 " class = " nofunction " > < / img > < / button > < button > < img src = " / _admin / html / media / icons / doc_edit_icon16_nofunction . png " width = " 16 " height = " 16 " class = " nofunction " > < / img > < / button > ' , <nl> - val . id , val . name , collectionType ( val ) , tempStatus , " - " , " - " ] ) ; <nl> + val . id , val . name , collectionType ( val ) , tempStatus , " " , " - " , " - " ] ) ; <nl> } <nl> else if ( tempStatus = = 5 ) { <nl> tempStatus = " deleted " ; <nl> - items . push ( [ " " , val . id , val . name , collectionType ( val ) , tempStatus , " - " , " - " ] ) ; <nl> + items . push ( [ " " , val . id , val . name , collectionType ( val ) , tempStatus , " " , " - " , " - " ] ) ; <nl> } <nl> / * else { <nl> tempStatus = " corrupted " ; <nl>
|
issue
|
arangodb/arangodb
|
a36846f365f3dae1f7a45f37521ecf97062c56d1
|
2012-12-01T00:10:40Z
|
mmm a / examples / sequence_labeler_ex . cpp <nl> ppp b / examples / sequence_labeler_ex . cpp <nl> class feature_extractor <nl> } <nl> } ; <nl> <nl> + void serialize ( const feature_extractor & , std : : ostream & ) { } <nl> + void deserialize ( feature_extractor & , std : : istream & ) { } <nl> + <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> + <nl> + void make_dataset ( <nl> + const matrix < double > & emission_probabilities , <nl> + const matrix < double > & transition_probabilities , <nl> + std : : vector < std : : vector < unsigned long > > & samples , <nl> + std : : vector < std : : vector < unsigned long > > & labels , <nl> + unsigned long dataset_size <nl> + ) ; <nl> + / * ! <nl> + requires <nl> + - transition_probabilities . nr ( ) = = transition_probabilities . nc ( ) <nl> + - transition_probabilities . nr ( ) = = emission_probabilities . nr ( ) <nl> + - The rows of transition_probabilities and emission_probabilities must sum to 1 . <nl> + ( i . e . sum_cols ( transition_probabilities ) and sum_cols ( emission_probabilities ) <nl> + must evaluate to vectors of all 1s . ) <nl> + ensures <nl> + - This function randomly samples a bunch of sequences from the HMM defined by <nl> + transition_probabilities and emission_probabilities . <nl> + - The HMM is defined by : <nl> + - P ( next_label | previous_label ) = = transition_probabilities ( previous_label , next_label ) <nl> + - P ( next_sample | next_label ) = = emission_probabilities ( next_label , next_sample ) <nl> + - # samples . size ( ) = = labels . size ( ) = = dataset_size <nl> + - for all valid i : <nl> + - # labels [ i ] is a randomly sampled sequence of hidden states from the <nl> + given HMM . # samples [ i ] is its corresponding randomly sampled sequence <nl> + of observed states . <nl> + ! * / <nl> + <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> <nl> + int main ( ) <nl> + { <nl> + <nl> + / / set this up so emission_probabilities ( L , X ) = = The probability of a state with label L <nl> + / / emitting an X . <nl> + matrix < double > emission_probabilities ( num_label_states , num_sample_states ) ; <nl> + emission_probabilities = 0 . 5 , 0 . 5 , 0 . 0 , <nl> + 0 . 0 , 0 . 5 , 0 . 5 , <nl> + 0 . 5 , 0 . 0 , 0 . 5 ; <nl> + <nl> + matrix < double > transition_probabilities ( num_label_states , num_label_states ) ; <nl> + <nl> + transition_probabilities = 0 . 05 , 0 . 90 , 0 . 05 , <nl> + 0 . 05 , 0 . 05 , 0 . 90 , <nl> + 0 . 90 , 0 . 05 , 0 . 05 ; <nl> + <nl> + <nl> + <nl> + std : : vector < std : : vector < unsigned long > > samples ; <nl> + std : : vector < std : : vector < unsigned long > > labels ; <nl> + make_dataset ( emission_probabilities , transition_probabilities , <nl> + samples , labels , 1000 ) ; <nl> + <nl> + cout < < " samples . size ( ) : " < < samples . size ( ) < < endl ; <nl> + <nl> + / / print out some of the randomly sampled sequences <nl> + for ( int i = 0 ; i < 10 ; + + i ) <nl> + { <nl> + cout < < " hidden states : " < < trans ( vector_to_matrix ( labels [ i ] ) ) ; <nl> + cout < < " observed states : " < < trans ( vector_to_matrix ( samples [ i ] ) ) ; <nl> + cout < < " * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * " < < endl ; <nl> + } <nl> + <nl> + structural_sequence_labeling_trainer < feature_extractor > trainer ; <nl> + trainer . set_c ( 4 ) ; <nl> + trainer . set_num_threads ( 4 ) ; <nl> + <nl> + <nl> + matrix < double > confusion_matrix ; <nl> + <nl> + / / Learn to do sequence labeling from the dataset <nl> + sequence_labeler < feature_extractor > labeler = trainer . train ( samples , labels ) ; <nl> + confusion_matrix = test_sequence_labeler ( labeler , samples , labels ) ; <nl> + cout < < " trained sequence labeler : " < < endl ; <nl> + cout < < confusion_matrix ; <nl> + cout < < " label accuracy : " < < sum ( diag ( confusion_matrix ) ) / sum ( confusion_matrix ) < < endl ; <nl> + <nl> + <nl> + / / We can also do cross - validation <nl> + confusion_matrix = cross_validate_sequence_labeler ( trainer , samples , labels , 4 ) ; <nl> + cout < < " \ ncross - validation : " < < endl ; <nl> + cout < < confusion_matrix ; <nl> + cout < < " label accuracy : " < < sum ( diag ( confusion_matrix ) ) / sum ( confusion_matrix ) < < endl ; <nl> + <nl> + <nl> + <nl> + matrix < double , 0 , 1 > true_hmm_model_weights = log ( join_cols ( reshape_to_column_vector ( transition_probabilities ) , <nl> + reshape_to_column_vector ( emission_probabilities ) ) ) ; <nl> + <nl> + sequence_labeler < feature_extractor > labeler_true ( feature_extractor ( ) , true_hmm_model_weights ) ; <nl> + <nl> + confusion_matrix = test_sequence_labeler ( labeler_true , samples , labels ) ; <nl> + cout < < " \ nTrue HMM model : " < < endl ; <nl> + cout < < confusion_matrix ; <nl> + cout < < " label accuracy : " < < sum ( diag ( confusion_matrix ) ) / sum ( confusion_matrix ) < < endl ; <nl> + <nl> + <nl> + <nl> + <nl> + <nl> + <nl> + <nl> + / / Finally , the labeler can be serialized to disk just like most dlib objects . <nl> + ofstream fout ( " labeler . dat " , ios : : binary ) ; <nl> + serialize ( labeler , fout ) ; <nl> + fout . close ( ) ; <nl> + <nl> + / / recall from disk <nl> + ifstream fin ( " labeler . dat " , ios : : binary ) ; <nl> + deserialize ( labeler , fin ) ; <nl> + } <nl> + <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> + / / Code for creating a bunch of random samples from our HMM . <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> <nl> void sample_hmm ( <nl> dlib : : rand & rnd , <nl> void sample_hmm ( <nl> unsigned long & next_label , <nl> unsigned long & next_sample <nl> ) <nl> + / * ! <nl> + requires <nl> + - previous_label < transition_probabilities . nr ( ) <nl> + - transition_probabilities . nr ( ) = = transition_probabilities . nc ( ) <nl> + - transition_probabilities . nr ( ) = = emission_probabilities . nr ( ) <nl> + - The rows of transition_probabilities and emission_probabilities must sum to 1 . <nl> + ( i . e . sum_cols ( transition_probabilities ) and sum_cols ( emission_probabilities ) <nl> + must evaluate to vectors of all 1s . ) <nl> + ensures <nl> + - This function randomly samples the HMM defined by transition_probabilities <nl> + and emission_probabilities assuming that the previous hidden state <nl> + was previous_label . <nl> + - The HMM is defined by : <nl> + - P ( next_label | previous_label ) = = transition_probabilities ( previous_label , next_label ) <nl> + - P ( next_sample | next_label ) = = emission_probabilities ( next_label , next_sample ) <nl> + - # next_label = = the sampled value of the hidden state <nl> + - # next_sample = = the sampled value of the observed state <nl> + ! * / <nl> { <nl> + / / sample next_label <nl> double p = rnd . get_random_double ( ) ; <nl> for ( long c = 0 ; p > = 0 & & c < transition_probabilities . nc ( ) ; + + c ) <nl> { <nl> void sample_hmm ( <nl> p - = transition_probabilities ( previous_label , c ) ; <nl> } <nl> <nl> - <nl> + / / now sample next_sample <nl> p = rnd . get_random_double ( ) ; <nl> for ( long c = 0 ; p > = 0 & & c < emission_probabilities . nc ( ) ; + + c ) <nl> { <nl> void make_dataset ( <nl> std : : vector < std : : vector < unsigned long > > & labels , <nl> unsigned long dataset_size <nl> ) <nl> - / * ! <nl> - 2 kinds of label <nl> - 3 kinds of input state <nl> - ! * / <nl> { <nl> samples . clear ( ) ; <nl> labels . clear ( ) ; <nl> void make_dataset ( <nl> / / now randomly sample some labeled sequences from our Hidden Markov Model <nl> for ( unsigned long iter = 0 ; iter < dataset_size ; + + iter ) <nl> { <nl> - const unsigned long size = rnd . get_random_32bit_number ( ) % 20 + 3 ; <nl> - std : : vector < unsigned long > sample ( size ) ; <nl> - std : : vector < unsigned long > label ( size ) ; <nl> + const unsigned long sequence_size = rnd . get_random_32bit_number ( ) % 20 + 3 ; <nl> + std : : vector < unsigned long > sample ( sequence_size ) ; <nl> + std : : vector < unsigned long > label ( sequence_size ) ; <nl> <nl> unsigned long previous_label = rnd . get_random_32bit_number ( ) % num_label_states ; <nl> for ( unsigned long i = 0 ; i < sample . size ( ) ; + + i ) <nl> void make_dataset ( <nl> <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> <nl> - int main ( ) <nl> - { <nl> - std : : vector < std : : vector < unsigned long > > samples ; <nl> - std : : vector < std : : vector < unsigned long > > labels ; <nl> - <nl> - / / set this up so emission_probabilities ( L , X ) = = The probability of a state with label L <nl> - / / emitting an X . <nl> - matrix < double > emission_probabilities ( num_label_states , num_sample_states ) ; <nl> - emission_probabilities = 0 . 5 , 0 . 5 , 0 . 0 , <nl> - 0 . 0 , 0 . 5 , 0 . 5 , <nl> - 0 . 5 , 0 . 0 , 0 . 5 ; <nl> - <nl> - matrix < double > transition_probabilities ( num_label_states , num_label_states ) ; <nl> - <nl> - transition_probabilities = 0 . 05 , 0 . 90 , 0 . 05 , <nl> - 0 . 05 , 0 . 05 , 0 . 90 , <nl> - 0 . 90 , 0 . 05 , 0 . 05 ; <nl> - <nl> - <nl> - make_dataset ( emission_probabilities , transition_probabilities , <nl> - samples , labels , 1000 ) ; <nl> - <nl> - cout < < " samples . size ( ) : " < < samples . size ( ) < < endl ; <nl> - <nl> - for ( int i = 0 ; i < 10 ; + + i ) <nl> - { <nl> - cout < < trans ( vector_to_matrix ( labels [ i ] ) ) ; <nl> - cout < < trans ( vector_to_matrix ( samples [ i ] ) ) ; <nl> - cout < < " * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * " < < endl ; <nl> - } <nl> - <nl> - structural_sequence_labeling_trainer < feature_extractor > trainer ; <nl> - trainer . set_c ( 1000 ) ; <nl> - trainer . set_num_threads ( 4 ) ; <nl> - / / trainer . be_verbose ( ) ; <nl> - <nl> - / / sequence_labeler < feature_extractor > labeler = trainer . train ( samples , labels ) ; <nl> - / / cout < < labeler . get_weights ( ) < < endl ; <nl> - <nl> - matrix < double > cm ; <nl> - <nl> - cm = cross_validate_sequence_labeler ( trainer , samples , labels , 4 ) ; <nl> - / / cm = test_sequence_labeler ( labeler , samples , labels ) ; <nl> - cout < < cm < < endl ; <nl> - cout < < " label accuracy : " < < sum ( diag ( cm ) ) / sum ( cm ) < < endl ; <nl> - <nl> - <nl> - <nl> - matrix < double , 0 , 1 > true_hmm_model_weights = log ( join_cols ( reshape_to_column_vector ( transition_probabilities ) , <nl> - reshape_to_column_vector ( emission_probabilities ) ) ) ; <nl> - <nl> - sequence_labeler < feature_extractor > labeler_true ( feature_extractor ( ) , true_hmm_model_weights ) ; <nl> - <nl> - cout < < endl ; <nl> - cm = test_sequence_labeler ( labeler_true , samples , labels ) ; <nl> - cout < < cm < < endl ; <nl> - cout < < " label accuracy : " < < sum ( diag ( cm ) ) / sum ( cm ) < < endl ; <nl> - } <nl> - <nl> - / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> - <nl>
|
improved example a little
|
davisking/dlib
|
29964d28580bc77bb119192b04935818dd9d5a55
|
2011-11-03T22:56:03Z
|
mmm a / stdlib / public / core / Substring . swift . gyb <nl> ppp b / stdlib / public / core / Substring . swift . gyb <nl> extension Substring { <nl> <nl> @ available ( swift , obsoleted : 4 ) <nl> public subscript ( bounds : ClosedRange < Index > ) - > String { <nl> - return String ( self [ bounds ] ) <nl> + return String ( self [ bounds ] as Substring ) <nl> } <nl> } <nl>
|
[ stdlib ] Disambiguate a subscript operation .
|
apple/swift
|
bcdf09d166a7b6c32f642d67d40a03b50a96884b
|
2017-04-30T00:15:02Z
|
mmm a / PowerEditor / installer / nativeLang / german . xml <nl> ppp b / PowerEditor / installer / nativeLang / german . xml <nl> <nl> < Item subMenuId = " view - uncollapseLevel " name = " Te & amp ; xtblöcke öffnen " / > <nl> < Item subMenuId = " view - project " name = " Projektver & amp ; waltung " / > <nl> < Item subMenuId = " view - tab " name = " & amp ; Tabs " / > <nl> - < Item subMenuId = " encoding - characterSets " name = " & amp ; Zeichensatz " / > <nl> + < Item subMenuId = " encoding - characterSets " name = " & amp ; Weitere " / > <nl> < Item subMenuId = " encoding - arabic " name = " & amp ; Arabisch " / > <nl> < Item subMenuId = " encoding - baltic " name = " & amp ; Baltisch " / > <nl> < Item subMenuId = " encoding - celtic " name = " & amp ; Keltisch " / > <nl> <nl> < Item id = " 1 " name = " & amp ; Weitersuchen " / > <nl> < Item id = " 2 " name = " & amp ; Schließen " / > <nl> < Item id = " 1603 " name = " Nur & amp ; ganze Wörter suchen " / > <nl> - < Item id = " 1604 " name = " Groß - / & amp ; Kleinschreibung " / > <nl> + < Item id = " 1604 " name = " Groß - / & amp ; Kleinschreibung beachten " / > <nl> < Item id = " 1605 " name = " & amp ; Reguläre Ausdrücke " / > <nl> - < Item id = " 1606 " name = " Am Ende von vorn & amp ; beginnen " / > <nl> + < Item id = " 1606 " name = " Am Ende von vorne & amp ; beginnen " / > <nl> < Item id = " 1608 " name = " & amp ; Ersetzen " / > <nl> < Item id = " 1609 " name = " Alle erse & amp ; tzen " / > <nl> < Item id = " 1611 " name = " Erset & amp ; zen durch : " / > <nl> <nl> < Item id = " 1614 " name = " Z & amp ; ählen " / > <nl> < Item id = " 1615 " name = " & amp ; Alle suchen " / > <nl> < Item id = " 1616 " name = " & amp ; Lesezeichen setzen " / > <nl> - < Item id = " 1617 " name = " & amp ; Treffer markieren " / > <nl> < Item id = " 1618 " name = " Für & amp ; jede Suche löschen " / > <nl> < Item id = " 1620 " name = " Suchen & amp ; nach : " / > <nl> < Item id = " 1621 " name = " Suchrichtung " / > <nl> <nl> < Item id = " 1625 " name = " Norma & amp ; l " / > <nl> < Item id = " 1626 " name = " Erwe & amp ; itert ( \ r , \ n , \ t , \ x . . . , \ 0 ) " / > <nl> < Item id = " 1627 " name = " Unten " / > <nl> - < Item id = " 1632 " name = " In & amp ; Markierung " / > <nl> + < Item id = " 1632 " name = " In & amp ; Auswahl " / > <nl> < Item id = " 1633 " name = " Zurücksetzen " / > <nl> < Item id = " 1635 " name = " Alle Funde in allen offenen Dateien ersetzen " / > <nl> < Item id = " 1636 " name = " In & amp ; offenen Dateien suchen " / > <nl> <nl> < Item id = " 6152 " name = " Sitzungsdateien in einer neuen Instanz öffnen " / > <nl> < Item id = " 6153 " name = " Immer im Mehrinstanzmodus " / > <nl> < Item id = " 6154 " name = " Standard ( nur eine Instanz ) " / > <nl> - < Item id = " 6155 " name = " * Notepad + + muss neu gestartet werden " / > <nl> + < Item id = " 6155 " name = " Nach Änderung der Einstellung muss Notepad + + neu gestartet werden . " / > <nl> < / MultiInstance > <nl> < Scintillas title = " Oberfläche 2 " > <nl> < Item id = " 6201 " name = " Textblock - Faltung " / > <nl> < Item id = " 6202 " name = " Plus / minus " / > <nl> < Item id = " 6203 " name = " Pfeile " / > <nl> - < Item id = " 6204 " name = " Kreise " / > <nl> + < Item id = " 6204 " name = " Kreise " / > <nl> < Item id = " 6205 " name = " Quadrate " / > <nl> < Item id = " 6206 " name = " Zeilennummernrand " / > <nl> < Item id = " 6207 " name = " Lesezeichenrand " / > <nl> < Item id = " 6208 " name = " Randbegrenzung anzeigen " / > <nl> < Item id = " 6209 " name = " Anzahl der Spalten : " / > <nl> < Item id = " 6211 " name = " Rechter Rand " / > <nl> - < Item id = " 6212 " name = " vertikale Linie " / > <nl> - < Item id = " 6213 " name = " farbiger Hintergrund " / > <nl> + < Item id = " 6212 " name = " Vertikale Linie " / > <nl> + < Item id = " 6213 " name = " Farbiger Hintergrund " / > <nl> < Item id = " 6214 " name = " Aktuelle Zeile hervorheben " / > <nl> < Item id = " 6215 " name = " Kantenglättung der Schriftarten " / > <nl> < Item id = " 6216 " name = " Cursoreinstellungen " / > <nl> <nl> < Item id = " 6219 " name = " Geschwindigkeit " / > <nl> < Item id = " 6221 " name = " S " / > <nl> < Item id = " 6222 " name = " L " / > <nl> - < Item id = " 6224 " name = " Gleichzeitiges Editieren " / > <nl> + < Item id = " 6224 " name = " Mehrfaches Editieren " / > <nl> < Item id = " 6225 " name = " Aktivieren ( Strg + Mausklick ) " / > <nl> < Item id = " 6226 " name = " Aus " / > <nl> < Item id = " 6227 " name = " Umgebrochene Zeilen " / > <nl> <nl> < Item id = " 6229 " name = " Linksbündig " / > <nl> < Item id = " 6230 " name = " Hängend " / > <nl> < Item id = " 6231 " name = " Rahmenbreite " / > <nl> - < Item id = " 6234 " name = " Erweitertes Scrollen deaktivieren " / > <nl> + < Item id = " 6234 " name = " Flüssiges Scrollen deaktivieren ( bei Touchpad - Problemen ) " / > <nl> < / Scintillas > <nl> - < Delimiter title = " Trennzeichen für erweiterte Auswahl " > <nl> - < Item id = " 6251 " name = " Trennzeichen ( Strg + Doppelklick ) " / > <nl> + < Delimiter title = " Trennzeichen " > <nl> + < Item id = " 6251 " name = " Trennzeichen für erweiterte Auswahl ( Strg + Doppelklick ) " / > <nl> < Item id = " 6252 " name = " Anfang " / > <nl> < Item id = " 6255 " name = " Ende " / > <nl> < Item id = " 6256 " name = " Über mehrere Zeilen " / > <nl> < Item id = " 6257 " name = " bla bla bla bla bla bla " / > <nl> < Item id = " 6258 " name = " bla bla bla bla bla bla bla bla bla bla bla bla " / > <nl> < / Delimiter > <nl> - < RecentFilesHistory title = " Zuletzt geöffnete Dateien " > <nl> + < RecentFilesHistory title = " Zuletzt geöffn . Dateien " > <nl> < Item id = " 6304 " name = " Zuletzt geöffnete Dateien " / > <nl> < Item id = " 6305 " name = " Beim Programmstart nicht überprüfen " / > <nl> < Item id = " 6306 " name = " Max . Menüeinträge : " / > <nl> <nl> < Item id = " 6429 " name = " Anzeige im Dateimenü " / > <nl> < / RecentFilesHistory > <nl> < NewDoc title = " Neue Dateien " > <nl> - < Item id = " 6401 " name = " Zeilenende - Format " / > <nl> + < Item id = " 6401 " name = " Zeilenenden " / > <nl> < Item id = " 6402 " name = " Windows " / > <nl> < Item id = " 6403 " name = " UNIX " / > <nl> < Item id = " 6404 " name = " Mac " / > <nl> <nl> < Item id = " 6406 " name = " ANSI " / > <nl> < Item id = " 6407 " name = " UTF - 8 ohne BOM " / > <nl> < Item id = " 6408 " name = " UTF - 8 " / > <nl> - < Item id = " 6409 " name = " UCS2 Big Endian " / > <nl> - < Item id = " 6410 " name = " UCS2 Little Endian " / > <nl> + < Item id = " 6409 " name = " UCS - 2 Big Endian " / > <nl> + < Item id = " 6410 " name = " UCS - 2 Little Endian " / > <nl> < Item id = " 6411 " name = " Standardsprache " / > <nl> < Item id = " 6419 " name = " Format für neue Dateien " / > <nl> - < Item id = " 6420 " name = " auch beim Öffnen von ANSI - Dateien " / > <nl> + < Item id = " 6420 " name = " Auch beim Öffnen von ANSI - Dateien " / > <nl> < / NewDoc > <nl> < DefaultDir title = " Standardverzeichnis " > <nl> < Item id = " 6413 " name = " Verzeichnis beim Öffnen / Speichern " / > <nl> <nl> < / FileAssoc > <nl> < TabSettings title = " Tabulatoren " > <nl> < Item id = " 6301 " name = " Tabulatoren " / > <nl> - < Item id = " 6302 " name = " durch Leerzeichen ersetzen " / > <nl> + < Item id = " 6302 " name = " Durch Leerzeichen ersetzen " / > <nl> < Item id = " 6303 " name = " Tabulatorbreite : " / > <nl> < Item id = " 6510 " name = " Standard verwenden " / > <nl> < / TabSettings > <nl> <nl> < Item id = " 6323 " name = " Automatische Updates aktivieren " / > <nl> < Item id = " 6324 " name = " Dokumentenumschalter ( Strg + Tab ) " / > <nl> < Item id = " 6325 " name = " Nach Aktualisierung zum Ende scrollen " / > <nl> - < Item id = " 6326 " name = " Alle Wortvorkommnisse markieren " / > <nl> + < Item id = " 6326 " name = " Hervorhebung aktivieren " / > <nl> < Item id = " 6327 " name = " Tags hervorheben " / > <nl> < Item id = " 6328 " name = " Attribute hervorheben " / > <nl> < Item id = " 6329 " name = " HTML - Hervorhebung " / > <nl> - < Item id = " 6330 " name = " PHP / ASP - Bereiche hervorheben " / > <nl> + < Item id = " 6330 " name = " PHP - / ASP - Bereiche hervorheben " / > <nl> < Item id = " 6331 " name = " Nur Dateinamen in Titelleiste anzeigen " / > <nl> - < Item id = " 6332 " name = " Groß - / Kleinschreibung unterscheiden " / > <nl> - < Item id = " 6333 " name = " Mehrfache Markierung " / > <nl> + < Item id = " 6332 " name = " Groß - / Kleinschreibung beachten " / > <nl> + < Item id = " 6333 " name = " Automatische Hervorhebung bei Auswahl " / > <nl> < Item id = " 6334 " name = " Kodierung automatisch erkennen " / > <nl> < Item id = " 6335 " name = " Backslash ist Escapezeichen für SQL " / > <nl> < / MISC > <nl> < Backup title = " Sicherheitskopien " > <nl> < Item id = " 6801 " name = " Sicherheitskopie beim Speichern von Dateien " / > <nl> - < Item id = " 6315 " name = " keine " / > <nl> - < Item id = " 6316 " name = " einfach " / > <nl> - < Item id = " 6317 " name = " erweitert " / > <nl> + < Item id = " 6315 " name = " Keine " / > <nl> + < Item id = " 6316 " name = " Einfach " / > <nl> + < Item id = " 6317 " name = " Erweitert " / > <nl> < Item id = " 6804 " name = " Verzeichnisangabe für die Sicherheitskopien " / > <nl> < Item id = " 6803 " name = " Verzeichnis : " / > <nl> < Item id = " 6817 " name = " Sitzungen automatisch speichern " / > <nl> <nl> < / Backup > <nl> < Cloud title = " Cloud - Einstellungen " > <nl> < Item id = " 6262 " name = " Einstellungen in der Cloud speichern " / > <nl> - < Item id = " 6263 " name = " aus " / > <nl> + < Item id = " 6263 " name = " Aus " / > <nl> < Item id = " 6267 " name = " Netzwerkpfad : " / > <nl> < / Cloud > <nl> < AutoCompletion title = " Autovervollständigung " > <nl> <nl> < Item id = " 2030 " name = " Beginnen mit " / > <nl> < Item id = " 2031 " name = " Erhöhen um " / > <nl> < Item id = " 2035 " name = " Führende & amp ; Nullen " / > <nl> + < Item id = " 2036 " name = " Wiederholen " / > <nl> < Item id = " 2032 " name = " Format " / > <nl> - < Item id = " 2024 " name = " & amp ; Dec " / > <nl> - < Item id = " 2025 " name = " & amp ; Oct " / > <nl> - < Item id = " 2026 " name = " & amp ; Hex " / > <nl> - < Item id = " 2027 " name = " & amp ; Bin " / > <nl> + < Item id = " 2024 " name = " & amp ; Dezimal " / > <nl> + < Item id = " 2025 " name = " & amp ; Oktal " / > <nl> + < Item id = " 2026 " name = " & amp ; Hexadezimal " / > <nl> + < Item id = " 2027 " name = " & amp ; Binär " / > <nl> < Item id = " 1 " name = " Ausfüh & amp ; ren " / > <nl> < Item id = " 2 " name = " Abbre & amp ; chen " / > <nl> < / ColumnEditor > <nl>
|
More clarifications and consistency edits in menus and dialog windows
|
notepad-plus-plus/notepad-plus-plus
|
3678644a94204976ce07aa9f41732ea730b40f5d
|
2015-10-16T08:53:56Z
|
mmm a / CHANGELOG <nl> ppp b / CHANGELOG <nl> cocos2d - x - 3 . 4beta0 Dec . 31 2014 <nl> [ NEW ] UI : Modify the default behavior when ui : : Button , ui : : CheckBox and ui : : Slider ' s selected state resources are not provided , the new behavior is scale the normal state texture when the selected state texture are missing . <nl> [ NEW ] 3rd party libraries : Add prebuilt version of libcurl to Mac and upgrade iOS , Android , Mac and Win32 libcurl to 7 . 39 . 0 . <nl> [ NEW ] Replace network module implementation from libcurl to system network API on IOS and Android <nl> - [ NEW ] Update 3rd party libs : libcurl update to version 7 . 39 . 0 <nl> <nl> [ FIX ] ui : : Button : fix setTitleColor calls method setColor instead of setTextColor of title label . <nl> [ FIX ] AssetsManagerEx : Fix assetManager can ' t download file on Win32 <nl>
|
[ ci skip ] update changelog
|
cocos2d/cocos2d-x
|
70ac38d09b3278061dcb9c476bb2159afc32302b
|
2014-12-31T14:20:28Z
|
mmm a / docs / cmake - integration . md <nl> ppp b / docs / cmake - integration . md <nl> If Catch2 has been installed in system , both of these can be used after <nl> doing ` find_package ( Catch2 REQUIRED ) ` . Otherwise you need to add them <nl> to your CMake module path . <nl> <nl> - # # # ` Catch . cmake ` and ` AddCatchTests . cmake ` <nl> + # # # ` Catch . cmake ` and ` CatchAddTests . cmake ` <nl> <nl> ` Catch . cmake ` provides function ` catch_discover_tests ` to get tests from <nl> a target . This function works by running the resulting executable with <nl>
|
Use correct filename in CMake integration docs
|
catchorg/Catch2
|
7be35af167f969433d9775f6ddc5d294f69dd4b5
|
2019-04-07T13:41:34Z
|
new file mode 100644 <nl> index 0000000000 . . d4410800b0 <nl> mmm / dev / null <nl> ppp b / code / string - algorithms / anagram_search / anagram_search . cs <nl> <nl> + using System ; <nl> + using System . Collections . Generic ; <nl> + using System . Linq ; <nl> + using System . Text ; <nl> + using System . Threading . Tasks ; <nl> + <nl> + namespace AnagramSearch <nl> + { <nl> + class Program <nl> + { <nl> + static void Main ( string [ ] args ) <nl> + { <nl> + printAnagramResult ( " Anagram " , " Nag A Ram " , anagram_search ( " Anagram " , " Nag A Ram " ) ) ; <nl> + printAnagramResult ( " Nascar " , " Battles " , anagram_search ( " Nascar " , " Battles " ) ) ; <nl> + printAnagramResult ( " Lisp " , " Clips " , anagram_search ( " Lisp " , " Clips " ) ) ; <nl> + printAnagramResult ( " Angel " , " Glean " , anagram_search ( " Angel " , " Glean " ) ) ; <nl> + <nl> + Console . ReadKey ( ) ; <nl> + } <nl> + <nl> + public static bool anagram_search ( string first , string second ) <nl> + { <nl> + / / Remove all whitespace <nl> + first = first . Replace ( " " , string . Empty ) ; <nl> + second = second . Replace ( " " , string . Empty ) ; <nl> + <nl> + if ( first . Length ! = second . Length ) <nl> + { <nl> + return false ; <nl> + } <nl> + <nl> + / / Convert to lowercase and sort <nl> + first = first . ToLower ( ) ; <nl> + second = second . ToLower ( ) ; <nl> + char [ ] _first = first . ToArray ( ) ; <nl> + Array . Sort ( _first ) ; <nl> + char [ ] _second = second . ToArray ( ) ; <nl> + Array . Sort ( _second ) ; <nl> + <nl> + first = new string ( _first ) ; <nl> + second = new string ( _second ) ; <nl> + <nl> + for ( int i = 0 ; i < first . Length ; i + + ) <nl> + { <nl> + if ( first [ i ] ! = second [ i ] ) <nl> + { <nl> + return false ; <nl> + } <nl> + } <nl> + <nl> + return true ; <nl> + } <nl> + <nl> + public static void printAnagramResult ( string first , string second , bool result ) <nl> + { <nl> + if ( result ) <nl> + { <nl> + Console . WriteLine ( first + " and " + second + " are anagrams . " ) ; <nl> + } <nl> + <nl> + else <nl> + { <nl> + Console . WriteLine ( first + " and " + second + " are not anagrams . " ) ; <nl> + } <nl> + } <nl> + } <nl> + } <nl>
|
Merge pull request from Jerrgree / master
|
OpenGenus/cosmos
|
959a5fc8d16c5b6c28ccabf6bcb46b76db16d60e
|
2017-10-08T07:24:28Z
|
mmm a / python / pyphantomjs / config . py <nl> ppp b / python / pyphantomjs / config . py <nl> def __init__ ( self , parent , jsonFile ) : <nl> json = fd . read ( ) <nl> <nl> self . settings = { <nl> - ' auth ' : { ' mapping ' : ' auth ' , ' default ' : None } , <nl> ' cookiesFile ' : { ' mapping ' : ' cookies_file ' , ' default ' : None } , <nl> ' debug ' : { ' mapping ' : ' debug ' , ' default ' : None } , <nl> ' diskCache ' : { ' mapping ' : ' disk_cache ' , ' default ' : False } , <nl> mmm a / python / pyphantomjs / networkaccessmanager . py <nl> ppp b / python / pyphantomjs / networkaccessmanager . py <nl> class NetworkAccessManager ( QNetworkAccessManager ) : <nl> def __init__ ( self , parent , args ) : <nl> super ( NetworkAccessManager , self ) . __init__ ( parent ) <nl> <nl> + self . m_userName = self . m_password = ' ' <nl> self . m_ignoreSslErrors = args . ignore_ssl_errors <nl> self . m_idCounter = 0 <nl> self . m_ids = { } <nl> self . m_started = [ ] <nl> <nl> - self . finished . connect ( self . handleFinished ) <nl> - <nl> - if args . auth : <nl> - self . m_authUser = args . auth [ 0 ] <nl> - self . m_authPass = args . auth [ 1 ] <nl> - self . authenticationRequired . connect ( self . provideAuthentication ) <nl> - <nl> if args . cookies_file : <nl> self . setCookieJar ( CookieJar ( self , args . cookies_file ) ) <nl> <nl> def __init__ ( self , parent , args ) : <nl> m_networkDiskCache . setMaximumCacheSize ( args . max_disk_cache_size * 1024 ) <nl> self . setCache ( m_networkDiskCache ) <nl> <nl> + self . authenticationRequired . connect ( self . provideAuthentication ) <nl> + self . finished . connect ( self . handleFinished ) <nl> + <nl> do_action ( ' NetworkAccessManagerInit ' ) <nl> <nl> def createRequest ( self , op , req , outgoingData ) : <nl> def operationToString ( self , op ) : <nl> return verb <nl> <nl> def provideAuthentication ( self , reply , authenticator ) : <nl> - authenticator . setUser ( self . m_authUser ) <nl> - authenticator . setPassword ( self . m_authPass ) <nl> + authenticator . setUser ( self . m_userName ) <nl> + authenticator . setPassword ( self . m_password ) <nl> + <nl> + def setPassword ( self , password ) : <nl> + self . m_password = password <nl> + <nl> + def setUserName ( self , userName ) : <nl> + self . m_userName = userName <nl> <nl> do_action ( ' NetworkAccessManager ' ) <nl> mmm a / python / pyphantomjs / pyphantomjs . py <nl> ppp b / python / pyphantomjs / pyphantomjs . py <nl> def parseArgs ( app , args ) : <nl> <nl> split_check = ( <nl> ( args . proxy , ' proxy ' ) , <nl> - ( args . auth , ' auth ' ) <nl> ) <nl> for arg , name in split_check : <nl> if arg : <nl> mmm a / python / pyphantomjs / utils . py <nl> ppp b / python / pyphantomjs / utils . py <nl> def __call__ ( self , parser , namespace , value , option_string = None ) : <nl> help = ' Sets the encoding used for scripts ( default : % ( default ) s ) ' <nl> ) <nl> <nl> - script . add_argument ( ' - - auth ' , metavar = ' user : pass ' , <nl> - help = ' Sets the authentication username and password ' <nl> - ) <nl> script . add_argument ( ' - - cookies - file ' , metavar = ' / path / to / cookies . txt ' , <nl> help = ' Sets the file name to store the persistent cookies ' <nl> ) <nl> mmm a / python / pyphantomjs / webpage . py <nl> ppp b / python / pyphantomjs / webpage . py <nl> def __init__ ( self , parent , args ) : <nl> self . m_webPage . mainFrame ( ) . setHtml ( self . blankHtml ) <nl> <nl> # Custom network access manager to allow traffic monitoring <nl> - networkAccessManager = NetworkAccessManager ( self . parent ( ) , args ) <nl> - self . m_webPage . setNetworkAccessManager ( networkAccessManager ) <nl> - networkAccessManager . resourceRequested . connect ( self . resourceRequested ) <nl> - networkAccessManager . resourceReceived . connect ( self . resourceReceived ) <nl> + self . m_networkAccessManager = NetworkAccessManager ( self . parent ( ) , args ) <nl> + self . m_webPage . setNetworkAccessManager ( self . m_networkAccessManager ) <nl> + self . m_networkAccessManager . resourceRequested . connect ( self . resourceRequested ) <nl> + self . m_networkAccessManager . resourceReceived . connect ( self . resourceReceived ) <nl> <nl> self . m_webPage . setViewportSize ( QSize ( 400 , 300 ) ) <nl> <nl> def applySettings ( self , defaults ) : <nl> opt . setAttribute ( QWebSettings . JavascriptEnabled , defaults [ ' javascriptEnabled ' ] ) <nl> opt . setAttribute ( QWebSettings . XSSAuditingEnabled , defaults [ ' XSSAuditingEnabled ' ] ) <nl> opt . setAttribute ( QWebSettings . LocalContentCanAccessRemoteUrls , defaults [ ' localToRemoteUrlAccessEnabled ' ] ) <nl> + <nl> if ' userAgent ' in defaults : <nl> self . m_webPage . m_userAgent = defaults [ ' userAgent ' ] <nl> <nl> + if ' userName ' in defaults : <nl> + self . m_networkAccessManager . setUserName ( defaults [ ' userName ' ] ) <nl> + <nl> + if ' password ' in defaults : <nl> + self . m_networkAccessManager . setPassword ( defaults [ ' password ' ] ) <nl> + <nl> def finish ( self , ok ) : <nl> status = ' success ' if ok else ' fail ' <nl> self . loadFinished . emit ( status ) <nl>
|
Make HTTP authentication as page settings .
|
ariya/phantomjs
|
2e44f1abd6b649f733e5ddb12f262f9d3eff7712
|
2011-09-18T11:35:40Z
|
mmm a / lib / Sema / TypeCheckStmt . cpp <nl> ppp b / lib / Sema / TypeCheckStmt . cpp <nl> void TypeChecker : : typeCheckIgnoredExpr ( Expr * E ) { <nl> } <nl> } <nl> <nl> + void <nl> + PrintLiteralString ( StringRef Str , ASTContext & Context , SourceLoc Loc , <nl> + SmallVectorImpl < ValueDecl * > & PrintDecls , <nl> + SmallVectorImpl < BraceStmt : : ExprStmtOrDecl > & BodyContent ) { <nl> + Expr * PrintStr = new ( Context ) StringLiteralExpr ( Str , Loc ) ; <nl> + Expr * PrintStrFn = OverloadedDeclRefExpr : : createWithCopy ( PrintDecls , Loc ) ; <nl> + BodyContent . push_back ( new ( Context ) CallExpr ( PrintStrFn , PrintStr ) ) ; <nl> + } <nl> + <nl> + static void <nl> + PrintReplExpr ( TypeChecker & TC , VarDecl * Arg , CanType T , SourceLoc Loc , <nl> + SourceLoc EndLoc , <nl> + SmallVectorImpl < unsigned > & MemberIndexes , <nl> + SmallVectorImpl < BraceStmt : : ExprStmtOrDecl > & BodyContent ) { <nl> + ASTContext & Context = TC . Context ; <nl> + TranslationUnit & TU = TC . TU ; <nl> + <nl> + / / Lookup the " print " function used for strings . <nl> + SmallVector < ValueDecl * , 4 > PrintDecls ; <nl> + TU . lookupGlobalValue ( Context . getIdentifier ( " print " ) , <nl> + NLKind : : UnqualifiedLookup , PrintDecls ) ; <nl> + <nl> + if ( TupleType * TT = dyn_cast < TupleType > ( T ) ) { <nl> + / / We print a tuple by printing each element . <nl> + PrintLiteralString ( " ( " , Context , Loc , PrintDecls , BodyContent ) ; <nl> + <nl> + for ( unsigned i = 0 , e = TT - > getFields ( ) . size ( ) ; i < e ; + + i ) { <nl> + MemberIndexes . push_back ( i ) ; <nl> + CanType SubType = TT - > getElementType ( i ) - > getCanonicalType ( ) ; <nl> + PrintReplExpr ( TC , Arg , SubType , Loc , EndLoc , MemberIndexes , <nl> + BodyContent ) ; <nl> + MemberIndexes . pop_back ( ) ; <nl> + <nl> + if ( i + 1 ! = e ) <nl> + PrintLiteralString ( " , " , Context , Loc , PrintDecls , BodyContent ) ; <nl> + } <nl> + <nl> + PrintLiteralString ( " ) " , Context , Loc , PrintDecls , BodyContent ) ; <nl> + return ; <nl> + } <nl> + <nl> + Identifier MemberName = Context . getIdentifier ( " replPrint " ) ; <nl> + MemberLookup Lookup ( T , MemberName , TU ) ; <nl> + if ( Lookup . isSuccess ( ) ) { <nl> + Expr * ArgRef = new ( Context ) DeclRefExpr ( Arg , Loc , <nl> + Arg - > getTypeOfReference ( ) ) ; <nl> + ArgRef = TC . convertToRValue ( ArgRef ) ; <nl> + for ( unsigned i : MemberIndexes ) { <nl> + / / For each index , we look through a TupleType or transparent OneOfType . <nl> + CanType CurT = ArgRef - > getType ( ) - > getCanonicalType ( ) ; <nl> + if ( OneOfType * OOT = dyn_cast < OneOfType > ( CurT ) ) { <nl> + CurT = OOT - > getTransparentType ( ) - > getCanonicalType ( ) ; <nl> + ArgRef = new ( Context ) LookThroughOneofExpr ( ArgRef , CurT ) ; <nl> + } <nl> + TupleType * TT = cast < TupleType > ( CurT ) ; <nl> + ArgRef = new ( Context ) SyntacticTupleElementExpr ( ArgRef , Loc , i , Loc , <nl> + TT - > getElementType ( i ) ) ; <nl> + } <nl> + Expr * Res = TC . recheckTypes ( Lookup . createResultAST ( ArgRef , Loc , EndLoc , <nl> + Context ) ) ; <nl> + if ( ! Res ) <nl> + return ; <nl> + TupleExpr * CallArgs = <nl> + new ( Context ) TupleExpr ( Loc , MutableArrayRef < Expr * > ( ) , 0 , EndLoc , <nl> + TupleType : : getEmpty ( Context ) ) ; <nl> + CallExpr * CE = new ( Context ) CallExpr ( Res , CallArgs , Type ( ) ) ; <nl> + Res = TC . semaApplyExpr ( CE ) ; <nl> + if ( ! Res ) <nl> + return ; <nl> + BodyContent . push_back ( Res ) ; <nl> + return ; <nl> + } <nl> + <nl> + if ( OneOfType * OOT = dyn_cast < OneOfType > ( T ) ) { <nl> + if ( OOT - > isTransparentType ( ) ) { <nl> + / / Print " struct " types as if we are constructing one : the name <nl> + / / followed by the underlying tuple . <nl> + PrintLiteralString ( OOT - > getDecl ( ) - > getName ( ) . str ( ) , Context , Loc , <nl> + PrintDecls , BodyContent ) ; <nl> + CanType SubType = OOT - > getTransparentType ( ) - > getCanonicalType ( ) ; <nl> + PrintReplExpr ( TC , Arg , SubType , Loc , EndLoc , <nl> + MemberIndexes , BodyContent ) ; <nl> + return ; <nl> + } <nl> + <nl> + / / FIXME : We should handle non - transparent OneOfTypes at some point , but <nl> + / / it ' s tricky to represent in the AST without a " match " statement . <nl> + } <nl> + <nl> + PrintLiteralString ( " < unprintable value > " , Context , Loc , PrintDecls , <nl> + BodyContent ) ; <nl> + } <nl> + <nl> / / / Check an expression at the top level in a REPL . <nl> void TypeChecker : : typeCheckTopLevelReplExpr ( Expr * & E ) { <nl> / / If the input is an lvalue , force an lvalue - to - rvalue conversion . <nl> void TypeChecker : : typeCheckTopLevelReplExpr ( Expr * & E ) { <nl> SourceLoc Loc = E - > getStartLoc ( ) ; <nl> SourceLoc EndLoc = E - > getEndLoc ( ) ; <nl> <nl> - / / Build the function to call to print the expression . <nl> + / / Build a function to call to print the expression . <nl> Type FuncTy = T ; <nl> if ( ! isa < TupleType > ( FuncTy ) ) { <nl> TupleTypeElt Elt ( T , Context . getIdentifier ( " arg " ) ) ; <nl> void TypeChecker : : typeCheckTopLevelReplExpr ( Expr * & E ) { <nl> Pattern * ParamPat = new ( Context ) NamedPattern ( Arg ) ; <nl> FuncExpr * FE = FuncExpr : : create ( Context , Loc , ParamPat , FuncTy , 0 , & TU ) ; <nl> <nl> - / / Print the expression . <nl> - / / FIXME : Need structural printing for tuples . <nl> - / / FIXME : Need structural printing for oneofs . <nl> + / / Build the body of the function which prints the expression . <nl> + SmallVector < unsigned , 4 > MemberIndexes ; <nl> SmallVector < BraceStmt : : ExprStmtOrDecl , 4 > BodyContent ; <nl> - Identifier MemberName = Context . getIdentifier ( " replPrint " ) ; <nl> - MemberLookup Lookup ( T , MemberName , TU ) ; <nl> - if ( Lookup . isSuccess ( ) ) { <nl> - Expr * ArgRef = new ( Context ) DeclRefExpr ( Arg , Loc , <nl> - Arg - > getTypeOfReference ( ) ) ; <nl> - ArgRef = convertToRValue ( ArgRef ) ; <nl> - Expr * Res = recheckTypes ( Lookup . createResultAST ( ArgRef , Loc , EndLoc , <nl> - Context ) ) ; <nl> - if ( ! Res ) <nl> - return ; <nl> - TupleExpr * CallArgs = <nl> - new ( Context ) TupleExpr ( Loc , MutableArrayRef < Expr * > ( ) , 0 , EndLoc , <nl> - TupleType : : getEmpty ( Context ) ) ; <nl> - CallExpr * CE = new ( Context ) CallExpr ( Res , CallArgs , Type ( ) ) ; <nl> - Res = semaApplyExpr ( CE ) ; <nl> - if ( ! Res ) <nl> - return ; <nl> - BodyContent . push_back ( Res ) ; <nl> - } else { <nl> - Expr * PrintUnknown = new ( Context ) StringLiteralExpr ( " < unprintable value > " , <nl> - Loc ) ; <nl> - SmallVector < ValueDecl * , 4 > Decls ; <nl> - TU . lookupGlobalValue ( Context . getIdentifier ( " print " ) , <nl> - NLKind : : UnqualifiedLookup , Decls ) ; <nl> - Expr * PrintStrFn = OverloadedDeclRefExpr : : createWithCopy ( Decls , Loc ) ; <nl> - PrintUnknown = new ( Context ) CallExpr ( PrintStrFn , PrintUnknown , Type ( ) ) ; <nl> - BodyContent . push_back ( PrintUnknown ) ; <nl> - } <nl> + PrintReplExpr ( * this , Arg , T , Loc , EndLoc , MemberIndexes , BodyContent ) ; <nl> <nl> / / Print a newline at the end . <nl> Expr * PrintNewLine = new ( Context ) StringLiteralExpr ( " \ n " , E - > getStartLoc ( ) ) ; <nl>
|
REPL printing for structs and tuples .
|
apple/swift
|
89752e6dd4fc1d9f2ed595fc8f258de157b5425e
|
2012-04-19T02:21:02Z
|
mmm a / ports / devil / CONTROL <nl> ppp b / ports / devil / CONTROL <nl> <nl> Source : devil <nl> - Version : 1 . 8 . 0 - 1 <nl> - Build - Depends : zlib , libpng , libjpeg - turbo , tiff , openjpeg , libwebp , libraw , jxrlib , openexr , jasper , liblzma <nl> + Version : 1 . 8 . 0 - 2 <nl> + Build - Depends : <nl> Description : A full featured cross - platform image library <nl> + Default - Features : libpng , tiff , libjpeg , openexr , jasper , lcms <nl> + <nl> + Feature : libpng <nl> + Build - Depends : libpng <nl> + Description : Use Libpng for . png ( and some . ico ) <nl> + <nl> + Feature : tiff <nl> + Build - Depends : tiff <nl> + Description : Use Libtiff for . tif support <nl> + <nl> + Feature : libjpeg <nl> + Build - Depends : libjpeg - turbo <nl> + Description : Use Libjpeg for . jpg ( and some . blp ) support <nl> + <nl> + Feature : openexr <nl> + Build - Depends : openexr <nl> + Description : Use openexr <nl> + <nl> + Feature : jasper <nl> + Build - Depends : jasper <nl> + Description : Use JasPer for . jp2 ( and some . icns ) support <nl> + <nl> + Feature : lcms <nl> + Build - Depends : lcms <nl> + Description : Use Little CMS for color profiles <nl> mmm a / ports / devil / portfile . cmake <nl> ppp b / ports / devil / portfile . cmake <nl> vcpkg_apply_patches ( <nl> $ { CMAKE_CURRENT_LIST_DIR } / enable - static . patch <nl> ) <nl> <nl> + set ( IL_NO_PNG 1 ) <nl> + if ( " libpng " IN_LIST FEATURES ) <nl> + set ( IL_NO_PNG 0 ) <nl> + endif ( ) <nl> + <nl> + set ( IL_NO_TIF 1 ) <nl> + if ( " libtiff " IN_LIST FEATURES ) <nl> + set ( IL_NO_TIF 0 ) <nl> + endif ( ) <nl> + <nl> + set ( IL_NO_JPG 1 ) <nl> + if ( " libjpeg " IN_LIST FEATURES ) <nl> + set ( IL_NO_JPG 0 ) <nl> + endif ( ) <nl> + <nl> + set ( IL_NO_EXR 1 ) <nl> + if ( " openexr " IN_LIST FEATURES ) <nl> + set ( IL_NO_EXR 0 ) <nl> + endif ( ) <nl> + <nl> + set ( IL_NO_JP2 1 ) <nl> + if ( " jasper " IN_LIST FEATURES ) <nl> + set ( IL_NO_JP2 0 ) <nl> + endif ( ) <nl> + <nl> + set ( IL_NO_MNG 1 ) <nl> + # if ( " libmng " IN_LIST FEATURES ) <nl> + # set ( IL_NO_MNG 0 ) <nl> + # endif ( ) <nl> + <nl> + set ( IL_NO_LCMS 1 ) <nl> + if ( " lcms " IN_LIST FEATURES ) <nl> + set ( IL_NO_LCMS 0 ) <nl> + endif ( ) <nl> + <nl> + set ( IL_USE_DXTC_NVIDIA 0 ) <nl> + # if ( " nvtt " IN_LIST FEATURES ) <nl> + # set ( IL_USE_DXTC_NVIDIA 1 ) <nl> + # endif ( ) <nl> + <nl> + set ( IL_USE_DXTC_SQUISH 0 ) <nl> + # if ( " libsquish " IN_LIST FEATURES ) <nl> + # set ( IL_USE_DXTC_SQUISH 1 ) <nl> + # endif ( ) <nl> + <nl> vcpkg_configure_cmake ( <nl> SOURCE_PATH $ { SOURCE_PATH } / DevIL <nl> PREFER_NINJA <nl> + OPTIONS <nl> + - DIL_NO_PNG = $ { IL_NO_PNG } <nl> + - DIL_NO_TIF = $ { IL_NO_TIF } <nl> + - DIL_NO_JPG = $ { IL_NO_JPG } <nl> + - DIL_NO_EXR = $ { IL_NO_EXR } <nl> + - DIL_NO_JP2 = $ { IL_NO_JP2 } <nl> + - DIL_NO_MNG = $ { IL_NO_MNG } <nl> + - DIL_NO_LCMS = $ { IL_NO_LCMS } <nl> + - DIL_USE_DXTC_NVIDIA = $ { IL_USE_DXTC_NVIDIA } <nl> + - DIL_USE_DXTC_SQUISH = $ { IL_USE_DXTC_SQUISH } <nl> ) <nl> <nl> vcpkg_install_cmake ( ) <nl>
|
[ devil ] Enable features ( )
|
microsoft/vcpkg
|
ee3f0af2319e7fe19355e6ec80593c4fdba1ca72
|
2018-02-27T17:42:08Z
|
mmm a / src / BtPieceMessage . cc <nl> ppp b / src / BtPieceMessage . cc <nl> bool BtPieceMessage : : checkPieceHash ( const SharedHandle < Piece > & piece ) <nl> A2_LOG_DEBUG ( fmt ( " Hash is available ! ! index = % lu " , <nl> static_cast < unsigned long > ( piece - > getIndex ( ) ) ) ) ; <nl> return <nl> - piece - > getHashString ( ) = = downloadContext_ - > getPieceHash ( piece - > getIndex ( ) ) ; <nl> + piece - > getDigest ( ) = = downloadContext_ - > getPieceHash ( piece - > getIndex ( ) ) ; <nl> } else { <nl> off_t offset = ( off_t ) piece - > getIndex ( ) * downloadContext_ - > getPieceLength ( ) ; <nl> - <nl> - return message_digest : : staticSHA1DigestHexDigest <nl> + return message_digest : : staticSHA1Digest <nl> ( getPieceStorage ( ) - > getDiskAdaptor ( ) , offset , piece - > getLength ( ) ) <nl> = = downloadContext_ - > getPieceHash ( piece - > getIndex ( ) ) ; <nl> } <nl> mmm a / src / Checksum . h <nl> ppp b / src / Checksum . h <nl> class Checksum { <nl> std : : string hashType_ ; <nl> std : : string digest_ ; <nl> public : <nl> - / / messageDigest_ is ascii hexadecimal notation . <nl> + / / digest_ is raw byte array of hash value , not ascii hexadecimal notation . <nl> Checksum ( const std : : string & hashType , const std : : string & digest ) ; <nl> Checksum ( ) ; <nl> ~ Checksum ( ) ; <nl> mmm a / src / DownloadCommand . cc <nl> ppp b / src / DownloadCommand . cc <nl> bool DownloadCommand : : executeInternal ( ) { <nl> A2_LOG_DEBUG ( fmt ( " Hash is available ! index = % lu " , <nl> static_cast < unsigned long > ( segment - > getIndex ( ) ) ) ) ; <nl> validatePieceHash <nl> - ( segment , expectedPieceHash , segment - > getHashString ( ) ) ; <nl> + ( segment , expectedPieceHash , segment - > getDigest ( ) ) ; <nl> } else { <nl> messageDigest_ - > reset ( ) ; <nl> validatePieceHash <nl> ( segment , expectedPieceHash , <nl> - message_digest : : hexDigest <nl> + message_digest : : digest <nl> ( messageDigest_ , <nl> getPieceStorage ( ) - > getDiskAdaptor ( ) , <nl> segment - > getPosition ( ) , <nl> bool DownloadCommand : : prepareForNextSegment ( ) { <nl> # ifdef ENABLE_MESSAGE_DIGEST <nl> <nl> void DownloadCommand : : validatePieceHash ( const SharedHandle < Segment > & segment , <nl> - const std : : string & expectedPieceHash , <nl> - const std : : string & actualPieceHash ) <nl> + const std : : string & expectedHash , <nl> + const std : : string & actualHash ) <nl> { <nl> - if ( actualPieceHash = = expectedPieceHash ) { <nl> - A2_LOG_INFO ( fmt ( MSG_GOOD_CHUNK_CHECKSUM , actualPieceHash . c_str ( ) ) ) ; <nl> + if ( actualHash = = expectedHash ) { <nl> + A2_LOG_INFO ( fmt ( MSG_GOOD_CHUNK_CHECKSUM , util : : toHex ( actualHash ) . c_str ( ) ) ) ; <nl> getSegmentMan ( ) - > completeSegment ( getCuid ( ) , segment ) ; <nl> } else { <nl> A2_LOG_INFO ( fmt ( EX_INVALID_CHUNK_CHECKSUM , <nl> static_cast < unsigned long > ( segment - > getIndex ( ) ) , <nl> util : : itos ( segment - > getPosition ( ) , true ) . c_str ( ) , <nl> - expectedPieceHash . c_str ( ) , <nl> - actualPieceHash . c_str ( ) ) ) ; <nl> + util : : toHex ( expectedHash ) . c_str ( ) , <nl> + util : : toHex ( actualHash ) . c_str ( ) ) ) ; <nl> segment - > clear ( ) ; <nl> getSegmentMan ( ) - > cancelSegment ( getCuid ( ) ) ; <nl> throw DL_RETRY_EX <nl> mmm a / src / GrowSegment . cc <nl> ppp b / src / GrowSegment . cc <nl> void GrowSegment : : updateWrittenLength ( size_t bytes ) <nl> <nl> # ifdef ENABLE_MESSAGE_DIGEST <nl> <nl> - std : : string GrowSegment : : getHashString ( ) <nl> + std : : string GrowSegment : : getDigest ( ) <nl> { <nl> return A2STR : : NIL ; <nl> } <nl> mmm a / src / GrowSegment . h <nl> ppp b / src / GrowSegment . h <nl> class GrowSegment : public Segment { <nl> return false ; <nl> } <nl> <nl> - virtual std : : string getHashString ( ) ; <nl> + virtual std : : string getDigest ( ) ; <nl> <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> <nl> mmm a / src / HttpResponse . cc <nl> ppp b / src / HttpResponse . cc <nl> void HttpResponse : : getDigest ( std : : vector < Checksum > & result ) const <nl> break ; <nl> } <nl> util : : lowercase ( hashType ) ; <nl> - std : : string hexDigest = util : : toHex ( Base64 : : decode ( digest ) ) ; <nl> - if ( ! MessageDigest : : isValidHash ( hashType , hexDigest ) ) { <nl> + digest = Base64 : : decode ( digest ) ; <nl> + if ( ! MessageDigest : : supports ( hashType ) | | <nl> + MessageDigest : : getDigestLength ( hashType ) ! = digest . size ( ) ) { <nl> continue ; <nl> } <nl> - result . push_back ( Checksum ( hashType , hexDigest ) ) ; <nl> + result . push_back ( Checksum ( hashType , digest ) ) ; <nl> } <nl> } <nl> std : : sort ( result . begin ( ) , result . end ( ) , HashTypeStronger ( ) ) ; <nl> mmm a / src / IteratableChecksumValidator . cc <nl> ppp b / src / IteratableChecksumValidator . cc <nl> void IteratableChecksumValidator : : validateChunk ( ) <nl> ctx_ - > update ( buffer_ , length ) ; <nl> currentOffset_ + = length ; <nl> if ( finished ( ) ) { <nl> - std : : string actualDigest = ctx_ - > hexDigest ( ) ; <nl> + std : : string actualDigest = ctx_ - > digest ( ) ; <nl> if ( dctx_ - > getDigest ( ) = = actualDigest ) { <nl> pieceStorage_ - > markAllPiecesDone ( ) ; <nl> } else { <nl> A2_LOG_INFO ( fmt ( " Checksum validation failed . expected = % s , actual = % s " , <nl> - dctx_ - > getDigest ( ) . c_str ( ) , actualDigest . c_str ( ) ) ) ; <nl> + util : : toHex ( dctx_ - > getDigest ( ) ) . c_str ( ) , <nl> + util : : toHex ( actualDigest ) . c_str ( ) ) ) ; <nl> BitfieldMan bitfield ( dctx_ - > getPieceLength ( ) , dctx_ - > getTotalLength ( ) ) ; <nl> pieceStorage_ - > setBitfield ( bitfield . getBitfield ( ) , bitfield . getBitfieldLength ( ) ) ; <nl> } <nl> mmm a / src / IteratableChunkChecksumValidator . cc <nl> ppp b / src / IteratableChunkChecksumValidator . cc <nl> void IteratableChunkChecksumValidator : : validateChunk ( ) <nl> if ( actualChecksum = = dctx_ - > getPieceHashes ( ) [ currentIndex_ ] ) { <nl> bitfield_ - > setBit ( currentIndex_ ) ; <nl> } else { <nl> - A2_LOG_INFO ( fmt ( EX_INVALID_CHUNK_CHECKSUM , <nl> - static_cast < unsigned long > ( currentIndex_ ) , <nl> - util : : itos ( getCurrentOffset ( ) , true ) . c_str ( ) , <nl> - dctx_ - > getPieceHashes ( ) [ currentIndex_ ] . c_str ( ) , <nl> - actualChecksum . c_str ( ) ) ) ; <nl> + A2_LOG_INFO <nl> + ( fmt ( EX_INVALID_CHUNK_CHECKSUM , <nl> + static_cast < unsigned long > ( currentIndex_ ) , <nl> + util : : itos ( getCurrentOffset ( ) , true ) . c_str ( ) , <nl> + util : : toHex ( dctx_ - > getPieceHashes ( ) [ currentIndex_ ] ) . c_str ( ) , <nl> + util : : toHex ( actualChecksum ) . c_str ( ) ) ) ; <nl> bitfield_ - > unsetBit ( currentIndex_ ) ; <nl> } <nl> } catch ( RecoverableException & ex ) { <nl> std : : string IteratableChunkChecksumValidator : : digest ( off_t offset , size_t length <nl> curoffset + = r ; <nl> woffset = 0 ; <nl> } <nl> - return ctx_ - > hexDigest ( ) ; <nl> + return ctx_ - > digest ( ) ; <nl> } <nl> <nl> <nl> mmm a / src / MessageDigest . cc <nl> ppp b / src / MessageDigest . cc <nl> void MessageDigest : : digest ( unsigned char * md ) <nl> pImpl_ - > digest ( md ) ; <nl> } <nl> <nl> - std : : string MessageDigest : : hexDigest ( ) <nl> + std : : string MessageDigest : : digest ( ) <nl> { <nl> size_t length = pImpl_ - > getDigestLength ( ) ; <nl> array_ptr < unsigned char > buf ( new unsigned char [ length ] ) ; <nl> pImpl_ - > digest ( buf ) ; <nl> - std : : string hd = util : : toHex ( buf , length ) ; <nl> + std : : string hd ( & buf [ 0 ] , & buf [ length ] ) ; <nl> return hd ; <nl> } <nl> <nl> mmm a / src / MessageDigest . h <nl> ppp b / src / MessageDigest . h <nl> class MessageDigest { <nl> / / reset ( ) . <nl> void digest ( unsigned char * md ) ; <nl> <nl> - / / Returns hex digest . This call can only be called once . To reuse <nl> - / / this object , call reset ( ) . <nl> - std : : string hexDigest ( ) ; <nl> + / / Returns raw digest , not hex digest . This call can only be called <nl> + / / once . To reuse this object , call reset ( ) . <nl> + std : : string digest ( ) ; <nl> } ; <nl> <nl> } / / namespace aria2 <nl> mmm a / src / MetalinkParserController . cc <nl> ppp b / src / MetalinkParserController . cc <nl> void MetalinkParserController : : setHashOfChecksum ( const std : : string & md ) <nl> return ; <nl> } <nl> if ( MessageDigest : : isValidHash ( tChecksum_ - > getHashType ( ) , md ) ) { <nl> - tChecksum_ - > setDigest ( md ) ; <nl> + tChecksum_ - > setDigest ( util : : fromHex ( md ) ) ; <nl> } else { <nl> cancelChecksumTransaction ( ) ; <nl> } <nl> void MetalinkParserController : : addHashOfChunkChecksumV4 ( const std : : string & md ) <nl> return ; <nl> } <nl> if ( MessageDigest : : isValidHash ( tChunkChecksumV4_ - > getHashType ( ) , md ) ) { <nl> - tempChunkChecksumsV4_ . push_back ( md ) ; <nl> + tempChunkChecksumsV4_ . push_back ( util : : fromHex ( md ) ) ; <nl> } else { <nl> cancelChunkChecksumTransactionV4 ( ) ; <nl> } <nl> void MetalinkParserController : : setMessageDigestOfChunkChecksum ( const std : : string <nl> return ; <nl> } <nl> if ( MessageDigest : : isValidHash ( tChunkChecksum_ - > getHashType ( ) , md ) ) { <nl> - tempHashPair_ . second = md ; <nl> + tempHashPair_ . second = util : : fromHex ( md ) ; <nl> } else { <nl> cancelChunkChecksumTransaction ( ) ; <nl> } <nl> mmm a / src / Piece . cc <nl> ppp b / src / Piece . cc <nl> bool Piece : : isHashCalculated ( ) const <nl> return mdctx_ & & nextBegin_ = = length_ ; <nl> } <nl> <nl> - std : : string Piece : : getHashString ( ) <nl> + std : : string Piece : : getDigest ( ) <nl> { <nl> if ( ! mdctx_ ) { <nl> return A2STR : : NIL ; <nl> } else { <nl> - std : : string hash = mdctx_ - > hexDigest ( ) ; <nl> + std : : string hash = mdctx_ - > digest ( ) ; <nl> destroyHashContext ( ) ; <nl> return hash ; <nl> } <nl> mmm a / src / Piece . h <nl> ppp b / src / Piece . h <nl> class Piece { <nl> <nl> bool isHashCalculated ( ) const ; <nl> <nl> - / / Returns hash value in ASCII hexadecimal form , which is calculated <nl> + / / Returns raw hash value , not hex digest , which is calculated <nl> / / by updateHash ( ) . Please note that this function returns hash <nl> / / value only once . Second invocation without updateHash ( ) returns <nl> / / empty string . <nl> - std : : string getHashString ( ) ; <nl> + std : : string getDigest ( ) ; <nl> <nl> void destroyHashContext ( ) ; <nl> <nl> mmm a / src / PiecedSegment . cc <nl> ppp b / src / PiecedSegment . cc <nl> bool PiecedSegment : : isHashCalculated ( ) const <nl> return piece_ - > isHashCalculated ( ) ; <nl> } <nl> <nl> - std : : string PiecedSegment : : getHashString ( ) <nl> + std : : string PiecedSegment : : getDigest ( ) <nl> { <nl> - return piece_ - > getHashString ( ) ; <nl> + return piece_ - > getDigest ( ) ; <nl> } <nl> <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> mmm a / src / PiecedSegment . h <nl> ppp b / src / PiecedSegment . h <nl> class PiecedSegment : public Segment { <nl> <nl> virtual bool isHashCalculated ( ) const ; <nl> <nl> - virtual std : : string getHashString ( ) ; <nl> + virtual std : : string getDigest ( ) ; <nl> <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> <nl> mmm a / src / Segment . h <nl> ppp b / src / Segment . h <nl> class Segment { <nl> <nl> virtual bool isHashCalculated ( ) const = 0 ; <nl> <nl> - virtual std : : string getHashString ( ) = 0 ; <nl> + virtual std : : string getDigest ( ) = 0 ; <nl> <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> <nl> mmm a / src / bittorrent_helper . cc <nl> ppp b / src / bittorrent_helper . cc <nl> void extractPieceHash ( const SharedHandle < DownloadContext > & ctx , <nl> std : : vector < std : : string > pieceHashes ; <nl> pieceHashes . reserve ( numPieces ) ; <nl> for ( size_t i = 0 ; i < numPieces ; + + i ) { <nl> - pieceHashes . push_back ( util : : toHex ( hashData . data ( ) + i * hashLength , <nl> - hashLength ) ) ; <nl> + const char * p = hashData . data ( ) + i * hashLength ; <nl> + pieceHashes . push_back ( std : : string ( p , p + hashLength ) ) ; <nl> } <nl> ctx - > setPieceHashes ( " sha - 1 " , pieceHashes . begin ( ) , pieceHashes . end ( ) ) ; <nl> } <nl> mmm a / src / download_helper . cc <nl> ppp b / src / download_helper . cc <nl> SharedHandle < RequestGroup > createRequestGroup <nl> util : : divide ( p , checksum , ' = ' ) ; <nl> util : : lowercase ( p . first ) ; <nl> util : : lowercase ( p . second ) ; <nl> - dctx - > setDigest ( p . first , p . second ) ; <nl> + dctx - > setDigest ( p . first , util : : fromHex ( p . second ) ) ; <nl> } <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> rg - > setDownloadContext ( dctx ) ; <nl> mmm a / src / message_digest_helper . cc <nl> ppp b / src / message_digest_helper . cc <nl> void staticSHA1DigestFree ( ) <nl> sha1Ctx_ . reset ( ) ; <nl> } <nl> <nl> - std : : string staticSHA1DigestHexDigest <nl> + std : : string staticSHA1Digest <nl> ( const BinaryStreamHandle & bs , off_t offset , uint64_t length ) <nl> { <nl> sha1Ctx_ - > reset ( ) ; <nl> - return hexDigest ( sha1Ctx_ , bs , offset , length ) ; <nl> + return digest ( sha1Ctx_ , bs , offset , length ) ; <nl> } <nl> <nl> - std : : string hexDigest <nl> + std : : string digest <nl> ( const SharedHandle < MessageDigest > & ctx , <nl> const SharedHandle < BinaryStream > & bs , <nl> off_t offset , uint64_t length ) <nl> std : : string hexDigest <nl> } <nl> ctx - > update ( BUF , readLength ) ; <nl> } <nl> - return ctx - > hexDigest ( ) ; <nl> + return ctx - > digest ( ) ; <nl> } <nl> <nl> void digest <nl> mmm a / src / message_digest_helper . h <nl> ppp b / src / message_digest_helper . h <nl> void staticSHA1DigestInit ( ) ; <nl> * / <nl> void staticSHA1DigestFree ( ) ; <nl> <nl> - std : : string staticSHA1DigestHexDigest <nl> + std : : string staticSHA1Digest <nl> ( const SharedHandle < BinaryStream > & bs , off_t offset , uint64_t length ) ; <nl> <nl> / * * <nl> * ctx must be initialized or reseted before calling this function . <nl> - * Returns hex digest string , not * raw * digest <nl> + * Returns raw digest string , not hex digest <nl> * / <nl> - std : : string hexDigest <nl> + std : : string digest <nl> ( const SharedHandle < MessageDigest > & ctx , <nl> const SharedHandle < BinaryStream > & bs , <nl> off_t offset , uint64_t length ) ; <nl> mmm a / test / BittorrentHelperTest . cc <nl> ppp b / test / BittorrentHelperTest . cc <nl> void BittorrentHelperTest : : testGetPieceHash ( ) { <nl> SharedHandle < DownloadContext > dctx ( new DownloadContext ( ) ) ; <nl> load ( A2_TEST_DIR " / test . torrent " , dctx , option_ ) ; <nl> <nl> - CPPUNIT_ASSERT_EQUAL ( util : : toHex ( " AAAAAAAAAAAAAAAAAAAA " , 20 ) , <nl> + CPPUNIT_ASSERT_EQUAL ( std : : string ( " AAAAAAAAAAAAAAAAAAAA " ) , <nl> dctx - > getPieceHash ( 0 ) ) ; <nl> - CPPUNIT_ASSERT_EQUAL ( util : : toHex ( " BBBBBBBBBBBBBBBBBBBB " , 20 ) , <nl> + CPPUNIT_ASSERT_EQUAL ( std : : string ( " BBBBBBBBBBBBBBBBBBBB " ) , <nl> dctx - > getPieceHash ( 1 ) ) ; <nl> - CPPUNIT_ASSERT_EQUAL ( util : : toHex ( " CCCCCCCCCCCCCCCCCCCC " , 20 ) , <nl> + CPPUNIT_ASSERT_EQUAL ( std : : string ( " CCCCCCCCCCCCCCCCCCCC " ) , <nl> dctx - > getPieceHash ( 2 ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " " ) , <nl> dctx - > getPieceHash ( 3 ) ) ; <nl> mmm a / test / GZipDecodingStreamFilterTest . cc <nl> ppp b / test / GZipDecodingStreamFilterTest . cc <nl> void GZipDecodingStreamFilterTest : : testTransform ( ) <nl> SharedHandle < MessageDigest > sha1 ( MessageDigest : : sha1 ( ) ) ; <nl> sha1 - > update ( data . data ( ) , data . size ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " 8b577b33c0411b2be9d4fa74c7402d54a8d21f96 " ) , <nl> - sha1 - > hexDigest ( ) ) ; <nl> + util : : toHex ( sha1 - > digest ( ) ) ) ; <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> } <nl> <nl> mmm a / test / HttpResponseTest . cc <nl> ppp b / test / HttpResponseTest . cc <nl> void HttpResponseTest : : testGetDigest ( ) <nl> Checksum c = result [ 0 ] ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " sha - 256 " ) , c . getHashType ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " f83f271ae773dc6fe4a6454a41e0eb237c43e7bbf451e426cc60993a4d379ec5 " ) , <nl> - c . getDigest ( ) ) ; <nl> + util : : toHex ( c . getDigest ( ) ) ) ; <nl> <nl> c = result [ 1 ] ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " sha - 1 " ) , c . getHashType ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " f36003f22b462ffa184390533c500d8989e9f681 " ) , <nl> - c . getDigest ( ) ) ; <nl> + util : : toHex ( c . getDigest ( ) ) ) ; <nl> } <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> <nl> mmm a / test / IteratableChecksumValidatorTest . cc <nl> ppp b / test / IteratableChecksumValidatorTest . cc <nl> void IteratableChecksumValidatorTest : : testValidate ( ) { <nl> Option option ; <nl> SharedHandle < DownloadContext > dctx <nl> ( new DownloadContext ( 100 , 250 , A2_TEST_DIR " / chunkChecksumTestFile250 . txt " ) ) ; <nl> - dctx - > setDigest ( " sha - 1 " , " 898a81b8e0181280ae2ee1b81e269196d91e869a " ) ; <nl> + dctx - > setDigest ( " sha - 1 " , <nl> + util : : fromHex ( " 898a81b8e0181280ae2ee1b81e269196d91e869a " ) ) ; <nl> SharedHandle < DefaultPieceStorage > ps ( new DefaultPieceStorage ( dctx , & option ) ) ; <nl> ps - > initStorage ( ) ; <nl> ps - > getDiskAdaptor ( ) - > enableReadOnly ( ) ; <nl> void IteratableChecksumValidatorTest : : testValidate_fail ( ) { <nl> Option option ; <nl> SharedHandle < DownloadContext > dctx <nl> ( new DownloadContext ( 100 , 250 , A2_TEST_DIR " / chunkChecksumTestFile250 . txt " ) ) ; <nl> - dctx - > setDigest ( " sha - 1 " , std : : string ( 40 , ' 0 ' ) ) ; / / set wrong checksum <nl> + dctx - > setDigest ( " sha - 1 " , <nl> + util : : fromHex ( std : : string ( 40 , ' 0 ' ) ) ) ; / / set wrong checksum <nl> SharedHandle < DefaultPieceStorage > ps ( new DefaultPieceStorage ( dctx , & option ) ) ; <nl> ps - > initStorage ( ) ; <nl> ps - > getDiskAdaptor ( ) - > enableReadOnly ( ) ; <nl> mmm a / test / IteratableChunkChecksumValidatorTest . cc <nl> ppp b / test / IteratableChunkChecksumValidatorTest . cc <nl> class IteratableChunkChecksumValidatorTest : public CppUnit : : TestFixture { <nl> CPPUNIT_TEST_SUITE_END ( ) ; <nl> private : <nl> <nl> - static const char * csArray [ ] ; <nl> + static const std : : string csArray [ ] ; <nl> public : <nl> void setUp ( ) { <nl> } <nl> class IteratableChunkChecksumValidatorTest : public CppUnit : : TestFixture { <nl> <nl> CPPUNIT_TEST_SUITE_REGISTRATION ( IteratableChunkChecksumValidatorTest ) ; <nl> <nl> - const char * IteratableChunkChecksumValidatorTest : : csArray [ ] = { " 29b0e7878271645fffb7eec7db4a7473a1c00bc1 " , <nl> - " 4df75a661cb7eb2733d9cdaa7f772eae3a4e2976 " , <nl> - " 0a4ea2f7dd7c52ddf2099a444ab2184b4d341bdb " } ; <nl> + const std : : string IteratableChunkChecksumValidatorTest : : csArray [ ] = <nl> + { util : : fromHex ( " 29b0e7878271645fffb7eec7db4a7473a1c00bc1 " ) , <nl> + util : : fromHex ( " 4df75a661cb7eb2733d9cdaa7f772eae3a4e2976 " ) , <nl> + util : : fromHex ( " 0a4ea2f7dd7c52ddf2099a444ab2184b4d341bdb " ) } ; <nl> <nl> void IteratableChunkChecksumValidatorTest : : testValidate ( ) { <nl> Option option ; <nl> void IteratableChunkChecksumValidatorTest : : testValidate ( ) { <nl> <nl> / / make the test fail <nl> std : : deque < std : : string > badHashes ( & csArray [ 0 ] , & csArray [ 3 ] ) ; <nl> - badHashes [ 1 ] = " ffffffffffffffffffffffffffffffffffffffff " ; <nl> + badHashes [ 1 ] = util : : fromHex ( " ffffffffffffffffffffffffffffffffffffffff " ) ; <nl> dctx - > setPieceHashes ( " sha - 1 " , badHashes . begin ( ) , badHashes . end ( ) ) ; <nl> <nl> validator . init ( ) ; <nl> void IteratableChunkChecksumValidatorTest : : testValidate_readError ( ) { <nl> SharedHandle < DownloadContext > dctx <nl> ( new DownloadContext ( 100 , 500 , A2_TEST_DIR " / chunkChecksumTestFile250 . txt " ) ) ; <nl> std : : deque < std : : string > hashes ( & csArray [ 0 ] , & csArray [ 3 ] ) ; <nl> - hashes . push_back ( " ffffffffffffffffffffffffffffffffffffffff " ) ; <nl> - hashes . push_back ( " ffffffffffffffffffffffffffffffffffffffff " ) ; <nl> + hashes . push_back ( util : : fromHex ( " ffffffffffffffffffffffffffffffffffffffff " ) ) ; <nl> + hashes . push_back ( util : : fromHex ( " ffffffffffffffffffffffffffffffffffffffff " ) ) ; <nl> dctx - > setPieceHashes ( " sha - 1 " , hashes . begin ( ) , hashes . end ( ) ) ; <nl> SharedHandle < DefaultPieceStorage > ps ( new DefaultPieceStorage ( dctx , & option ) ) ; <nl> ps - > initStorage ( ) ; <nl> mmm a / test / MessageDigestHelperTest . cc <nl> ppp b / test / MessageDigestHelperTest . cc <nl> namespace aria2 { <nl> class MessageDigestHelperTest : public CppUnit : : TestFixture { <nl> <nl> CPPUNIT_TEST_SUITE ( MessageDigestHelperTest ) ; <nl> - CPPUNIT_TEST ( testHexDigestDiskWriter ) ; <nl> + CPPUNIT_TEST ( testDigestDiskWriter ) ; <nl> CPPUNIT_TEST_SUITE_END ( ) ; <nl> private : <nl> <nl> class MessageDigestHelperTest : public CppUnit : : TestFixture { <nl> void setUp ( ) { <nl> } <nl> <nl> - void testHexDigestDiskWriter ( ) ; <nl> + void testDigestDiskWriter ( ) ; <nl> } ; <nl> <nl> <nl> CPPUNIT_TEST_SUITE_REGISTRATION ( MessageDigestHelperTest ) ; <nl> <nl> - void MessageDigestHelperTest : : testHexDigestDiskWriter ( ) { <nl> + void MessageDigestHelperTest : : testDigestDiskWriter ( ) { <nl> SharedHandle < DefaultDiskWriter > diskio <nl> ( new DefaultDiskWriter ( A2_TEST_DIR " / 4096chunk . txt " ) ) ; <nl> diskio - > enableReadOnly ( ) ; <nl> diskio - > openExistingFile ( ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " 608cabc0f2fa18c260cafd974516865c772363d5 " ) , <nl> - message_digest : : hexDigest <nl> - ( MessageDigest : : sha1 ( ) , diskio , 0 , 4096 ) ) ; <nl> + util : : toHex ( message_digest : : digest <nl> + ( MessageDigest : : sha1 ( ) , diskio , 0 , 4096 ) ) ) ; <nl> <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " 7a4a9ae537ebbbb826b1060e704490ad0f365ead " ) , <nl> - message_digest : : hexDigest <nl> - ( MessageDigest : : sha1 ( ) , diskio , 5 , 100 ) ) ; <nl> + util : : toHex ( message_digest : : digest <nl> + ( MessageDigest : : sha1 ( ) , diskio , 5 , 100 ) ) ) ; <nl> } <nl> <nl> } / / namespace aria2 <nl> mmm a / test / MessageDigestTest . cc <nl> ppp b / test / MessageDigestTest . cc <nl> namespace aria2 { <nl> class MessageDigestTest : public CppUnit : : TestFixture { <nl> <nl> CPPUNIT_TEST_SUITE ( MessageDigestTest ) ; <nl> - CPPUNIT_TEST ( testHexDigest ) ; <nl> + CPPUNIT_TEST ( testDigest ) ; <nl> CPPUNIT_TEST ( testSupports ) ; <nl> CPPUNIT_TEST ( testGetDigestLength ) ; <nl> CPPUNIT_TEST ( testIsStronger ) ; <nl> class MessageDigestTest : public CppUnit : : TestFixture { <nl> sha1_ = MessageDigest : : sha1 ( ) ; <nl> } <nl> <nl> - void testHexDigest ( ) ; <nl> + void testDigest ( ) ; <nl> void testSupports ( ) ; <nl> void testGetDigestLength ( ) ; <nl> void testIsStronger ( ) ; <nl> class MessageDigestTest : public CppUnit : : TestFixture { <nl> <nl> CPPUNIT_TEST_SUITE_REGISTRATION ( MessageDigestTest ) ; <nl> <nl> - void MessageDigestTest : : testHexDigest ( ) <nl> + void MessageDigestTest : : testDigest ( ) <nl> { <nl> sha1_ - > update ( " aria2 " , 5 ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " f36003f22b462ffa184390533c500d8989e9f681 " ) , <nl> - sha1_ - > hexDigest ( ) ) ; <nl> + util : : toHex ( sha1_ - > digest ( ) ) ) ; <nl> } <nl> <nl> void MessageDigestTest : : testSupports ( ) <nl> mmm a / test / Metalink2RequestGroupTest . cc <nl> ppp b / test / Metalink2RequestGroupTest . cc <nl> void Metalink2RequestGroupTest : : testGenerate ( ) <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " sha - 1 " ) , dctx - > getHashType ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL <nl> ( std : : string ( " a96cf3f0266b91d87d5124cf94326422800b627d " ) , <nl> - dctx - > getDigest ( ) ) ; <nl> + util : : toHex ( dctx - > getDigest ( ) ) ) ; <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> CPPUNIT_ASSERT ( dctx - > getSignature ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " pgp " ) , dctx - > getSignature ( ) - > getType ( ) ) ; <nl> void Metalink2RequestGroupTest : : testGenerate ( ) <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " sha - 1 " ) , dctx - > getHashType ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL <nl> ( std : : string ( " 4c255b0ed130f5ea880f0aa061c3da0487e251cc " ) , <nl> - dctx - > getDigest ( ) ) ; <nl> + util : : toHex ( dctx - > getDigest ( ) ) ) ; <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> CPPUNIT_ASSERT ( ! dctx - > getSignature ( ) ) ; <nl> } <nl> mmm a / test / MetalinkParserControllerTest . cc <nl> ppp b / test / MetalinkParserControllerTest . cc <nl> void MetalinkParserControllerTest : : testChecksumTransaction ( ) <nl> SharedHandle < Checksum > md = m - > getEntries ( ) . front ( ) - > checksum ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " md5 " ) , md - > getHashType ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " acbd18db4cc2f85cedef654fccc4a4d8 " ) , <nl> - md - > getDigest ( ) ) ; <nl> + util : : toHex ( md - > getDigest ( ) ) ) ; <nl> } <nl> ctrl . newEntryTransaction ( ) ; <nl> ctrl . newChecksumTransaction ( ) ; <nl> void MetalinkParserControllerTest : : testChunkChecksumTransactionV4 ( ) <nl> CPPUNIT_ASSERT_EQUAL ( ( size_t ) 3 , md - > countPieceHash ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL <nl> ( std : : string ( " 5bd9f7248df0f3a6a86ab6c95f48787d546efa14 " ) , <nl> - md - > getPieceHashes ( ) [ 0 ] ) ; <nl> + util : : toHex ( md - > getPieceHashes ( ) [ 0 ] ) ) ; <nl> CPPUNIT_ASSERT_EQUAL <nl> ( std : : string ( " 9413ee70957a09d55704123687478e07f18c7b29 " ) , <nl> - md - > getPieceHashes ( ) [ 1 ] ) ; <nl> + util : : toHex ( md - > getPieceHashes ( ) [ 1 ] ) ) ; <nl> CPPUNIT_ASSERT_EQUAL <nl> ( std : : string ( " 44213f9f4d59b557314fadcd233232eebcac8012 " ) , <nl> - md - > getPieceHashes ( ) [ 2 ] ) ; <nl> + util : : toHex ( md - > getPieceHashes ( ) [ 2 ] ) ) ; <nl> } <nl> ctrl . newEntryTransaction ( ) ; <nl> ctrl . newChunkChecksumTransactionV4 ( ) ; <nl> mmm a / test / MetalinkProcessorTest . cc <nl> ppp b / test / MetalinkProcessorTest . cc <nl> <nl> # include " Signature . h " <nl> # include " fmt . h " <nl> # include " RecoverableException . h " <nl> + # include " util . h " <nl> <nl> namespace aria2 { <nl> <nl> void MetalinkProcessorTest : : testParseFileV4 ( ) <nl> CPPUNIT_ASSERT_EQUAL ( - 1 , e - > maxConnections ) ; <nl> # ifdef ENABLE_MESSAGE_DIGEST <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33 " ) , <nl> - e - > checksum - > getDigest ( ) ) ; <nl> + util : : toHex ( e - > checksum - > getDigest ( ) ) ) ; <nl> CPPUNIT_ASSERT ( e - > checksum ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " sha - 1 " ) , e - > checksum - > getHashType ( ) ) ; <nl> CPPUNIT_ASSERT ( e - > chunkChecksum ) ; <nl> void MetalinkProcessorTest : : testParseFileV4 ( ) <nl> CPPUNIT_ASSERT_EQUAL ( ( size_t ) 262144 , e - > chunkChecksum - > getPieceLength ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( ( size_t ) 3 , e - > chunkChecksum - > countPieceHash ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " 0245178074fd042e19b7c3885b360fc21064b30e73f5626c7e3b005d048069c5 " ) , <nl> - e - > chunkChecksum - > getPieceHash ( 0 ) ) ; <nl> + util : : toHex ( e - > chunkChecksum - > getPieceHash ( 0 ) ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " 487ba2299be7f759d7c7bf6a4ac3a32cee81f1bb9332fc485947e32918864fb2 " ) , <nl> - e - > chunkChecksum - > getPieceHash ( 1 ) ) ; <nl> + util : : toHex ( e - > chunkChecksum - > getPieceHash ( 1 ) ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " 37290d74ac4d186e3a8e5785d259d2ec04fac91ae28092e7620ec8bc99e830aa " ) , <nl> - e - > chunkChecksum - > getPieceHash ( 2 ) ) ; <nl> + util : : toHex ( e - > chunkChecksum - > getPieceHash ( 2 ) ) ) ; <nl> } else { <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " sha - 1 " ) , e - > chunkChecksum - > getHashType ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( ( size_t ) 262144 , e - > chunkChecksum - > getPieceLength ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( ( size_t ) 3 , e - > chunkChecksum - > countPieceHash ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL <nl> ( std : : string ( " 5bd9f7248df0f3a6a86ab6c95f48787d546efa14 " ) , <nl> - e - > chunkChecksum - > getPieceHash ( 0 ) ) ; <nl> + util : : toHex ( e - > chunkChecksum - > getPieceHash ( 0 ) ) ) ; <nl> CPPUNIT_ASSERT_EQUAL <nl> ( std : : string ( " 9413ee70957a09d55704123687478e07f18c7b29 " ) , <nl> - e - > chunkChecksum - > getPieceHash ( 1 ) ) ; <nl> + util : : toHex ( e - > chunkChecksum - > getPieceHash ( 1 ) ) ) ; <nl> CPPUNIT_ASSERT_EQUAL <nl> ( std : : string ( " 44213f9f4d59b557314fadcd233232eebcac8012 " ) , <nl> - e - > chunkChecksum - > getPieceHash ( 2 ) ) ; <nl> + util : : toHex ( e - > chunkChecksum - > getPieceHash ( 2 ) ) ) ; <nl> } <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> CPPUNIT_ASSERT ( e - > getSignature ( ) ) ; <nl> void MetalinkProcessorTest : : testParseFile ( ) <nl> CPPUNIT_ASSERT_EQUAL ( 1 , entry1 - > maxConnections ) ; <nl> # ifdef ENABLE_MESSAGE_DIGEST <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " a96cf3f0266b91d87d5124cf94326422800b627d " ) , <nl> - entry1 - > checksum - > getDigest ( ) ) ; <nl> + util : : toHex ( entry1 - > checksum - > getDigest ( ) ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " sha - 1 " ) , entry1 - > checksum - > getHashType ( ) ) ; <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> CPPUNIT_ASSERT ( entry1 - > getSignature ( ) ) ; <nl> void MetalinkProcessorTest : : testParseFile ( ) <nl> CPPUNIT_ASSERT_EQUAL ( - 1 , entry2 - > maxConnections ) ; <nl> # ifdef ENABLE_MESSAGE_DIGEST <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " 4c255b0ed130f5ea880f0aa061c3da0487e251cc " ) , <nl> - entry2 - > checksum - > getDigest ( ) ) ; <nl> + util : : toHex ( entry2 - > checksum - > getDigest ( ) ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( ( size_t ) 2 , entry2 - > chunkChecksum - > countPieceHash ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( ( size_t ) 262144 , entry2 - > chunkChecksum - > getPieceLength ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " 179463a88d79cbf0b1923991708aead914f26142 " ) , <nl> - entry2 - > chunkChecksum - > getPieceHash ( 0 ) ) ; <nl> + util : : toHex ( entry2 - > chunkChecksum - > getPieceHash ( 0 ) ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " fecf8bc9a1647505fe16746f94e97a477597dbf3 " ) , <nl> - entry2 - > chunkChecksum - > getPieceHash ( 1 ) ) ; <nl> + util : : toHex ( entry2 - > chunkChecksum - > getPieceHash ( 1 ) ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " sha - 1 " ) , entry2 - > checksum - > getHashType ( ) ) ; <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> / / See that signature is null <nl> void MetalinkProcessorTest : : testParseFile ( ) <nl> # ifdef ENABLE_MESSAGE_DIGEST <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " sha - 1 " ) , entry4 - > checksum - > getHashType ( ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " 4c255b0ed130f5ea880f0aa061c3da0487e251cc " ) , <nl> - entry4 - > checksum - > getDigest ( ) ) ; <nl> + util : : toHex ( entry4 - > checksum - > getDigest ( ) ) ) ; <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " sha - 1 " ) , entry4 - > chunkChecksum - > getHashType ( ) ) ; <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> <nl> mmm a / test / MockSegment . h <nl> ppp b / test / MockSegment . h <nl> class MockSegment : public Segment { <nl> return false ; <nl> } <nl> <nl> - virtual std : : string getHashString ( ) <nl> + virtual std : : string getDigest ( ) <nl> { <nl> return A2STR : : NIL ; <nl> } <nl> mmm a / test / PieceTest . cc <nl> ppp b / test / PieceTest . cc <nl> <nl> <nl> # include < cppunit / extensions / HelperMacros . h > <nl> <nl> + # include " util . h " <nl> + <nl> namespace aria2 { <nl> <nl> class PieceTest : public CppUnit : : TestFixture { <nl> void PieceTest : : testUpdateHash ( ) <nl> CPPUNIT_ASSERT ( p . isHashCalculated ( ) ) ; <nl> <nl> CPPUNIT_ASSERT_EQUAL ( std : : string ( " d9189aff79e075a2e60271b9556a710dc1bc7de7 " ) , <nl> - p . getHashString ( ) ) ; <nl> + util : : toHex ( p . getDigest ( ) ) ) ; <nl> } <nl> <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> mmm a / test / TestUtil . cc <nl> ppp b / test / TestUtil . cc <nl> <nl> # include " Cookie . h " <nl> # include " DefaultDiskWriter . h " <nl> # include " fmt . h " <nl> + # include " util . h " <nl> # ifdef ENABLE_MESSAGE_DIGEST <nl> # include " message_digest_helper . h " <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> std : : string fileHexDigest <nl> { <nl> SharedHandle < DiskWriter > writer ( new DefaultDiskWriter ( filename ) ) ; <nl> writer - > openExistingFile ( ) ; <nl> - return message_digest : : hexDigest ( ctx , writer , 0 , writer - > size ( ) ) ; <nl> + return util : : toHex ( message_digest : : digest ( ctx , writer , 0 , writer - > size ( ) ) ) ; <nl> } <nl> # endif / / ENABLE_MESSAGE_DIGEST <nl> <nl>
|
Stored hash value as raw byte string , instead of hex digest .
|
aria2/aria2
|
310e58bc621803917179c80b399013cf8b80e245
|
2011-10-13T12:40:07Z
|
mmm a / tensorflow / core / kernels / stack_ops . cc <nl> ppp b / tensorflow / core / kernels / stack_ops . cc <nl> class StackPushOp : public AsyncOpKernel { <nl> / / Push the tensor onto the stack . Swap the tensor to CPU if instructed . <nl> const Tensor & tensor = ctx - > input ( 1 ) ; <nl> AllocatorAttributes alloc_attrs = ctx - > input_alloc_attr ( 1 ) ; <nl> - static constexpr int copy_threshold = 2048 ; <nl> + DeviceContext * device_ctxt = ctx - > op_device_context ( ) ; <nl> + auto device = static_cast < tensorflow : : Device * > ( ctx - > device ( ) ) ; <nl> + Allocator * allocator = device - > GetAllocator ( alloc_attrs ) ; <nl> + AllocatorStats stats ; <nl> + allocator - > GetStats ( & stats ) ; <nl> + static constexpr int kCopyThreshold = 2048 ; <nl> + static constexpr double kOccupancy = 0 . 7 ; <nl> if ( swap_memory_ & & ! alloc_attrs . on_host ( ) & & <nl> std : : is_same < Device , GPUDevice > : : value & & <nl> - tensor . TotalBytes ( ) > copy_threshold ) { <nl> + stats . bytes_in_use > ( stats . bytes_limit * kOccupancy ) & & <nl> + tensor . TotalBytes ( ) > kCopyThreshold ) { <nl> / / Asynchronously copy the tensor from GPU to CPU memory . <nl> - / / TODO ( yuanbyu ) : Swap only when there is mmeory pressure . <nl> - DeviceContext * device_ctxt = ctx - > op_device_context ( ) ; <nl> - auto device = static_cast < tensorflow : : Device * > ( ctx - > device ( ) ) ; <nl> + / / TODO ( yuanbyu ) : Swap the oldest tensor first . <nl> AllocatorAttributes host_alloc_attrs ; <nl> host_alloc_attrs . set_gpu_compatible ( true ) ; <nl> host_alloc_attrs . set_on_host ( true ) ; <nl> mmm a / tensorflow / python / kernel_tests / rnn_test . py <nl> ppp b / tensorflow / python / kernel_tests / rnn_test . py <nl> def _create_dynamic_rnn ( ) : <nl> ( max_time , delta_static , delta_dynamic , delta_dynamic / delta_static ) ) <nl> <nl> <nl> - def static_vs_dynamic_rnn_benchmark ( batch_size , max_time , num_units , use_gpu ) : <nl> - config = tf . ConfigProto ( ) <nl> - config . allow_soft_placement = True <nl> + def _timer ( sess , ops ) : <nl> + # Warm in <nl> + for _ in range ( 5 ) : <nl> + sess . run ( ops ) <nl> <nl> - def _timer ( sess , ops ) : <nl> - # Warm in <nl> - for _ in range ( 2 ) : <nl> - sess . run ( ops ) <nl> + # Timing run <nl> + runs = 10 <nl> + start = time . time ( ) <nl> + for _ in range ( runs ) : <nl> + sess . run ( ops ) <nl> + end = time . time ( ) <nl> + return ( end - start ) / float ( runs ) <nl> <nl> - # Timing run <nl> - start = time . time ( ) <nl> - for _ in range ( 10 ) : <nl> - sess . run ( ops ) <nl> - end = time . time ( ) <nl> <nl> - return ( end - start ) / 10 . 0 # Average runtime per iteration <nl> + def static_vs_dynamic_rnn_benchmark ( batch_size , max_time , num_units , use_gpu ) : <nl> + config = tf . ConfigProto ( ) <nl> + config . allow_soft_placement = True <nl> <nl> # Set up sequence lengths <nl> np . random . seed ( [ 127 ] ) <nl> def dynamic_rnn_swap_memory_benchmark ( batch_size , max_time , num_units ) : <nl> config = tf . ConfigProto ( ) <nl> config . allow_soft_placement = True <nl> <nl> - def _timer ( sess , ops ) : <nl> - # Warm in <nl> - for _ in range ( 2 ) : <nl> - sess . run ( ops ) <nl> - <nl> - # Timing run <nl> - start = time . time ( ) <nl> - for _ in range ( 10 ) : <nl> - sess . run ( ops ) <nl> - end = time . time ( ) <nl> - <nl> - return ( end - start ) / 10 . 0 # Average runtime per iteration <nl> - <nl> # Set up sequence lengths <nl> np . random . seed ( [ 127 ] ) <nl> sequence_length = np . random . randint ( 0 , max_time , size = batch_size ) <nl> def _timer ( sess , ops ) : <nl> ( batch_size , max_time , num_units , no_swap , swap , swap / no_swap ) ) <nl> <nl> <nl> + def rnn_long_sequence_benchmark ( batch_size , seqlen , num_units , <nl> + dynamic , swap_memory ) : <nl> + config = tf . ConfigProto ( ) <nl> + config . allow_soft_placement = True <nl> + <nl> + # Set up sequence lengths <nl> + np . random . seed ( [ 127 ] ) <nl> + sequence_length = [ seqlen for _ in range ( batch_size ) ] <nl> + inputs_list = [ <nl> + np . random . randn ( batch_size , num_units ) . astype ( np . float32 ) <nl> + for _ in range ( seqlen ) ] <nl> + inputs = np . dstack ( inputs_list ) . transpose ( [ 0 , 2 , 1 ] ) # batch x time x depth <nl> + <nl> + for _ in range ( 5 ) : <nl> + if dynamic : <nl> + with tf . Session ( config = config , graph = tf . Graph ( ) ) as sess : <nl> + inputs_t = tf . constant ( inputs ) <nl> + ops = _dynamic_rnn_swap_memory_benchmark ( <nl> + inputs_t , sequence_length , swap_memory = swap_memory ) <nl> + tf . initialize_all_variables ( ) . run ( ) <nl> + elapsed = _timer ( sess , ops ) <nl> + else : <nl> + with tf . Session ( config = config , graph = tf . Graph ( ) ) as sess : <nl> + inputs_list_t = [ tf . constant ( x ) for x in inputs_list ] <nl> + ops = _static_vs_dynamic_rnn_benchmark_static ( <nl> + inputs_list_t , sequence_length ) <nl> + tf . initialize_all_variables ( ) . run ( ) <nl> + elapsed = _timer ( sess , ops ) <nl> + <nl> + print ( " % d \ t % d \ t % d \ t % s \ t % f \ t % f " % <nl> + ( batch_size , seqlen , num_units , dynamic , elapsed , <nl> + elapsed / seqlen ) ) <nl> + <nl> + <nl> def main ( _ ) : <nl> print ( " Graph Creation : Static Unroll vs . Dynamic Unroll LSTM " ) <nl> print ( " max_t \ t dt ( static ) \ t dt ( dynamic ) \ t dt ( dynamic ) / dt ( static ) " ) <nl> def main ( _ ) : <nl> for batch_size in ( 256 , 512 ) : <nl> for max_time in ( 50 , 100 ) : <nl> for num_units in ( 512 , 256 , 128 ) : <nl> - dynamic_rnn_swap_memory_benchmark ( <nl> - batch_size , max_time , num_units ) <nl> + dynamic_rnn_swap_memory_benchmark ( batch_size , max_time , num_units ) <nl> <nl> <nl> if __name__ = = " __main__ " : <nl> mmm a / tensorflow / python / ops / control_flow_ops . py <nl> ppp b / tensorflow / python / ops / control_flow_ops . py <nl> def map_fn ( fn , elems , dtype = None , name = None ) : <nl> dtype = dtype if dtype else elems . dtype <nl> <nl> # Convert elems to tensor array . <nl> - elems_ta = tensor_array_ops . TensorArray ( dtype = elems . dtype , size = 0 , <nl> - dynamic_size = True ) <nl> + n = array_ops . shape ( elems ) [ 0 ] <nl> + elems_ta = tensor_array_ops . TensorArray ( dtype = elems . dtype , size = n , <nl> + dynamic_size = False ) <nl> elems_ta = elems_ta . unpack ( elems ) <nl> <nl> - n = elems_ta . size ( ) <nl> i = constant_op . constant ( 0 ) <nl> - acc_ta = tensor_array_ops . TensorArray ( dtype = dtype , size = n ) <nl> + acc_ta = tensor_array_ops . TensorArray ( dtype = dtype , size = n , <nl> + dynamic_size = False ) <nl> def compute ( i , a ) : <nl> a = a . write ( i , fn ( elems_ta . read ( i ) ) ) <nl> i = math_ops . add ( i , 1 ) <nl>
|
More work on GPU / CPU memory swaping . Trigger the memory swapping only when the " in - use " memory reaches a given threshold . Added more bechmarks .
|
tensorflow/tensorflow
|
76af3d9568e715b2656213f2453998d64d8e710b
|
2016-03-04T22:35:52Z
|
mmm a / . doozer . json <nl> ppp b / . doozer . json <nl> <nl> " targets " : { <nl> " xenial - amd64 " : { <nl> " buildenv " : " xenial - amd64 " , <nl> - " builddeps " : [ " build - essential " ] , <nl> + " builddeps " : [ " build - essential " , " cmake " ] , <nl> " buildcmd " : [ <nl> " mkdir build " , <nl> " cd build " , <nl>
|
: construction_worker : added cmake
|
nlohmann/json
|
2fcca259b04eb66e41c531e96b7d912128474548
|
2019-03-23T22:21:17Z
|
mmm a / src / type - info . cc <nl> ppp b / src / type - info . cc <nl> Handle < Object > TypeFeedbackOracle : : GetInfo ( FeedbackVectorSlot slot ) { <nl> Object * obj = feedback_vector_ - > Get ( slot ) ; <nl> if ( ! obj - > IsJSFunction ( ) | | <nl> ! CanRetainOtherContext ( JSFunction : : cast ( obj ) , * native_context_ ) ) { <nl> + DCHECK ( ! obj - > IsMap ( ) ) ; <nl> return Handle < Object > ( obj , isolate ( ) ) ; <nl> } <nl> return Handle < Object > : : cast ( isolate ( ) - > factory ( ) - > undefined_value ( ) ) ; <nl> Handle < Object > TypeFeedbackOracle : : GetInfo ( FeedbackVectorICSlot slot ) { <nl> obj = cell - > value ( ) ; <nl> } <nl> <nl> - if ( ! obj - > IsJSFunction ( ) | | <nl> - ! CanRetainOtherContext ( JSFunction : : cast ( obj ) , * native_context_ ) ) { <nl> + if ( ( obj - > IsJSFunction ( ) & & <nl> + ! CanRetainOtherContext ( JSFunction : : cast ( obj ) , * native_context_ ) ) | | <nl> + obj - > IsAllocationSite ( ) | | obj - > IsSymbol ( ) ) { <nl> return Handle < Object > ( obj , isolate ( ) ) ; <nl> } <nl> + <nl> return undefined ; <nl> } <nl> <nl>
|
Prevent leaks of cross context maps in the Oracle .
|
v8/v8
|
821655fb5778141140a7d4b0151aede04fca522b
|
2015-03-24T15:37:23Z
|
mmm a / CMakeLists . txt <nl> ppp b / CMakeLists . txt <nl> <nl> - CMAKE_MINIMUM_REQUIRED ( VERSION 2 . 8 ) <nl> + CMAKE_MINIMUM_REQUIRED ( VERSION 2 . 8 . 8 ) <nl> PROJECT ( OSQUERY ) <nl> <nl> - SET ( CMAKE_MODULE_PATH " $ { CMAKE_CURRENT_SOURCE_DIR } / CMake " $ { CMAKE_MODULE_PATH } ) <nl> - FIND_PACKAGE ( Gtest REQUIRED ) <nl> - FIND_PACKAGE ( RocksDB REQUIRED ) <nl> - FIND_PACKAGE ( Sqlite3 REQUIRED ) <nl> - <nl> + set ( USER_COMPILE_FLAGS " " ) <nl> if ( APPLE ) <nl> set ( OS_COMPILE_FLAGS " - std = c + + 11 - stdlib = libc + + " ) <nl> + set ( OS_WHOLELINK_PRE " - Wl , - all_load " ) <nl> + set ( OS_WHOLELINK_POST " " ) <nl> else ( ) <nl> set ( OS_COMPILE_FLAGS " - std = c + + 11 " ) <nl> + set ( OS_WHOLELINK_PRE " - Wl , - whole - archive " ) <nl> + set ( OS_WHOLELINK_POST " - Wl , - no - whole - archive " ) <nl> + endif ( ) <nl> + <nl> + SET ( BUILD_SHARED " " CACHE STRING " Build and link libosquery statically . " ) <nl> + if ( BUILD_SHARED ) <nl> + set ( USER_COMPILE_FLAGS " - fPIC " ) <nl> + else ( ) <nl> + # Building / linking statically ( no libosquery ) <nl> endif ( ) <nl> <nl> + set ( OS_COMPILE_FLAGS " $ { OS_COMPILE_FLAGS } $ { USER_COMPILE_FLAGS } " ) <nl> + <nl> + SET ( CMAKE_MODULE_PATH " $ { CMAKE_CURRENT_SOURCE_DIR } / CMake " $ { CMAKE_MODULE_PATH } ) <nl> + FIND_PACKAGE ( Gtest REQUIRED ) <nl> + FIND_PACKAGE ( RocksDB REQUIRED ) <nl> + FIND_PACKAGE ( Sqlite3 REQUIRED ) <nl> + <nl> INCLUDE_DIRECTORIES ( " $ { CMAKE_SOURCE_DIR } " ) <nl> INCLUDE_DIRECTORIES ( " / usr / local / include " ) <nl> LINK_DIRECTORIES ( " / usr / local / lib " ) <nl> mmm a / Makefile <nl> ppp b / Makefile <nl> OSQUERYD_PLIST_PATH = " / Library / LaunchDaemons / com . facebook . osqueryd . plist " <nl> endif <nl> ROCKSDB_PATH = " / tmp / rocksdb - osquery " <nl> <nl> - all : build <nl> + all : tables build <nl> <nl> ammend : <nl> git add . <nl> git commit - - amend - - no - edit <nl> <nl> . PHONY : build <nl> - build : tables <nl> + build : <nl> mkdir - p build <nl> cd build & & cmake . . & & make $ ( MAKEFLAGS ) <nl> <nl> + . PHONY : build_shared <nl> + build_shared : <nl> + mkdir - p build / shared <nl> + cd build / shared & & cmake - D BUILD_SHARED : Boolean = True . . / . . & & make $ ( MAKEFLAGS ) <nl> + <nl> clean : clean_tables <nl> cd build & & make clean <nl> <nl> clean_install : <nl> rm - f / usr / local / bin / osqueryi <nl> rm - f / usr / local / bin / osqueryd <nl> rm - rf / var / log / osquery <nl> - if [ - f $ ( OSQUERYD_PLIST_PATH ) ] ; then launchctl unload $ ( OSQUERYD_PLIST_PATH ) ; fi ; <nl> + if [ - f $ ( OSQUERYD_PLIST_PATH ) ] ; <nl> + then launchctl unload $ ( OSQUERYD_PLIST_PATH ) ; <nl> + fi ; <nl> rm - f $ ( OSQUERYD_PLIST_PATH ) <nl> endif <nl> <nl> mmm a / osquery / CMakeLists . txt <nl> ppp b / osquery / CMakeLists . txt <nl> <nl> + SET ( OSQUERY_LIBS <nl> + gflags <nl> + glog <nl> + gtest <nl> + <nl> + bz2 <nl> + readline <nl> + rocksdb <nl> + snappy <nl> + z <nl> + <nl> + boost_system <nl> + boost_filesystem <nl> + boost_program_options <nl> + <nl> + # For SQLite pthread , dl <nl> + pthread <nl> + dl <nl> + ) <nl> + <nl> + # Handle naming differences in MT threading <nl> + if ( APPLE ) <nl> + list ( APPEND OSQUERY_LIBS " boost_thread - mt " ) <nl> + else ( ) <nl> + list ( APPEND OSQUERY_LIBS " boost_thread " ) <nl> + endif ( ) <nl> + <nl> + # Fill this in with objects for libosquery <nl> + set ( OSQUERY_LIB_ADDITIONAL_OBJECTS " " ) <nl> + set ( OSQUERY_ADDITIONAL_LINKS " " ) <nl> + <nl> + MACRO ( ADD_OSQUERY_LIB TARGET ) <nl> + list ( APPEND OSQUERY_LIB_ADDITIONAL_OBJECTS $ { TARGET } ) <nl> + set ( OSQUERY_LIB_ADDITIONAL_OBJECTS $ { OSQUERY_LIB_ADDITIONAL_OBJECTS } <nl> + PARENT_SCOPE ) <nl> + ENDMACRO ( ADD_OSQUERY_LIB ) <nl> + <nl> + MACRO ( ADD_OSQUERY_LINK LINK ) <nl> + list ( APPEND OSQUERY_ADDITIONAL_LINKS $ { LINK } ) <nl> + set ( OSQUERY_ADDITIONAL_LINKS $ { OSQUERY_ADDITIONAL_LINKS } <nl> + PARENT_SCOPE ) <nl> + ENDMACRO ( ADD_OSQUERY_LINK ) <nl> + <nl> + MACRO ( SET_OSQUERY_COMPILE TARGET ) <nl> + SET_TARGET_PROPERTIES ( $ { TARGET } PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> + SET ( OPTIONAL_FLAGS $ { ARGN } ) <nl> + LIST ( LENGTH OPTIONAL_FLAGS NUM_OPTIONAL_FLAGS ) <nl> + if ( $ { NUM_OPTIONAL_FLAGS } GREATER 0 ) <nl> + MESSAGE ( " Notice : Adding compile flags $ { OPTIONAL_FLAGS } to $ { TARGET } " ) <nl> + SET_TARGET_PROPERTIES ( $ { TARGET } PROPERTIES COMPILE_FLAGS $ { OPTIONAL_FLAGS } ) <nl> + ENDIF ( ) <nl> + ENDMACRO ( SET_OSQUERY_COMPILE ) <nl> + <nl> + MACRO ( ADD_OSQUERY_TEST TEST_NAME SOURCE LINK ) <nl> + ADD_EXECUTABLE ( $ { TEST_NAME } $ { SOURCE } ) <nl> + TARGET_LINK_LIBRARIES ( $ { TEST_NAME } $ { LINK } ) <nl> + TARGET_LINK_LIBRARIES ( $ { TEST_NAME } $ { OSQUERY_ADDITIONAL_LINKS } ) <nl> + TARGET_LINK_LIBRARIES ( $ { TEST_NAME } $ { OSQUERY_LIBS } ) <nl> + SET ( OPTIONAL_FLAGS $ { ARGN } ) <nl> + SET_OSQUERY_COMPILE ( $ { TEST_NAME } $ { OPTIONAL_FLAGS } ) <nl> + ADD_TEST ( $ { TEST_NAME } $ { TEST_NAME } ) <nl> + ENDMACRO ( ADD_OSQUERY_TEST ) <nl> + <nl> + MACRO ( ADD_OSQUERY_EXECUTABLE NAME SOURCE ) <nl> + ADD_OSQUERY_TEST ( $ { NAME } $ { SOURCE } ) <nl> + TARGET_LINK_LIBRARIES ( $ { NAME } osquery_shared ) <nl> + ENDMACRO ( ADD_OSQUERY_EXECUTABLE ) <nl> + <nl> + MACRO ( TARGET_OSQUERY_LINK_WHOLE TARGET OSQUERY_LIB ) <nl> + TARGET_LINK_LIBRARIES ( $ { TARGET } " $ { OS_WHOLELINK_PRE } " ) <nl> + TARGET_LINK_LIBRARIES ( $ { TARGET } $ { OSQUERY_LIB } ) <nl> + TARGET_LINK_LIBRARIES ( $ { TARGET } " $ { OS_WHOLELINK_POST } " ) <nl> + ENDMACRO ( TARGET_OSQUERY_LINK_WHOLE ) <nl> + <nl> ADD_SUBDIRECTORY ( config ) <nl> ADD_SUBDIRECTORY ( core ) <nl> ADD_SUBDIRECTORY ( database ) <nl> ADD_SUBDIRECTORY ( devtools ) <nl> ADD_SUBDIRECTORY ( examples ) <nl> ADD_SUBDIRECTORY ( filesystem ) <nl> ADD_SUBDIRECTORY ( logger ) <nl> + ADD_SUBDIRECTORY ( registry ) <nl> ADD_SUBDIRECTORY ( scheduler ) <nl> ADD_SUBDIRECTORY ( tables ) <nl> <nl> - SET ( OSQUERY_LIBS <nl> - gflags <nl> - glog <nl> - osquery_config <nl> - osquery_core <nl> - osquery_database <nl> - osquery_devtools <nl> - osquery_filesystem <nl> - osquery_logger <nl> - osquery_scheduler <nl> - osquery_sqlite <nl> - osquery_tables <nl> + SET ( OSQUERY_LIB_OBJECTS <nl> + $ < TARGET_OBJECTS : osquery_config > <nl> + $ < TARGET_OBJECTS : osquery_core > <nl> + $ < TARGET_OBJECTS : osquery_database > <nl> + $ < TARGET_OBJECTS : osquery_devtools > <nl> + <nl> + $ < TARGET_OBJECTS : osquery_filesystem > <nl> + $ < TARGET_OBJECTS : osquery_logger > <nl> + $ < TARGET_OBJECTS : osquery_registry > <nl> + $ < TARGET_OBJECTS : osquery_scheduler > <nl> + <nl> + # Optional " core " tables objects <nl> + $ < TARGET_OBJECTS : osquery_tables > <nl> + <nl> + # Third - party objects <nl> + $ < TARGET_OBJECTS : osquery_sqlite > <nl> + <nl> + # Build additional os - dependent libraries ( may include tables ) <nl> + $ { OSQUERY_LIB_ADDITIONAL_OBJECTS } <nl> ) <nl> <nl> - ADD_LIBRARY ( osquery_static main / lib . cpp ) <nl> - TARGET_LINK_LIBRARIES ( osquery_static $ { OSQUERY_LIBS } ) <nl> - SET_TARGET_PROPERTIES ( osquery_static PROPERTIES OUTPUT_NAME osquery ) <nl> + if ( BUILD_SHARED ) <nl> + ADD_LIBRARY ( osquery_shared SHARED main / lib . cpp $ { OSQUERY_LIB_OBJECTS } ) <nl> + else ( ) <nl> + ADD_LIBRARY ( osquery_static STATIC $ { OSQUERY_LIB_OBJECTS } ) <nl> + SET_TARGET_PROPERTIES ( osquery_static PROPERTIES OUTPUT_NAME osquery_static ) <nl> + <nl> + ADD_LIBRARY ( osquery_shared STATIC main / lib . cpp ) <nl> + TARGET_OSQUERY_LINK_WHOLE ( osquery_shared osquery_static ) <nl> + endif ( ) <nl> + ADD_DEPENDENCIES ( osquery_shared librocksdb ) <nl> + TARGET_LINK_LIBRARIES ( osquery_shared $ { OSQUERY_ADDITIONAL_LINKS } ) <nl> + TARGET_LINK_LIBRARIES ( osquery_shared $ { OSQUERY_LIBS } ) <nl> + SET_TARGET_PROPERTIES ( osquery_shared PROPERTIES OUTPUT_NAME osquery ) <nl> <nl> ADD_EXECUTABLE ( shell main / shell . cpp ) <nl> - TARGET_LINK_LIBRARIES ( shell osquery_static ) <nl> + TARGET_LINK_LIBRARIES ( shell osquery_shared ) <nl> SET_TARGET_PROPERTIES ( shell PROPERTIES OUTPUT_NAME osqueryi ) <nl> SET_TARGET_PROPERTIES ( shell PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> INSTALL ( TARGETS shell DESTINATION bin ) <nl> <nl> ADD_EXECUTABLE ( daemon main / daemon . cpp ) <nl> - TARGET_LINK_LIBRARIES ( daemon osquery_static ) <nl> + TARGET_LINK_LIBRARIES ( daemon osquery_shared ) <nl> SET_TARGET_PROPERTIES ( daemon PROPERTIES OUTPUT_NAME osqueryd ) <nl> SET_TARGET_PROPERTIES ( daemon PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> INSTALL ( TARGETS daemon DESTINATION bin ) <nl> mmm a / osquery / config / CMakeLists . txt <nl> ppp b / osquery / config / CMakeLists . txt <nl> <nl> - ADD_LIBRARY ( osquery_config <nl> + ADD_LIBRARY ( osquery_config OBJECT <nl> config . cpp <nl> plugins / filesystem . cpp <nl> ) <nl> - TARGET_LINK_LIBRARIES ( osquery_config boost_filesystem ) <nl> - TARGET_LINK_LIBRARIES ( osquery_config boost_system ) <nl> - if ( APPLE ) <nl> - TARGET_LINK_LIBRARIES ( osquery_config boost_thread - mt ) <nl> - TARGET_LINK_LIBRARIES ( osquery_config " - Wl , - all_load " ) <nl> - else ( ) <nl> - TARGET_LINK_LIBRARIES ( osquery_config boost_thread ) <nl> - endif ( ) <nl> - TARGET_LINK_LIBRARIES ( osquery_config gflags ) <nl> - TARGET_LINK_LIBRARIES ( osquery_config glog ) <nl> - SET_TARGET_PROPERTIES ( osquery_config PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> <nl> - ADD_EXECUTABLE ( config_tests config_tests . cpp ) <nl> - TARGET_LINK_LIBRARIES ( config_tests gtest ) <nl> - TARGET_LINK_LIBRARIES ( config_tests osquery_config ) <nl> - TARGET_LINK_LIBRARIES ( config_tests osquery_core ) <nl> - TARGET_LINK_LIBRARIES ( config_tests osquery_sqlite ) <nl> - SET_TARGET_PROPERTIES ( config_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( config_tests config_tests ) <nl> + SET_OSQUERY_COMPILE ( osquery_config ) <nl> + <nl> + ADD_LIBRARY ( osquery_testing_config <nl> + $ < TARGET_OBJECTS : osquery_core > <nl> + $ < TARGET_OBJECTS : osquery_sqlite > <nl> + $ < TARGET_OBJECTS : osquery_registry > <nl> + $ < TARGET_OBJECTS : osquery_config > <nl> + ) <nl> + <nl> + ADD_OSQUERY_TEST ( config_tests config_tests . cpp <nl> + osquery_testing_config ) <nl> mmm a / osquery / core / CMakeLists . txt <nl> ppp b / osquery / core / CMakeLists . txt <nl> else ( ) <nl> set ( OS_CORE_SOURCE " " ) <nl> endif ( ) <nl> <nl> - ADD_LIBRARY ( osquery_core <nl> + ADD_LIBRARY ( osquery_core OBJECT <nl> init_osquery . cpp <nl> sqlite_util . cpp <nl> system . cpp <nl> ADD_LIBRARY ( osquery_core <nl> text . cpp <nl> ) <nl> <nl> - TARGET_LINK_LIBRARIES ( osquery_core gflags ) <nl> - TARGET_LINK_LIBRARIES ( osquery_core glog ) <nl> - TARGET_LINK_LIBRARIES ( osquery_core gtest ) <nl> - TARGET_LINK_LIBRARIES ( osquery_core osquery_database ) <nl> - TARGET_LINK_LIBRARIES ( osquery_core osquery_filesystem ) <nl> - TARGET_LINK_LIBRARIES ( osquery_core osquery_sqlite ) <nl> - TARGET_LINK_LIBRARIES ( osquery_core osquery_tables ) <nl> - SET_TARGET_PROPERTIES ( osquery_core PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> + SET_OSQUERY_COMPILE ( osquery_core ) <nl> <nl> - ADD_EXECUTABLE ( status_tests status_tests . cpp ) <nl> - TARGET_LINK_LIBRARIES ( status_tests gtest ) <nl> - SET_TARGET_PROPERTIES ( status_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( status_tests status_tests ) <nl> + ADD_OSQUERY_TEST ( status_test status_tests . cpp " " ) <nl> <nl> - ADD_EXECUTABLE ( sqlite_util_tests sqlite_util_tests . cpp ) <nl> - TARGET_LINK_LIBRARIES ( sqlite_util_tests gtest ) <nl> - TARGET_LINK_LIBRARIES ( sqlite_util_tests osquery_core ) <nl> - TARGET_LINK_LIBRARIES ( sqlite_util_tests osquery_database ) <nl> - TARGET_LINK_LIBRARIES ( sqlite_util_tests osquery_sqlite ) <nl> - SET_TARGET_PROPERTIES ( sqlite_util_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( sqlite_util_tests sqlite_util_tests ) <nl> + ADD_LIBRARY ( osquery_testing_core <nl> + $ < TARGET_OBJECTS : osquery_core > <nl> + $ < TARGET_OBJECTS : osquery_database > <nl> + $ < TARGET_OBJECTS : osquery_sqlite > <nl> + $ < TARGET_OBJECTS : osquery_registry > <nl> + ) <nl> + <nl> + ADD_OSQUERY_TEST ( sqlite_util_tests sqlite_util_tests . cpp <nl> + osquery_testing_core ) <nl> <nl> - ADD_EXECUTABLE ( test_util_tests test_util_tests . cpp ) <nl> - TARGET_LINK_LIBRARIES ( test_util_tests gtest ) <nl> - TARGET_LINK_LIBRARIES ( test_util_tests glog ) <nl> - TARGET_LINK_LIBRARIES ( test_util_tests osquery_core ) <nl> - TARGET_LINK_LIBRARIES ( test_util_tests osquery_sqlite ) <nl> - SET_TARGET_PROPERTIES ( test_util_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( test_util_tests test_util_tests ) <nl> + ADD_OSQUERY_TEST ( test_util_tests test_util_tests . cpp <nl> + osquery_testing_core ) <nl> <nl> - ADD_EXECUTABLE ( text_tests text_tests . cpp ) <nl> - TARGET_LINK_LIBRARIES ( text_tests gtest ) <nl> - TARGET_LINK_LIBRARIES ( text_tests glog ) <nl> - TARGET_LINK_LIBRARIES ( text_tests osquery_core ) <nl> - SET_TARGET_PROPERTIES ( text_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( text_tests text_tests ) <nl> + ADD_OSQUERY_TEST ( text_tests text_tests . cpp <nl> + osquery_testing_core ) <nl> mmm a / osquery / core / sqlite_util . cpp <nl> ppp b / osquery / core / sqlite_util . cpp <nl> <nl> <nl> # include " osquery / database . h " <nl> # include " osquery / tables / base . h " <nl> - # include " osquery / tables / registry . h " <nl> + # include " osquery / registry / registry . h " <nl> <nl> using namespace osquery : : db ; <nl> using namespace osquery : : tables ; <nl> mmm a / osquery / database / CMakeLists . txt <nl> ppp b / osquery / database / CMakeLists . txt <nl> <nl> - ADD_LIBRARY ( osquery_database <nl> + ADD_LIBRARY ( osquery_database OBJECT <nl> db_handle . cpp <nl> query . cpp <nl> results . cpp <nl> ) <nl> - ADD_DEPENDENCIES ( osquery_database librocksdb ) <nl> - TARGET_LINK_LIBRARIES ( osquery_database boost_system ) <nl> - if ( APPLE ) <nl> - TARGET_LINK_LIBRARIES ( osquery_database boost_thread - mt ) <nl> - else ( ) <nl> - TARGET_LINK_LIBRARIES ( osquery_database boost_thread ) <nl> - endif ( ) <nl> - TARGET_LINK_LIBRARIES ( osquery_database bz2 ) <nl> - TARGET_LINK_LIBRARIES ( osquery_database glog ) <nl> - TARGET_LINK_LIBRARIES ( osquery_database gtest ) <nl> - TARGET_LINK_LIBRARIES ( osquery_database rocksdb ) <nl> - TARGET_LINK_LIBRARIES ( osquery_database snappy ) <nl> - TARGET_LINK_LIBRARIES ( osquery_database z ) <nl> - TARGET_LINK_LIBRARIES ( osquery_database osquery_config ) <nl> - SET_TARGET_PROPERTIES ( osquery_database PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> <nl> - ADD_EXECUTABLE ( query_tests query_tests . cpp ) <nl> - ADD_DEPENDENCIES ( query_tests librocksdb ) <nl> - TARGET_LINK_LIBRARIES ( query_tests gtest ) <nl> - TARGET_LINK_LIBRARIES ( query_tests osquery_core ) <nl> - TARGET_LINK_LIBRARIES ( query_tests osquery_database ) <nl> - SET_TARGET_PROPERTIES ( query_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( query_tests query_tests ) <nl> + SET_OSQUERY_COMPILE ( osquery_database ) <nl> <nl> - ADD_EXECUTABLE ( db_handle_tests db_handle_tests . cpp ) <nl> - ADD_DEPENDENCIES ( db_handle_tests librocksdb ) <nl> - TARGET_LINK_LIBRARIES ( db_handle_tests gtest ) <nl> - TARGET_LINK_LIBRARIES ( db_handle_tests osquery_database ) <nl> - SET_TARGET_PROPERTIES ( db_handle_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( db_handle_tests db_handle_tests ) <nl> + ADD_LIBRARY ( osquery_testing_database <nl> + $ < TARGET_OBJECTS : osquery_core > <nl> + $ < TARGET_OBJECTS : osquery_database > <nl> + $ < TARGET_OBJECTS : osquery_sqlite > <nl> + $ < TARGET_OBJECTS : osquery_registry > <nl> + ) <nl> + <nl> + ADD_OSQUERY_TEST ( query_tests query_tests . cpp <nl> + osquery_testing_database ) <nl> + <nl> + ADD_OSQUERY_TEST ( db_handle_tests db_handle_tests . cpp <nl> + osquery_testing_database ) <nl> <nl> - ADD_EXECUTABLE ( results_tests results_tests ) <nl> - ADD_DEPENDENCIES ( results_tests librocksdb ) <nl> - TARGET_LINK_LIBRARIES ( results_tests gtest ) <nl> - TARGET_LINK_LIBRARIES ( results_tests osquery_core ) <nl> - TARGET_LINK_LIBRARIES ( results_tests osquery_database ) <nl> - SET_TARGET_PROPERTIES ( results_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( results_tests results_tests ) <nl> + ADD_OSQUERY_TEST ( results_tests results_tests . cpp <nl> + osquery_testing_database ) <nl> mmm a / osquery / devtools / CMakeLists . txt <nl> ppp b / osquery / devtools / CMakeLists . txt <nl> <nl> - ADD_LIBRARY ( osquery_devtools shell . cpp ) <nl> - TARGET_LINK_LIBRARIES ( osquery_devtools glog ) <nl> - TARGET_LINK_LIBRARIES ( osquery_devtools readline ) <nl> - TARGET_LINK_LIBRARIES ( osquery_devtools osquery_sqlite ) <nl> - TARGET_LINK_LIBRARIES ( osquery_devtools osquery_tables ) <nl> - SET_TARGET_PROPERTIES ( osquery_devtools PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> + ADD_LIBRARY ( osquery_devtools OBJECT <nl> + shell . cpp <nl> + ) <nl> + <nl> + SET_OSQUERY_COMPILE ( osquery_devtools ) <nl> mmm a / osquery / devtools / shell . cpp <nl> ppp b / osquery / devtools / shell . cpp <nl> <nl> # define pclose _pclose <nl> # else <nl> <nl> - # include " osquery / tables / registry . h " <nl> + # include " osquery / registry / registry . h " <nl> <nl> / * Make sure isatty ( ) has a prototype . <nl> * / <nl> mmm a / osquery / examples / CMakeLists . txt <nl> ppp b / osquery / examples / CMakeLists . txt <nl> @ @ - 1 , 4 + 1 @ @ <nl> - ADD_EXECUTABLE ( example_test example_test . cpp ) <nl> - TARGET_LINK_LIBRARIES ( example_test gtest ) <nl> - SET_TARGET_PROPERTIES ( example_test PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( example_test example_test ) <nl> + ADD_OSQUERY_TEST ( example_test example_test . cpp " " ) <nl> mmm a / osquery / filesystem / CMakeLists . txt <nl> ppp b / osquery / filesystem / CMakeLists . txt <nl> <nl> - ADD_LIBRARY ( osquery_filesystem <nl> - filesystem . cpp <nl> - ) <nl> + set ( OSQUERY_FILESYSTEM_TARGETS " " ) <nl> <nl> if ( APPLE ) <nl> - ADD_LIBRARY ( osquery_filesystem_objc <nl> + ADD_LIBRARY ( osquery_filesystem_objc OBJECT <nl> darwin / plist . mm <nl> ) <nl> - TARGET_LINK_LIBRARIES ( osquery_filesystem_objc " - framework Foundation " ) <nl> - SET_TARGET_PROPERTIES ( osquery_filesystem_objc PROPERTIES COMPILE_FLAGS " - x objective - c + + - fobjc - arc " ) <nl> + <nl> + ADD_OSQUERY_LINK ( " - framework Foundation " ) <nl> + SET_OSQUERY_COMPILE ( osquery_filesystem_objc " - x objective - c + + - fobjc - arc " ) <nl> + <nl> + list ( APPEND OSQUERY_FILESYSTEM_TARGETS $ < TARGET_OBJECTS : osquery_filesystem_objc > ) <nl> endif ( ) <nl> <nl> - TARGET_LINK_LIBRARIES ( osquery_filesystem boost_filesystem ) <nl> - TARGET_LINK_LIBRARIES ( osquery_filesystem boost_system ) <nl> - TARGET_LINK_LIBRARIES ( osquery_filesystem boost_program_options ) <nl> - if ( APPLE ) <nl> - TARGET_LINK_LIBRARIES ( osquery_filesystem boost_thread - mt ) <nl> - else ( ) <nl> - TARGET_LINK_LIBRARIES ( osquery_filesystem boost_thread ) <nl> - endif ( ) <nl> - TARGET_LINK_LIBRARIES ( osquery_filesystem gflags ) <nl> - TARGET_LINK_LIBRARIES ( osquery_filesystem glog ) <nl> - if ( APPLE ) <nl> - TARGET_LINK_LIBRARIES ( osquery_filesystem osquery_filesystem_objc ) <nl> - endif ( ) <nl> - SET_TARGET_PROPERTIES ( osquery_filesystem PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> + # Additional targets for OS - specific filesystem capabilities <nl> + ADD_OSQUERY_LIB ( " $ { OSQUERY_FILESYSTEM_TARGETS } " ) <nl> <nl> - ADD_EXECUTABLE ( filesystem_tests filesystem_tests . cpp ) <nl> - TARGET_LINK_LIBRARIES ( filesystem_tests gtest ) <nl> - TARGET_LINK_LIBRARIES ( filesystem_tests osquery_filesystem ) <nl> - SET_TARGET_PROPERTIES ( filesystem_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( filesystem_tests filesystem_tests ) <nl> + ADD_LIBRARY ( osquery_filesystem OBJECT <nl> + filesystem . cpp <nl> + ) <nl> + <nl> + SET_OSQUERY_COMPILE ( osquery_filesystem ) <nl> + <nl> + ADD_LIBRARY ( osquery_testing_filesystem <nl> + $ < TARGET_OBJECTS : osquery_core > <nl> + $ < TARGET_OBJECTS : osquery_filesystem > <nl> + $ { OSQUERY_FILESYSTEM_TARGETS } <nl> + ) <nl> + <nl> + ADD_OSQUERY_TEST ( filesystem_tests filesystem_tests . cpp <nl> + osquery_testing_filesystem ) <nl> <nl> if ( APPLE ) <nl> - ADD_EXECUTABLE ( plist_tests darwin / plist_tests . cpp ) <nl> - TARGET_LINK_LIBRARIES ( plist_tests glog ) <nl> - TARGET_LINK_LIBRARIES ( plist_tests gtest ) <nl> - TARGET_LINK_LIBRARIES ( plist_tests osquery_core ) <nl> - TARGET_LINK_LIBRARIES ( plist_tests osquery_filesystem ) <nl> - TARGET_LINK_LIBRARIES ( plist_tests osquery_filesystem_objc ) <nl> - SET_TARGET_PROPERTIES ( plist_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( plist_tests plist_tests ) <nl> - <nl> - ADD_EXECUTABLE ( plist_benchmark darwin / plist_benchmark . cpp ) <nl> - TARGET_LINK_LIBRARIES ( plist_benchmark glog ) <nl> - TARGET_LINK_LIBRARIES ( plist_benchmark gtest ) <nl> - TARGET_LINK_LIBRARIES ( plist_benchmark osquery_core ) <nl> - TARGET_LINK_LIBRARIES ( plist_benchmark osquery_filesystem ) <nl> - TARGET_LINK_LIBRARIES ( plist_benchmark osquery_filesystem_objc ) <nl> - SET_TARGET_PROPERTIES ( plist_benchmark PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> + ADD_OSQUERY_TEST ( plist_tests darwin / plist_tests . cpp <nl> + osquery_testing_filesystem ) <nl> + <nl> + ADD_OSQUERY_TEST ( plist_benchmark darwin / plist_benchmark . cpp <nl> + osquery_testing_filesystem ) <nl> endif ( ) <nl> mmm a / osquery / logger / CMakeLists . txt <nl> ppp b / osquery / logger / CMakeLists . txt <nl> <nl> - ADD_LIBRARY ( osquery_logger <nl> + ADD_LIBRARY ( osquery_logger OBJECT <nl> logger . cpp <nl> plugins / filesystem . cpp <nl> ) <nl> - TARGET_LINK_LIBRARIES ( osquery_logger osquery_database ) <nl> - if ( APPLE ) <nl> - TARGET_LINK_LIBRARIES ( osquery_logger " - Wl , - all_load " ) <nl> - endif ( ) <nl> - SET_TARGET_PROPERTIES ( osquery_logger PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> <nl> - ADD_EXECUTABLE ( logger_tests logger_tests . cpp ) <nl> - TARGET_LINK_LIBRARIES ( logger_tests gtest ) <nl> - TARGET_LINK_LIBRARIES ( logger_tests osquery_core ) <nl> - TARGET_LINK_LIBRARIES ( logger_tests osquery_logger ) <nl> - SET_TARGET_PROPERTIES ( logger_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( logger_tests logger_tests ) <nl> + SET_OSQUERY_COMPILE ( osquery_logger ) <nl> + <nl> + ADD_LIBRARY ( osquery_testing_logger <nl> + $ < TARGET_OBJECTS : osquery_core > <nl> + $ < TARGET_OBJECTS : osquery_database > <nl> + $ < TARGET_OBJECTS : osquery_logger > <nl> + ) <nl> + <nl> + ADD_OSQUERY_TEST ( logger_tests logger_tests . cpp <nl> + osquery_testing_logger ) <nl> new file mode 100644 <nl> index 0000000000 . . d10ee9360f <nl> mmm / dev / null <nl> ppp b / osquery / registry / CMakeLists . txt <nl> <nl> + ADD_LIBRARY ( osquery_registry OBJECT <nl> + registry . cpp <nl> + ) <nl> + <nl> + SET_OSQUERY_COMPILE ( osquery_registry ) <nl> similarity index 61 % <nl> rename from osquery / tables / registry . cpp <nl> rename to osquery / registry / registry . cpp <nl> mmm a / osquery / tables / registry . cpp <nl> ppp b / osquery / registry / registry . cpp <nl> <nl> / / Copyright 2004 - present Facebook . All Rights Reserved . <nl> <nl> - # include " osquery / tables / registry . h " <nl> + # include " osquery / registry / registry . h " <nl> <nl> # include < glog / logging . h > <nl> <nl> - # include " osquery / tables / manual / filesystem . h " <nl> - # include " osquery / tables / manual / hash . h " <nl> + / / # include " osquery / tables / manual / filesystem . h " <nl> + / / # include " osquery / tables / manual / hash . h " <nl> <nl> namespace osquery { <nl> namespace tables { <nl> <nl> - sqlite3_filesystem * fs_table ; <nl> - sqlite3_hash * hash_table ; <nl> + / / sqlite3_filesystem * fs_table ; <nl> + / / sqlite3_hash * hash_table ; <nl> <nl> void attachVirtualTables ( sqlite3 * db ) { <nl> - sqlite3_filesystem_create ( db , " fs " , & fs_table ) ; <nl> - sqlite3_hash_create ( db , " hash " , & hash_table ) ; <nl> + / / sqlite3_filesystem_create ( db , " fs " , & fs_table ) ; <nl> + / / sqlite3_hash_create ( db , " hash " , & hash_table ) ; <nl> for ( const auto & table : REGISTERED_TABLES ) { <nl> VLOG ( 1 ) < < " Attaching virtual table : " < < table . first ; <nl> int s = table . second - > attachVtable ( db ) ; <nl> similarity index 100 % <nl> rename from osquery / tables / registry . h <nl> rename to osquery / registry / registry . h <nl> mmm a / osquery / scheduler / CMakeLists . txt <nl> ppp b / osquery / scheduler / CMakeLists . txt <nl> <nl> - ADD_LIBRARY ( osquery_scheduler <nl> + ADD_LIBRARY ( osquery_scheduler OBJECT <nl> scheduler . cpp <nl> ) <nl> - TARGET_LINK_LIBRARIES ( osquery_scheduler glog ) <nl> - TARGET_LINK_LIBRARIES ( osquery_scheduler osquery_config ) <nl> - TARGET_LINK_LIBRARIES ( osquery_scheduler osquery_core ) <nl> - TARGET_LINK_LIBRARIES ( osquery_scheduler osquery_database ) <nl> - TARGET_LINK_LIBRARIES ( osquery_scheduler osquery_logger ) <nl> - SET_TARGET_PROPERTIES ( osquery_scheduler PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> + <nl> + SET_OSQUERY_COMPILE ( osquery_scheduler ) <nl> mmm a / osquery / tables / CMakeLists . txt <nl> ppp b / osquery / tables / CMakeLists . txt <nl> <nl> + SET ( OSQUERY_CORE_TABLE_TARGETS " " ) <nl> + <nl> if ( APPLE ) <nl> - ADD_LIBRARY ( osquery_tables_objc <nl> + ADD_LIBRARY ( osquery_tables_objc OBJECT <nl> . . / core / darwin / NSProcessInfo + PECocoaBackports . mm <nl> system / darwin / osx_version . mm <nl> ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables_objc " - framework Foundation " ) <nl> - SET_TARGET_PROPERTIES ( osquery_tables_objc PROPERTIES COMPILE_FLAGS " - x objective - c + + - fobjc - arc " ) <nl> <nl> - ADD_LIBRARY ( osquery_tables_darwin <nl> + ADD_OSQUERY_LINK ( " - framework Foundation " ) <nl> + SET_OSQUERY_COMPILE ( osquery_tables_objc " - x objective - c + + - fobjc - arc " ) <nl> + <nl> + list ( APPEND OSQUERY_CORE_TABLE_TARGETS $ < TARGET_OBJECTS : osquery_tables_objc > ) <nl> + <nl> + ADD_LIBRARY ( osquery_tables_darwin OBJECT <nl> networking / interfaces . cpp <nl> networking / listening_ports . cpp <nl> networking / routes . cpp <nl> if ( APPLE ) <nl> system / processes . cpp <nl> system / last . cpp <nl> ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables_darwin boost_filesystem ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables_darwin osquery_database ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables_darwin osquery_filesystem ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables_darwin " - framework IOKit - framework CoreFoundation - framework Security " ) <nl> - SET_TARGET_PROPERTIES ( osquery_tables_darwin PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> + <nl> + ADD_OSQUERY_LINK ( " - framework IOKit " ) <nl> + ADD_OSQUERY_LINK ( " - framework CoreFoundation " ) <nl> + ADD_OSQUERY_LINK ( " - framework Security " ) <nl> + SET_OSQUERY_COMPILE ( osquery_tables_darwin ) <nl> + <nl> + LIST ( APPEND OSQUERY_CORE_TABLE_TARGETS $ < TARGET_OBJECTS : osquery_tables_darwin > ) <nl> else ( ) <nl> - ADD_LIBRARY ( osquery_tables_linux <nl> + ADD_LIBRARY ( osquery_tables_linux OBJECT <nl> system / linux / kernel_modules . cpp <nl> ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables_linux boost_filesystem ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables_linux osquery_database ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables_linux osquery_filesystem ) <nl> - SET_TARGET_PROPERTIES ( osquery_tables_linux PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> + <nl> + SET_OSQUERY_COMPILE ( osquery_tables_linux ) <nl> + <nl> + LIST ( APPEND OSQUERY_CORE_TABLE_TARGETS $ < TARGET_OBJECTS : osquery_tables_linux > ) <nl> endif ( ) <nl> <nl> + # Add the targets from above to libosquery ( may change with plugins ) <nl> + ADD_OSQUERY_LIB ( " $ { OSQUERY_CORE_TABLE_TARGETS } " ) <nl> + <nl> FILE ( GLOB table_sources <nl> " generated / * . cpp " <nl> " manual / * . cpp " <nl> ) <nl> <nl> - ADD_LIBRARY ( osquery_tables <nl> - registry . cpp <nl> + ADD_LIBRARY ( osquery_tables OBJECT <nl> $ { table_sources } <nl> networking / etc_hosts . cpp <nl> utility / time . cpp <nl> ) <nl> <nl> - TARGET_LINK_LIBRARIES ( osquery_tables glog ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables osquery_core ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables osquery_database ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables osquery_filesystem ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables osquery_sqlite ) <nl> - if ( APPLE ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables osquery_tables_objc ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables osquery_tables_darwin ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables " - Wl , - all_load " ) <nl> - else ( ) <nl> - TARGET_LINK_LIBRARIES ( osquery_tables osquery_tables_linux ) <nl> - endif ( ) <nl> - SET_TARGET_PROPERTIES ( osquery_tables PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> + SET_OSQUERY_COMPILE ( osquery_tables ) <nl> + <nl> + ADD_LIBRARY ( osquery_tables_testing <nl> + $ < TARGET_OBJECTS : osquery_core > <nl> + $ < TARGET_OBJECTS : osquery_sqlite > <nl> + $ < TARGET_OBJECTS : osquery_registry > <nl> + $ < TARGET_OBJECTS : osquery_filesystem > <nl> + $ < TARGET_OBJECTS : osquery_tables > <nl> + $ { OSQUERY_CORE_TABLE_TARGETS } <nl> + $ { OSQUERY_LIB_ADDITIONAL_OBJECTS } <nl> + ) <nl> <nl> - ADD_EXECUTABLE ( etc_hosts_tests networking / etc_hosts_tests . cpp ) <nl> - TARGET_LINK_LIBRARIES ( etc_hosts_tests gtest ) <nl> - TARGET_LINK_LIBRARIES ( etc_hosts_tests osquery_tables ) <nl> - SET_TARGET_PROPERTIES ( etc_hosts_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( etc_hosts_tests etc_hosts_tests ) <nl> + ADD_OSQUERY_TEST ( etc_hosts_tests networking / etc_hosts_tests . cpp <nl> + osquery_tables_testing ) <nl> <nl> if ( APPLE ) <nl> - ADD_EXECUTABLE ( apps_tests system / darwin / apps_tests . cpp ) <nl> - TARGET_LINK_LIBRARIES ( apps_tests gtest ) <nl> - TARGET_LINK_LIBRARIES ( apps_tests osquery_tables ) <nl> - SET_TARGET_PROPERTIES ( apps_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( apps_tests apps_tests ) <nl> - <nl> - ADD_EXECUTABLE ( ca_certs_tests system / darwin / ca_certs_tests . cpp ) <nl> - TARGET_LINK_LIBRARIES ( ca_certs_tests gtest ) <nl> - TARGET_LINK_LIBRARIES ( ca_certs_tests osquery_tables ) <nl> - SET_TARGET_PROPERTIES ( ca_certs_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( ca_certs_tests ca_certs_tests ) <nl> - <nl> - ADD_EXECUTABLE ( firewall_tests system / darwin / firewall_tests . cpp ) <nl> - TARGET_LINK_LIBRARIES ( firewall_tests gtest ) <nl> - TARGET_LINK_LIBRARIES ( firewall_tests osquery_tables ) <nl> - SET_TARGET_PROPERTIES ( firewall_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( firewall_tests firewall_tests ) <nl> - <nl> - ADD_EXECUTABLE ( launchd_tests system / darwin / launchd_tests . cpp ) <nl> - TARGET_LINK_LIBRARIES ( launchd_tests gtest ) <nl> - TARGET_LINK_LIBRARIES ( launchd_tests osquery_tables ) <nl> - SET_TARGET_PROPERTIES ( launchd_tests PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( launchd_tests launchd_tests ) <nl> + ADD_OSQUERY_TEST ( apps_tests system / darwin / apps_tests . cpp <nl> + osquery_tables_testing ) <nl> + <nl> + ADD_OSQUERY_TEST ( ca_certs_tests system / darwin / ca_certs_tests . cpp <nl> + osquery_tables_testing ) <nl> + <nl> + ADD_OSQUERY_TEST ( firewall_tests system / darwin / firewall_tests . cpp <nl> + osquery_tables_testing ) <nl> + <nl> + ADD_OSQUERY_TEST ( launchd_tests system / darwin / launchd_tests . cpp <nl> + osquery_tables_testing ) <nl> endif ( ) <nl> mmm a / third - party <nl> ppp b / third - party <nl> @ @ - 1 + 1 @ @ <nl> - Subproject commit 4dac47d96d914d50754cc15765ac1034b4dd0710 <nl> + Subproject commit 414ab7df32981f1455b43837a224aa8cc6da8e56 <nl> mmm a / tools / CMakeLists . txt <nl> ppp b / tools / CMakeLists . txt <nl> <nl> ADD_EXECUTABLE ( flag_test flag_test . cpp ) <nl> TARGET_LINK_LIBRARIES ( flag_test gflags glog ) <nl> SET_TARGET_PROPERTIES ( flag_test PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> - ADD_TEST ( flag_test flag_test - - config_retriever = " foo " - - config_path = " bar " - - log_receiver = " baz " - - log_path = " boo " ) <nl> + ADD_TEST ( flag_test flag_test <nl> + - - config_retriever = " foo " <nl> + - - config_path = " bar " <nl> + - - log_receiver = " baz " <nl> + - - log_path = " boo " ) <nl> + <nl> <nl> ADD_EXECUTABLE ( registry_test registry_test . cpp ) <nl> - TARGET_LINK_LIBRARIES ( registry_test osquery_static ) <nl> + TARGET_LINK_LIBRARIES ( registry_test osquery_shared ) <nl> SET_TARGET_PROPERTIES ( registry_test PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> ADD_TEST ( registry_test registry_test ) <nl> <nl> ADD_EXECUTABLE ( run run . cpp ) <nl> - TARGET_LINK_LIBRARIES ( run osquery_static ) <nl> + TARGET_LINK_LIBRARIES ( run osquery_shared ) <nl> SET_TARGET_PROPERTIES ( run PROPERTIES COMPILE_FLAGS $ { OS_COMPILE_FLAGS } ) <nl> <nl> mmm a / tools / gentable . py <nl> ppp b / tools / gentable . py <nl> <nl> <nl> # include " osquery / database . h " <nl> # include " osquery / tables / base . h " <nl> - # include " osquery / tables / registry . h " <nl> + # include " osquery / registry / registry . h " <nl> <nl> namespace osquery { namespace tables { <nl> <nl>
|
Merge pull request from facebook / libosquery - objects
|
osquery/osquery
|
dce7c781b7ba77a851e227797d25f53b0170e314
|
2014-09-09T00:21:26Z
|
mmm a / xbmc / pvr / guilib / GUIEPGGridContainerModel . cpp <nl> ppp b / xbmc / pvr / guilib / GUIEPGGridContainerModel . cpp <nl> std : : shared_ptr < CFileItem > CGUIEPGGridContainerModel : : CreateGapItem ( int iChannel <nl> return std : : make_shared < CFileItem > ( gapTag ) ; <nl> } <nl> <nl> + std : : shared_ptr < CFileItem > CGUIEPGGridContainerModel : : GetGapItem ( int iChannel , <nl> + int iStartBlock ) const <nl> + { <nl> + std : : shared_ptr < CFileItem > item ; <nl> + <nl> + auto gapsIt = m_gapItems . find ( { iChannel , iStartBlock } ) ; <nl> + if ( gapsIt ! = m_gapItems . end ( ) ) <nl> + { <nl> + item = ( * gapsIt ) . second ; <nl> + } <nl> + else <nl> + { <nl> + item = CreateGapItem ( iChannel ) ; <nl> + m_gapItems . insert ( { { iChannel , iStartBlock } , item } ) ; <nl> + } <nl> + <nl> + return item ; <nl> + } <nl> + <nl> void CGUIEPGGridContainerModel : : Initialize ( const std : : unique_ptr < CFileItemList > & items , const CDateTime & gridStart , const CDateTime & gridEnd , int iRulerUnit , int iBlocksPerPage , float fBlockSize ) <nl> { <nl> if ( ! m_channelItems . empty ( ) ) <nl> void CGUIEPGGridContainerModel : : Initialize ( const std : : unique_ptr < CFileItemList > & <nl> return ; <nl> } <nl> <nl> + m_fBlockSize = fBlockSize ; <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / Create programme & channel items <nl> m_programmeItems . reserve ( items - > Size ( ) ) ; <nl> void CGUIEPGGridContainerModel : : Initialize ( const std : : unique_ptr < CFileItemList > & <nl> FreeItemsMemory ( ) ; <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / Create epg grid <nl> + / / Create empty epg grid ( will be filled on demand ) <nl> const CDateTimeSpan blockDuration ( 0 , 0 , MINSPERBLOCK , 0 ) ; <nl> const CDateTimeSpan gridDuration ( m_gridEnd - m_gridStart ) ; <nl> m_blocks = ( gridDuration . GetDays ( ) * 24 * 60 + gridDuration . GetHours ( ) * 60 + gridDuration . GetMinutes ( ) ) / MINSPERBLOCK ; <nl> void CGUIEPGGridContainerModel : : Initialize ( const std : : unique_ptr < CFileItemList > & <nl> for ( size_t channel = 0 ; channel < m_channelItems . size ( ) ; + + channel ) <nl> { <nl> m_gridIndex . emplace_back ( blocks ) ; <nl> - <nl> - CDateTime gridCursor ( m_gridStart ) ; / / reset cursor for new channel <nl> - unsigned long progIdx = m_epgItemsPtr [ channel ] . start ; <nl> - unsigned long lastIdx = m_epgItemsPtr [ channel ] . stop ; <nl> - int iEpgId = m_programmeItems [ progIdx ] - > GetEPGInfoTag ( ) - > EpgID ( ) ; <nl> - int itemSize = 1 ; / / size of the programme in blocks <nl> - int savedBlock = 0 ; <nl> - CFileItemPtr item ; <nl> - std : : shared_ptr < CPVREpgInfoTag > tag ; <nl> - <nl> - for ( int block = 0 ; block < m_blocks ; + + block ) <nl> - { <nl> - while ( progIdx < = lastIdx ) <nl> - { <nl> - item = m_programmeItems [ progIdx ] ; <nl> - tag = item - > GetEPGInfoTag ( ) ; <nl> - <nl> - / / Note : Start block of an event is start - time - based calculated block + 1 , <nl> - / / unless start times matches exactly the begin of a block . <nl> - <nl> - if ( tag - > EpgID ( ) ! = iEpgId | | gridCursor < tag - > StartAsUTC ( ) | | m_gridEnd < = tag - > StartAsUTC ( ) ) <nl> - break ; <nl> - <nl> - if ( gridCursor < tag - > EndAsUTC ( ) ) <nl> - { <nl> - GridItem * gridItem = GetGridItemPtr ( channel , block ) ; <nl> - gridItem - > item = item ; <nl> - gridItem - > progIndex = progIdx ; <nl> - break ; <nl> - } <nl> - <nl> - progIdx + + ; <nl> - } <nl> - <nl> - gridCursor + = blockDuration ; <nl> - <nl> - if ( block = = 0 ) <nl> - continue ; <nl> - <nl> - const std : : shared_ptr < CFileItem > prevItem = GetGridItem ( channel , block - 1 ) ; <nl> - const std : : shared_ptr < CFileItem > currItem = GetGridItem ( channel , block ) ; <nl> - <nl> - if ( block = = m_blocks - 1 | | prevItem ! = currItem ) <nl> - { <nl> - / / special handling for last block . <nl> - int blockDelta = - 1 ; <nl> - int sizeDelta = 0 ; <nl> - if ( block = = m_blocks - 1 & & prevItem = = currItem ) <nl> - { <nl> - itemSize + + ; <nl> - blockDelta = 0 ; <nl> - sizeDelta = 1 ; <nl> - } <nl> - <nl> - if ( prevItem ) <nl> - { <nl> - GetGridItem ( channel , savedBlock ) <nl> - - > SetProperty ( " GenreType " , prevItem - > GetEPGInfoTag ( ) - > GenreType ( ) ) ; <nl> - } <nl> - else <nl> - { <nl> - const std : : shared_ptr < CFileItem > gapItem = CreateGapItem ( channel ) ; <nl> - for ( int i = block + blockDelta ; i > = block - itemSize + sizeDelta ; - - i ) <nl> - { <nl> - GetGridItemPtr ( channel , i ) - > item = gapItem ; <nl> - } <nl> - } <nl> - <nl> - float fItemWidth = itemSize * fBlockSize ; <nl> - m_gridIndex [ channel ] [ savedBlock ] . originWidth = fItemWidth ; <nl> - m_gridIndex [ channel ] [ savedBlock ] . width = fItemWidth ; <nl> - <nl> - itemSize = 1 ; <nl> - savedBlock = block ; <nl> - <nl> - / / special handling for last block . <nl> - if ( block = = m_blocks - 1 & & prevItem ! = currItem ) <nl> - { <nl> - GridItem * gridItem = GetGridItemPtr ( channel , savedBlock ) ; <nl> - if ( currItem ) <nl> - { <nl> - gridItem - > item - > SetProperty ( " GenreType " , currItem - > GetEPGInfoTag ( ) - > GenreType ( ) ) ; <nl> - } <nl> - else <nl> - { <nl> - GetGridItemPtr ( channel , block ) - > item = CreateGapItem ( channel ) ; <nl> - } <nl> - <nl> - m_gridIndex [ channel ] [ savedBlock ] . originWidth = fBlockSize ; / / size always 1 block here <nl> - m_gridIndex [ channel ] [ savedBlock ] . width = fBlockSize ; <nl> - } <nl> - } <nl> - else <nl> - { <nl> - itemSize + + ; <nl> - } <nl> - } <nl> } <nl> } <nl> <nl> void CGUIEPGGridContainerModel : : FindChannelAndBlockIndex ( int channelUid , unsigne <nl> <nl> GridItem * CGUIEPGGridContainerModel : : GetGridItemPtr ( int iChannel , int iBlock ) const <nl> { <nl> + if ( ! m_gridIndex [ iChannel ] [ iBlock ] . item ) <nl> + { <nl> + bool bFound = false ; <nl> + <nl> + std : : shared_ptr < CFileItem > item ; <nl> + int startBlock = 0 ; <nl> + int endBlock = 0 ; <nl> + <nl> + const CDateTime start = GetStartTimeForBlock ( iBlock ) ; <nl> + std : : shared_ptr < CPVREpgInfoTag > epgTag ; <nl> + <nl> + int progIndex = m_epgItemsPtr [ iChannel ] . start ; <nl> + for ( ; progIndex < m_epgItemsPtr [ iChannel ] . stop ; + + progIndex ) <nl> + { <nl> + item = m_programmeItems [ progIndex ] ; <nl> + epgTag = item - > GetEPGInfoTag ( ) ; <nl> + <nl> + if ( start < epgTag - > StartAsUTC ( ) | | m_gridEnd < = epgTag - > StartAsUTC ( ) ) <nl> + break ; <nl> + <nl> + if ( start < epgTag - > EndAsUTC ( ) ) <nl> + { <nl> + startBlock = GetFirstEventBlock ( epgTag ) ; <nl> + endBlock = GetLastEventBlock ( epgTag ) ; <nl> + <nl> + item - > SetProperty ( " GenreType " , epgTag - > GenreType ( ) ) ; <nl> + <nl> + bFound = true ; <nl> + break ; <nl> + } <nl> + } <nl> + <nl> + if ( ! bFound ) <nl> + { <nl> + / / Insert a gap tag . <nl> + if ( epgTag ) <nl> + { <nl> + if ( progIndex = = m_epgItemsPtr [ iChannel ] . start ) <nl> + { <nl> + / / gap before first event <nl> + startBlock = 0 ; <nl> + endBlock = GetFirstEventBlock ( epgTag ) - 1 ; <nl> + } <nl> + else if ( progIndex = = m_epgItemsPtr [ iChannel ] . stop ) <nl> + { <nl> + / / gap after last event <nl> + startBlock = GetLastEventBlock ( epgTag ) + 1 ; <nl> + endBlock = m_blocks - 1 ; <nl> + } <nl> + else <nl> + { <nl> + / / gap between two events <nl> + startBlock = GetLastEventBlock ( m_programmeItems [ progIndex - 1 ] - > GetEPGInfoTag ( ) ) + 1 ; <nl> + endBlock = GetFirstEventBlock ( epgTag ) - 1 ; <nl> + } <nl> + } <nl> + else <nl> + { <nl> + / / channel without epg <nl> + startBlock = 0 ; <nl> + endBlock = m_blocks - 1 ; <nl> + } <nl> + <nl> + progIndex = - 1 ; <nl> + item = GetGapItem ( iChannel , startBlock ) ; <nl> + } <nl> + <nl> + const float fItemWidth = ( endBlock - startBlock + 1 ) * m_fBlockSize ; <nl> + m_gridIndex [ iChannel ] [ iBlock ] . originWidth = fItemWidth ; <nl> + m_gridIndex [ iChannel ] [ iBlock ] . width = fItemWidth ; <nl> + m_gridIndex [ iChannel ] [ iBlock ] . item = item ; <nl> + m_gridIndex [ iChannel ] [ iBlock ] . progIndex = progIndex ; <nl> + } <nl> return & m_gridIndex [ iChannel ] [ iBlock ] ; <nl> } <nl> <nl> int CGUIEPGGridContainerModel : : GetGridItemIndex ( int iChannel , int iBlock ) const <nl> <nl> void CGUIEPGGridContainerModel : : SetGridItemWidth ( int iChannel , int iBlock , float fWidth ) <nl> { <nl> - GetGridItemPtr ( iChannel , iBlock ) - > width = fWidth ; <nl> + if ( m_gridIndex [ iChannel ] [ iBlock ] . width ! = fWidth ) <nl> + GetGridItemPtr ( iChannel , iBlock ) - > width = fWidth ; <nl> } <nl> <nl> unsigned int CGUIEPGGridContainerModel : : GetGridStartPadding ( ) const <nl> CDateTime CGUIEPGGridContainerModel : : GetStartTimeForBlock ( int block ) const <nl> else if ( block > = m_blocks ) <nl> block = m_blocks - 1 ; <nl> <nl> - return m_gridStart + CDateTimeSpan ( 0 , 0 , block * MINSPERBLOCK , 0 ) ; <nl> + return m_gridStart + CDateTimeSpan ( 0 , 0 , block * MINSPERBLOCK , 0 ) ; <nl> } <nl> <nl> int CGUIEPGGridContainerModel : : GetBlock ( const CDateTime & datetime ) const <nl> int CGUIEPGGridContainerModel : : GetBlock ( const CDateTime & datetime ) const <nl> else <nl> diff = ( datetime - m_gridStart ) . GetSecondsTotal ( ) ; / / block is after grid start <nl> <nl> - return diff / 60 / MINSPERBLOCK ; <nl> + / / Note : Subtract 1 second from diff to ensure that events ending exactly at block boundary <nl> + / / are unambigious . Example : An event ending at 5 : 00 : 00 shall be mapped to block 9 and <nl> + / / an event starting at 5 : 00 : 00 shall be mapped to block 10 , not both at block 10 . <nl> + return ( diff - 1 ) / 60 / MINSPERBLOCK ; <nl> } <nl> <nl> int CGUIEPGGridContainerModel : : GetNowBlock ( ) const <nl> mmm a / xbmc / pvr / guilib / GUIEPGGridContainerModel . h <nl> ppp b / xbmc / pvr / guilib / GUIEPGGridContainerModel . h <nl> <nl> <nl> # include " XBDateTime . h " <nl> <nl> + # include < map > <nl> # include < memory > <nl> + # include < utility > <nl> # include < vector > <nl> <nl> class CFileItem ; <nl> namespace PVR <nl> private : <nl> void FreeItemsMemory ( ) ; <nl> std : : shared_ptr < CFileItem > CreateGapItem ( int iChannel ) const ; <nl> + std : : shared_ptr < CFileItem > GetGapItem ( int iChannel , int iStartBlock ) const ; <nl> <nl> struct ItemsPtr <nl> { <nl> namespace PVR <nl> std : : vector < std : : shared_ptr < CFileItem > > m_rulerItems ; <nl> std : : vector < ItemsPtr > m_epgItemsPtr ; <nl> mutable std : : vector < std : : vector < GridItem > > m_gridIndex ; <nl> + mutable std : : map < std : : pair < int , int > , std : : shared_ptr < CFileItem > > m_gapItems ; <nl> <nl> int m_blocks = 0 ; <nl> + float m_fBlockSize = 0 . 0f ; <nl> } ; <nl> } <nl>
|
[ PVR ] EPG grid model : Fill grid data on demand .
|
xbmc/xbmc
|
5c97d803845ab25d8a17d8279ae916b0c7d0b702
|
2019-11-22T10:51:16Z
|
mmm a / tensorflow / compiler / mlir / tensorflow / tests / promote_resources_to_args . mlir <nl> ppp b / tensorflow / compiler / mlir / tensorflow / tests / promote_resources_to_args . mlir <nl> func @ main ( % arg0 : tensor < ! tf . resource < tensor < f32 > > > , % arg1 : tensor < ! tf . resource < <nl> <nl> / / Tests main function with multiple blocks . <nl> <nl> - / / expected - error @ + 1 { { expects ' main ' function to have 1 block , got 2 } } <nl> + / / expected - error @ + 1 { { expects function ' main ' to have 1 block , got 2 } } <nl> func @ main ( ) { <nl> br ^ bb1 <nl> ^ bb1 : <nl> func @ main ( ) { <nl> <nl> / / Tests main function is terminated with a non MLIR ReturnOp . <nl> <nl> - / / expected - error @ + 1 { { expects ' main ' function to have a MLIR ReturnOp } } <nl> + / / expected - error @ + 1 { { expects function ' main ' to have a MLIR ReturnOp } } <nl> func @ main ( ) { <nl> ^ bb0 : <nl> tf_device . return <nl> new file mode 100644 <nl> index 0000000000000 . . 5e53a457ecbe4 <nl> mmm / dev / null <nl> ppp b / tensorflow / compiler / mlir / tensorflow / tests / promote_var_handles_to_args . mlir <nl> <nl> + / / RUN : tf - opt % s - split - input - file - verify - diagnostics - tf - promote - var - handles - to - args | FileCheck % s - dump - input - on - failure <nl> + <nl> + / / Tests main function with multiple blocks . <nl> + <nl> + / / expected - error @ + 1 { { expects function ' main ' to have 1 block , got 2 } } <nl> + func @ main ( ) { <nl> + br ^ bb1 <nl> + ^ bb1 : <nl> + return <nl> + } <nl> + <nl> + / / mmm - - <nl> + <nl> + / / CHECK - LABEL : func @ no_args <nl> + / / CHECK - SAME : ( % arg0 : tensor < ! tf . resource > { tf . resource_name = " x " } ) <nl> + / / CHECK - NOT : " tf . VarHandleOp " <nl> + func @ no_args ( ) { <nl> + % 0 = " tf . VarHandleOp " ( ) { container = " " , shape = " tfshape $ " , shared_name = " x " } : ( ) - > tensor < ! tf . resource > <nl> + return <nl> + } <nl> + <nl> + / / CHECK - LABEL : func @ some_args <nl> + / / CHECK - SAME : ( % arg0 : tensor < i1 > , % arg1 : tensor < ! tf . resource > { tf . resource_name = " x " } ) <nl> + / / CHECK - NOT : " tf . VarHandleOp " <nl> + func @ some_args ( % arg0 : tensor < i1 > ) { <nl> + % 0 = " tf . VarHandleOp " ( ) { container = " " , shape = " tfshape $ " , shared_name = " x " } : ( ) - > tensor < ! tf . resource > <nl> + return <nl> + } <nl> + <nl> + / / CHECK - LABEL : func @ unique_vars <nl> + / / CHECK - SAME : ( % arg0 : tensor < ! tf . resource < tensor < f32 > > > { tf . resource_name = " x " } , % arg1 : tensor < ! tf . resource < tensor < i32 > > > { tf . resource_name = " y " } ) <nl> + / / CHECK - NOT : " tf . VarHandleOp " <nl> + func @ unique_vars ( ) { <nl> + % 0 = " tf . VarHandleOp " ( ) { container = " " , shape = " tfshape $ " , shared_name = " x " } : ( ) - > tensor < ! tf . resource < tensor < f32 > > > <nl> + % 1 = " tf . VarHandleOp " ( ) { container = " " , shape = " tfshape $ " , shared_name = " y " } : ( ) - > tensor < ! tf . resource < tensor < i32 > > > <nl> + return <nl> + } <nl> + <nl> + / / CHECK - LABEL : func @ duplicate_vars <nl> + / / CHECK - SAME : ( % arg0 : tensor < ! tf . resource < tensor < f32 > > > { tf . resource_name = " x " } ) <nl> + / / CHECK - NOT : " tf . VarHandleOp " <nl> + func @ duplicate_vars ( ) { <nl> + % 0 = " tf . VarHandleOp " ( ) { container = " " , shape = " tfshape $ " , shared_name = " x " } : ( ) - > tensor < ! tf . resource < tensor < f32 > > > <nl> + % 1 = " tf . VarHandleOp " ( ) { container = " " , shape = " tfshape $ " , shared_name = " x " } : ( ) - > tensor < ! tf . resource < tensor < f32 > > > <nl> + return <nl> + } <nl> mmm a / tensorflow / compiler / mlir / tensorflow / transforms / passes . h <nl> ppp b / tensorflow / compiler / mlir / tensorflow / transforms / passes . h <nl> std : : unique_ptr < OperationPass < ModuleOp > > CreateResourceDeviceInferencePass ( ) ; <nl> / / of their aliasing output arguments . <nl> std : : unique_ptr < OperationPass < ModuleOp > > CreatePromoteResourcesToArgsPass ( ) ; <nl> <nl> + / / Creates a pass that promotes tf . VarHandleOp to resource arguments for all <nl> + / / functions . <nl> + std : : unique_ptr < OperationPass < ModuleOp > > CreatePromoteVarHandlesToArgsPass ( ) ; <nl> + <nl> / / Marks function visibility using tf . entry_function specification . That is , <nl> / / functions with tf . entry_function attributes are marked with public <nl> / / visibility while the other functions are marked with private visibility . <nl> mmm a / tensorflow / compiler / mlir / tensorflow / transforms / promote_resources_to_args . cc <nl> ppp b / tensorflow / compiler / mlir / tensorflow / transforms / promote_resources_to_args . cc <nl> constexpr char kInvalidResourceMsg [ ] = <nl> " expects resource to be a VarHandleOp or function argument " ; <nl> constexpr char kResourceNameArgAttr [ ] = " tf . resource_name " ; <nl> <nl> + / / Checks if a function has only one block . <nl> + mlir : : LogicalResult CheckSingleBlockFunction ( FuncOp function ) { <nl> + if ( ! hasSingleElement ( function . getBlocks ( ) ) ) <nl> + return function . emitError ( ) <nl> + < < " expects function ' " < < function . getName ( ) <nl> + < < " ' to have 1 block , got " < < function . getBlocks ( ) . size ( ) ; <nl> + <nl> + return success ( ) ; <nl> + } <nl> + <nl> / / Collects names of users of a resource that are not ` tf . ReadVariableOp ` and <nl> / / not ` tf . AssignVariableOp ` . <nl> llvm : : SmallSet < llvm : : StringRef , 1 > GetCompositeResourceUserNames ( <nl> LogicalResult PromoteResourcesToArguments ( <nl> <nl> auto return_op = llvm : : dyn_cast_or_null < ReturnOp > ( block . getTerminator ( ) ) ; <nl> if ( ! return_op ) <nl> - return function . emitError ( <nl> - " expects ' main ' function to have a MLIR ReturnOp " ) ; <nl> + return function . emitError ( ) < < " expects function ' " < < function . getName ( ) <nl> + < < " ' to have a MLIR ReturnOp " ; <nl> <nl> llvm : : SmallVector < ResourceInfo , 4 > resources ( function . getNumArguments ( ) ) ; <nl> auto argument_types = llvm : : to_vector < 4 > ( function . getType ( ) . getInputs ( ) ) ; <nl> void PromoteResourcesToArgsPass : : runOnOperation ( ) { <nl> / / This routine should only be called when control flow operations are still <nl> / / represented with TF IfOp and WhileOp operations . In this case , there should <nl> / / be only one basic blocks in the MLIR representation . <nl> - if ( ! hasSingleElement ( main_func . getBlocks ( ) ) ) { <nl> - main_func . emitError ( ) < < " expects ' main ' function to have 1 block , got " <nl> - < < main_func . getBlocks ( ) . size ( ) ; <nl> - return signalPassFailure ( ) ; <nl> - } <nl> + if ( failed ( CheckSingleBlockFunction ( main_func ) ) ) return signalPassFailure ( ) ; <nl> <nl> llvm : : SmallVector < std : : string , 4 > var_handle_shared_names ; <nl> if ( failed ( ResourceLiftingForFunctionalControlFlow ( main_func ) ) | | <nl> void PromoteResourcesToArgsPass : : runOnOperation ( ) { <nl> return signalPassFailure ( ) ; <nl> } <nl> <nl> + class PromoteVarHandlesToArgsPass <nl> + : public PassWrapper < PromoteVarHandlesToArgsPass , OperationPass < ModuleOp > > { <nl> + public : <nl> + void runOnOperation ( ) override ; <nl> + } ; <nl> + <nl> + void PromoteVarHandlesToArgsPass : : runOnOperation ( ) { <nl> + ModuleOp module = getOperation ( ) ; <nl> + MLIRContext * context = module . getContext ( ) ; <nl> + for ( auto function : module . getOps < FuncOp > ( ) ) { <nl> + if ( failed ( CheckSingleBlockFunction ( function ) ) ) return signalPassFailure ( ) ; <nl> + <nl> + llvm : : SmallVector < std : : string , 4 > var_handle_shared_names ; <nl> + PromoteVarHandlesToArguments ( function , / * add_validation = * / false , <nl> + & var_handle_shared_names ) ; <nl> + <nl> + / / Add resource names for each ` tf . VarHandleOp ` that were promoted to <nl> + / / resource arguments . <nl> + const int var_handle_args_offset = <nl> + function . getNumArguments ( ) - var_handle_shared_names . size ( ) ; <nl> + for ( auto var_name_and_index : llvm : : enumerate ( var_handle_shared_names ) ) <nl> + function . setArgAttr ( var_name_and_index . index ( ) + var_handle_args_offset , <nl> + kResourceNameArgAttr , <nl> + StringAttr : : get ( var_name_and_index . value ( ) , context ) ) ; <nl> + } <nl> + } <nl> + <nl> } / / namespace <nl> <nl> std : : unique_ptr < OperationPass < ModuleOp > > CreatePromoteResourcesToArgsPass ( ) { <nl> return std : : make_unique < PromoteResourcesToArgsPass > ( ) ; <nl> } <nl> <nl> + std : : unique_ptr < OperationPass < ModuleOp > > CreatePromoteVarHandlesToArgsPass ( ) { <nl> + return std : : make_unique < PromoteVarHandlesToArgsPass > ( ) ; <nl> + } <nl> + <nl> static PassRegistration < PromoteResourcesToArgsPass > pass ( <nl> " tf - promote - resources - to - args " , <nl> " Promote resources reads / writes to function inputs / outputs . " ) ; <nl> <nl> + static PassRegistration < PromoteVarHandlesToArgsPass > var_handle_pass ( <nl> + " tf - promote - var - handles - to - args " , <nl> + " Promote tf . VarHandleOps to function arguments . " ) ; <nl> + <nl> } / / namespace TF <nl> } / / namespace mlir <nl>
|
Add PromoteVarHandlesToArgsPass to lift tf . VarHandleOps from function bodies to function arguments .
|
tensorflow/tensorflow
|
e8ac8116c76824c370cbbb9fc3a77b637d160106
|
2020-05-13T16:06:41Z
|
mmm a / tensorflow / python / distribute / cluster_resolver / tpu / tpu_cluster_resolver . py <nl> ppp b / tensorflow / python / distribute / cluster_resolver / tpu / tpu_cluster_resolver . py <nl> def is_running_in_gce ( ) : <nl> return True <nl> <nl> <nl> + class _LocalCloudTpuClient ( object ) : <nl> + " " " Dummy local Cloud TPU client . " " " <nl> + <nl> + def api_available ( self ) : <nl> + return False <nl> + <nl> + <nl> _TPU_DEVICE_REGEX = re . compile ( <nl> r ' . * task : ( ? P < host_id > \ d + ) / . * device : TPU : ( ? P < core_id > \ d + ) $ ' ) <nl> _TPU_CONN_RETRIES = 120 <nl> def __init__ ( self , <nl> self . _tpu = self . _cloud_tpu_client . name ( ) <nl> else : <nl> # Directly connected TPU environment <nl> - self . _cloud_tpu_client = None <nl> + self . _cloud_tpu_client = _LocalCloudTpuClient ( ) <nl> self . _tpu = ' local ' <nl> <nl> # By default the task_type is ' worker ` and the task_id is 0 ( which is the <nl>
|
Introduce a local cloud TPU client for backwards compatibility with existing APIs
|
tensorflow/tensorflow
|
a014eda1feb7146ad177fe23c9da5be20e5053de
|
2020-08-12T20:45:15Z
|
mmm a / . gitignore <nl> ppp b / . gitignore <nl> <nl> * . pch <nl> db / Debug <nl> db / db <nl> + db / dbgrid <nl> db / dbtests <nl> db / oplog * <nl> db / . gdb * <nl>
|
Ignore dbgrid binary
|
mongodb/mongo
|
4d8c3fe3aca25dd4ce2d23ed693354c8d14ed7cc
|
2008-12-12T19:22:29Z
|
mmm a / db / cloner . cpp <nl> ppp b / db / cloner . cpp <nl> namespace mongo { <nl> auto_ptr < DBClientWithCommands > conn ; <nl> void copy ( const char * from_ns , const char * to_ns , bool isindex , bool logForRepl , <nl> bool masterSameProcess , bool slaveOk , BSONObj query = emptyObj ) ; <nl> + void replayOpLog ( DBClientCursor * c , const BSONObj & query ) ; <nl> public : <nl> Cloner ( ) { } <nl> <nl> namespace mongo { <nl> useReplAuth - use the credentials we normally use as a replication slave for the cloning <nl> * / <nl> bool go ( const char * masterHost , string & errmsg , const string & fromdb , bool logForRepl , bool slaveOk , bool useReplAuth ) ; <nl> - bool cloneCollection ( const char * fromhost , const char * ns , BSONObj query , string & errmsg , bool logForRepl , bool copyIndexes , int logSizeMb ) ; <nl> + bool startCloneCollection ( const char * fromhost , const char * ns , const BSONObj & query , string & errmsg , bool logForRepl , bool copyIndexes , int logSizeMb , long long & cursorId ) ; <nl> + bool finishCloneCollection ( const char * fromhost , const char * ns , const BSONObj & query , long long cursorId , string & errmsg ) ; <nl> } ; <nl> <nl> / * for index info object : <nl> namespace mongo { <nl> return true ; <nl> } <nl> <nl> - bool Cloner : : cloneCollection ( const char * fromhost , const char * ns , BSONObj query , string & errmsg , bool logForRepl , bool copyIndexes , int logSizeMb ) { <nl> + bool Cloner : : startCloneCollection ( const char * fromhost , const char * ns , const BSONObj & query , string & errmsg , bool logForRepl , bool copyIndexes , int logSizeMb , long long & cursorId ) { <nl> char db [ 256 ] ; <nl> nsToClient ( ns , db ) ; <nl> <nl> namespace mongo { <nl> return false ; <nl> } <nl> } <nl> - <nl> <nl> copy ( ns , ns , false , logForRepl , false , false , query ) ; <nl> <nl> namespace mongo { <nl> copy ( indexNs . c_str ( ) , indexNs . c_str ( ) , true , logForRepl , false , false , BSON ( " ns " < < ns ) ) ; <nl> } <nl> <nl> + auto_ptr < DBClientCursor > c ; <nl> + { <nl> + dbtemprelease r ; <nl> + string logNS = " local . temp . oplog . " + string ( ns ) ; <nl> + c = conn - > query ( logNS . c_str ( ) , Query ( ) , 0 , 0 , 0 , Option_CursorTailable ) ; <nl> + } <nl> + cout < < " start cursorId : " < < c - > getCursorId ( ) < < endl ; <nl> + replayOpLog ( c . get ( ) , query ) ; <nl> + cursorId = c - > getCursorId ( ) ; <nl> + cout < < " set cursorId : " < < cursorId < < endl ; <nl> + c - > decouple ( ) ; <nl> + return true ; <nl> + } <nl> + <nl> + void Cloner : : replayOpLog ( DBClientCursor * c , const BSONObj & query ) { <nl> JSMatcher matcher ( query ) ; <nl> - / / According to the docs , the machine I ' m cloning from is supposed to be <nl> - / / locked during this part . Need to learn more about the plan for that . <nl> - string logNS = " local . temp . oplog . " + string ( ns ) ; <nl> - auto_ptr < DBClientCursor > c = conn - > query ( logNS . c_str ( ) , Query ( ) ) ; <nl> while ( 1 ) { <nl> BSONObj op ; <nl> { <nl> namespace mongo { <nl> / / filter each insert by value . <nl> if ( op . getStringField ( " op " ) [ 0 ] ! = ' i ' | | matcher . matches ( op . getObjectField ( " o " ) ) ) <nl> ReplSource : : applyOperation ( op ) ; <nl> + } <nl> + } <nl> + <nl> + bool Cloner : : finishCloneCollection ( const char * fromhost , const char * ns , const BSONObj & query , long long cursorId , string & errmsg ) { <nl> + char db [ 256 ] ; <nl> + nsToClient ( ns , db ) ; <nl> + <nl> + auto_ptr < DBClientCursor > cur ; <nl> + { <nl> + dbtemprelease r ; <nl> + auto_ptr < DBClientConnection > c ( new DBClientConnection ( ) ) ; <nl> + if ( ! c - > connect ( fromhost , errmsg ) ) <nl> + return false ; <nl> + if ( ! replAuthenticate ( c . get ( ) ) ) <nl> + return false ; <nl> + conn = c ; <nl> + string logNS = " local . temp . oplog . " + string ( ns ) ; <nl> + cur = conn - > getMore ( logNS . c_str ( ) , cursorId ) ; <nl> } <nl> - <nl> + replayOpLog ( cur . get ( ) , query ) ; <nl> { <nl> dbtemprelease t ; <nl> BSONObj info ; <nl> namespace mongo { <nl> } <nl> } cmdclone ; <nl> <nl> - class CmdCloneCollection : public Command { <nl> + class CmdStartCloneCollection : public Command { <nl> public : <nl> virtual bool slaveOk ( ) { <nl> return false ; <nl> } <nl> - CmdCloneCollection ( ) : Command ( " cloneCollection " ) { } <nl> + CmdStartCloneCollection ( ) : Command ( " startCloneCollection " ) { } <nl> virtual void help ( stringstream & help ) const { <nl> - help < < " example : { cloneCollection : < collection ns > , from : < hostname > , query : < query > } " ; <nl> + help < < " example : { startCloneCollection : < collection ns > , from : < hostname > , query : < query > } " ; <nl> + help < < " , returned object includes a finishToken field , the value of which may be passed to the finishCloneCollection command " ; <nl> } <nl> virtual bool run ( const char * ns , BSONObj & cmdObj , string & errmsg , BSONObjBuilder & result , bool fromRepl ) { <nl> string fromhost = cmdObj . getStringField ( " from " ) ; <nl> namespace mongo { <nl> errmsg = " missing from spec " ; <nl> return false ; <nl> } <nl> - string collection = cmdObj . getStringField ( " cloneCollection " ) ; <nl> + string collection = cmdObj . getStringField ( " startCloneCollection " ) ; <nl> if ( collection . empty ( ) ) { <nl> - errmsg = " missing cloneCollection spec " ; <nl> + errmsg = " missing startCloneCollection spec " ; <nl> return false ; <nl> } <nl> BSONObj query = cmdObj . getObjectField ( " query " ) ; <nl> namespace mongo { <nl> * / <nl> setClient ( collection . c_str ( ) ) ; <nl> <nl> - log ( ) < < " cloneCollection . db : " < < ns < < " collection : " < < collection < < " from : " < < fromhost < < " query : " < < query < < endl ; <nl> + log ( ) < < " startCloneCollection . db : " < < ns < < " collection : " < < collection < < " from : " < < fromhost < < " query : " < < query < < endl ; <nl> <nl> Cloner c ; <nl> - return c . cloneCollection ( fromhost . c_str ( ) , collection . c_str ( ) , query , errmsg , ! fromRepl , copyIndexes , logSizeMb ) ; <nl> + long long cursorId ; <nl> + bool res = c . startCloneCollection ( fromhost . c_str ( ) , collection . c_str ( ) , query , errmsg , ! fromRepl , copyIndexes , logSizeMb , cursorId ) ; <nl> + <nl> + if ( res ) { <nl> + BSONObjBuilder b ; <nl> + b < < " fromhost " < < fromhost ; <nl> + b < < " collection " < < collection ; <nl> + b < < " query " < < query ; <nl> + b . appendDate ( " cursorId " , cursorId ) ; <nl> + BSONObj token = b . done ( ) ; <nl> + log ( ) < < " returning token : " < < token < < endl ; <nl> + result < < " finishToken " < < token ; <nl> + } <nl> + return res ; <nl> } <nl> - } cmdclonecollection ; <nl> + } cmdstartclonecollection ; <nl> <nl> + class CmdFinishCloneCollection : public Command { <nl> + public : <nl> + virtual bool slaveOk ( ) { <nl> + return false ; <nl> + } <nl> + CmdFinishCloneCollection ( ) : Command ( " finishCloneCollection " ) { } <nl> + virtual void help ( stringstream & help ) const { <nl> + help < < " example : { finishCloneCollection : < finishToken > } " ; <nl> + } <nl> + virtual bool run ( const char * ns , BSONObj & cmdObj , string & errmsg , BSONObjBuilder & result , bool fromRepl ) { <nl> + BSONObj fromToken = cmdObj . getObjectField ( " finishCloneCollection " ) ; <nl> + if ( fromToken . isEmpty ( ) ) { <nl> + errmsg = " missing finishCloneCollection finishToken spec " ; <nl> + return false ; <nl> + } <nl> + cout < < " fromToken : " < < fromToken . toString ( ) < < endl ; <nl> + string fromhost = fromToken . getStringField ( " fromhost " ) ; <nl> + if ( fromhost . empty ( ) ) { <nl> + errmsg = " missing fromhost spec " ; <nl> + return false ; <nl> + } <nl> + string collection = fromToken . getStringField ( " collection " ) ; <nl> + if ( collection . empty ( ) ) { <nl> + errmsg = " missing collection spec " ; <nl> + return false ; <nl> + } <nl> + BSONObj query = fromToken . getObjectField ( " query " ) ; <nl> + if ( query . isEmpty ( ) ) { <nl> + query = emptyObj ; <nl> + } <nl> + long long cursorId = 0 ; <nl> + BSONElement cursorIdToken = fromToken . getField ( " cursorId " ) ; <nl> + cout < < " token type : " < < cursorIdToken . type ( ) < < endl ; <nl> + if ( cursorIdToken . type ( ) = = Date ) { <nl> + cout < < " type date " < < endl ; <nl> + cursorId = cursorIdToken . date ( ) ; <nl> + cout < < " val : " < < cursorIdToken . date ( ) < < endl ; <nl> + } <nl> + if ( cursorId = = 0 ) { <nl> + errmsg = " invalid cursorId spec " ; <nl> + return false ; <nl> + } <nl> + <nl> + setClient ( collection . c_str ( ) ) ; <nl> + <nl> + log ( ) < < " finishCloneCollection . db : " < < ns < < " collection : " < < collection < < " from : " < < fromhost < < " query : " < < query < < endl ; <nl> + <nl> + Cloner c ; <nl> + return c . finishCloneCollection ( fromhost . c_str ( ) , collection . c_str ( ) , query , cursorId , errmsg ) ; <nl> + } <nl> + } cmdfinishclonecollection ; <nl> + <nl> / * Usage : <nl> admindb . $ cmd . findOne ( { copydb : 1 , fromhost : < hostname > , fromdb : < db > , todb : < db > } ) ; <nl> * / <nl> mmm a / db / query . cpp <nl> ppp b / db / query . cpp <nl> namespace mongo { <nl> so_ - > fill ( b_ , & filter_ , n_ ) ; <nl> } <nl> else if ( ! saveClientCursor_ & & ( queryOptions_ & Option_CursorTailable ) & & c_ - > tailable ( ) ) { <nl> + cout < < " setting at tail " < < endl ; <nl> c_ - > setAtTail ( ) ; <nl> saveClientCursor_ = true ; <nl> } <nl> + cout < < " query complete for ns : " < < qp ( ) . ns ( ) < < endl ; <nl> + cout < < " option tailable ? : " < < ( queryOptions_ & Option_CursorTailable ) < < endl ; <nl> + cout < < " tailable ? : " < < c_ - > tailable ( ) < < endl ; <nl> setComplete ( ) ; <nl> } <nl> virtual bool mayRecordPlan ( ) const { return ntoreturn_ ! = 1 ; } <nl> mmm a / shell / db . js <nl> ppp b / shell / db . js <nl> DB . prototype . cloneCollection = function ( from , collection , query ) { <nl> collection = this . _name + " . " + collection ; <nl> query = query | | { } ; <nl> / / this . resetIndexCache ( ) ; <nl> - return this . _dbCommand ( { cloneCollection : collection , from : from , query : query } ) ; <nl> + var ret = this . _dbCommand ( { startCloneCollection : collection , from : from , query : query } ) ; <nl> + print ( " ret : " ) ; <nl> + printjson ( ret ) ; <nl> + if ( ! ret . ok ) <nl> + return ret ; <nl> + var ret2 = this . _dbCommand ( { finishCloneCollection : ret . finishToken } ) ; <nl> + print ( " ret2 : " ) ; <nl> + printjson ( ret2 ) ; <nl> + return ret2 ; <nl> } <nl> <nl> <nl>
|
finishCloneCollection checkpoint
|
mongodb/mongo
|
502e20f1cc89500d36119bf9c8656ee37ae28240
|
2009-03-11T14:31:47Z
|
mmm a / hphp / hack / src / decl / decl . ml <nl> ppp b / hphp / hack / src / decl / decl . ml <nl> and fun_decl ( ctx : Provider_context . t ) ( f : Nast . fun_ ) : Typing_defs . fun_elt = <nl> <nl> and fun_decl_in_env ( env : Decl_env . env ) ~ ( is_lambda : bool ) ( f : Nast . fun_ ) : <nl> Typing_defs . fun_elt = <nl> - check_params env f . f_params ; <nl> + check_params f . f_params ; <nl> let reactivity = fun_reactivity env f . f_user_attributes in <nl> let returns_mutable = fun_returns_mutable f . f_user_attributes in <nl> let returns_void_to_rx = fun_returns_void_to_rx f . f_user_attributes in <nl> mmm a / hphp / hack / src / decl / decl_fun_utils . ml <nl> ppp b / hphp / hack / src / decl / decl_fun_utils . ml <nl> let minimum_arity paraml = <nl> in <nl> List . count paraml f <nl> <nl> - let check_params env paraml = <nl> + let check_params paraml = <nl> ( * We wish to give an error on the first non - default parameter <nl> after a default parameter . That is : <nl> function foo ( int $ x , ? int $ y = null , int $ z ) <nl> let check_params env paraml = <nl> else <nl> loop ( Option . is_some param . param_expr ) rl <nl> in <nl> - ( * PHP allows non - default valued parameters after default valued parameters . * ) <nl> - if not FileInfo . ( equal_mode env . Decl_env . mode Mphp ) then loop false paraml <nl> + loop false paraml <nl> <nl> let make_params env ~ is_lambda paraml = <nl> List . map paraml ~ f : ( make_param_ty env ~ is_lambda ) <nl> mmm a / hphp / hack / src / decl / shallow_decl . ml <nl> ppp b / hphp / hack / src / decl / shallow_decl . ml <nl> and static_prop env cv = <nl> } <nl> <nl> let method_type env m = <nl> - check_params env m . m_params ; <nl> + check_params m . m_params ; <nl> let reactivity = fun_reactivity env m . m_user_attributes in <nl> let mut = get_param_mutability m . m_user_attributes in <nl> let returns_mutable = fun_returns_mutable m . m_user_attributes in <nl> let method_type env m = <nl> } <nl> <nl> let method_redeclaration_type env m = <nl> - check_params env m . mt_params ; <nl> + check_params m . mt_params ; <nl> let params = make_params env ~ is_lambda : false m . mt_params in <nl> let ret = <nl> ret_from_fun_kind <nl> mmm a / hphp / hack / src / deps / fileInfo . ml <nl> ppp b / hphp / hack / src / deps / fileInfo . ml <nl> open Prim_defs <nl> ( * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ) <nl> <nl> type mode = <nl> - | Mphp ( * * Do the best you can to support legacy PHP * ) <nl> | Mdecl ( * * just declare signatures , don ' t check anything * ) <nl> | Mstrict ( * * check everything ! * ) <nl> | Mpartial ( * * Don ' t fail if you see a function / class you don ' t know * ) <nl> let parse_mode = function <nl> <nl> let is_strict = function <nl> | Mstrict - > true <nl> - | Mphp <nl> | Mdecl <nl> | Mpartial - > <nl> false <nl> <nl> - let is_hh_file mode = mode < > Mphp <nl> - <nl> let string_of_mode = function <nl> - | Mphp - > " php " <nl> | Mdecl - > " decl " <nl> | Mstrict - > " strict " <nl> | Mpartial - > " partial " <nl> let pp_mode fmt mode = <nl> Format . pp_print_string fmt <nl> @ @ <nl> match mode with <nl> - | Mphp - > " Mphp " <nl> | Mdecl - > " Mdecl " <nl> | Mstrict - > " Mstrict " <nl> | Mpartial - > " Mpartial " <nl> mmm a / hphp / hack / src / deps / fileInfo . mli <nl> ppp b / hphp / hack / src / deps / fileInfo . mli <nl> open Prim_defs <nl> ( * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ) <nl> <nl> type mode = <nl> - | Mphp ( * Do the best you can to support legacy PHP * ) <nl> | Mdecl ( * just declare signatures , don ' t check anything * ) <nl> | Mstrict ( * check everything ! * ) <nl> | Mpartial ( * Don ' t fail if you see a function / class you don ' t know * ) <nl> val parse_mode : string - > mode option <nl> <nl> val string_of_mode : mode - > string <nl> <nl> - val is_hh_file : mode - > bool <nl> - <nl> ( * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ) <nl> ( * The record produced by the parsing phase . * ) <nl> ( * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ) <nl> mmm a / hphp / hack / src / hackfmt / libhackfmt . ml <nl> ppp b / hphp / hack / src / hackfmt / libhackfmt . ml <nl> let env_from_config config = <nl> if env . Env . line_width < 0 then invalid_arg " Invalid line width " ; <nl> env <nl> <nl> - let env_from_tree config tree = <nl> - let env = env_from_config config in <nl> - if SyntaxTree . is_php tree then <nl> - { env with Env . add_trailing_commas = false } <nl> - else <nl> - env <nl> - <nl> ( * * Format a single node . <nl> * <nl> * A trailing newline will be included ( and leading indentation , if <nl> let text_with_formatted_ranges <nl> let format_tree ? config tree = <nl> let source_text = SyntaxTree . text tree in <nl> let text = SourceText . text source_text in <nl> - let env = env_from_tree config tree in <nl> + let env = env_from_config config in <nl> let chunk_groups = <nl> tree <nl> | > SyntaxTransforms . editable_from_positioned <nl> let format_tree ? config tree = <nl> let format_range ? config range tree = <nl> let source_text = SyntaxTree . text tree in <nl> let text = SourceText . text source_text in <nl> - let env = env_from_tree config tree in <nl> + let env = env_from_config config in <nl> let chunk_groups = <nl> tree <nl> | > SyntaxTransforms . editable_from_positioned <nl> let format_range ? config range tree = <nl> let format_intervals ? config intervals tree = <nl> let source_text = SyntaxTree . text tree in <nl> let text = SourceText . text source_text in <nl> - let env = env_from_tree config tree in <nl> + let env = env_from_config config in <nl> let chunk_groups = <nl> tree <nl> | > SyntaxTransforms . editable_from_positioned <nl> let format_intervals ? config intervals tree = <nl> * Designed to be suitable for as - you - type - formatting . * ) <nl> let format_at_offset ? config ( tree : SyntaxTree . t ) offset = <nl> let source_text = SyntaxTree . text tree in <nl> - let env = env_from_tree config tree in <nl> + let env = env_from_config config in <nl> let chunk_groups = <nl> tree <nl> | > SyntaxTransforms . editable_from_positioned <nl> mmm a / hphp / hack / src / hhbc / compile . rs <nl> ppp b / hphp / hack / src / hhbc / compile . rs <nl> where <nl> ) ; <nl> <nl> let ( codegen_t , program ) = match & mut parse_result { <nl> - Either : : Right ( ( ast , is_hh_file ) ) = > { <nl> + Either : : Right ( ast ) = > { <nl> let namespace = RcOc : : new ( NamespaceEnv : : empty ( <nl> emitter . options ( ) . hhvm . aliased_namespaces_cloned ( ) . collect ( ) , <nl> true , / * is_codegen * / <nl> where <nl> elaborate_namespaces_visitor : : elaborate_program ( RcOc : : clone ( & namespace ) , ast ) ; <nl> emit_pu_rust : : translate ( ast ) ; <nl> let e = & mut emitter ; <nl> - profile ( move | | emit ( e , & env , namespace , * is_hh_file , ast ) ) <nl> + profile ( move | | emit ( e , & env , namespace , ast ) ) <nl> } <nl> Either : : Left ( ( pos , msg , is_runtime_error ) ) = > { <nl> profile ( | | emit_fatal ( & mut emitter , * is_runtime_error , pos , msg ) ) <nl> fn emit < ' p , S : AsRef < str > > ( <nl> emitter : & mut Emitter , <nl> env : & Env < S > , <nl> namespace : RcOc < NamespaceEnv > , <nl> - is_hh : bool , <nl> ast : & ' p mut Tast : : Program , <nl> ) - > Result < HhasProgram < ' p > , Error > { <nl> let mut flags = FromAstFlags : : empty ( ) ; <nl> - if is_hh { <nl> - flags | = FromAstFlags : : IS_HH_FILE ; <nl> - } <nl> if env . flags . contains ( EnvFlags : : IS_EVALED ) { <nl> flags | = FromAstFlags : : IS_EVALED ; <nl> } <nl> fn create_parser_options ( opts : & Options ) - > ParserOptions { <nl> <nl> / / / parse_file returns either error ( Left ) or ast ( Right ) <nl> / / / - Left ( ( Position , message , is_runtime_error ) ) <nl> - / / / - Right ( ( ast , is_hh_file ) ) <nl> + / / / - Right ( ast ) <nl> fn parse_file ( <nl> opts : & Options , <nl> stack_limit : & StackLimit , <nl> source_text : SourceText , <nl> elaborate_namespaces : bool , <nl> - ) - > Either < ( Pos , String , bool ) , ( Tast : : Program , bool ) > { <nl> + ) - > Either < ( Pos , String , bool ) , Tast : : Program > { <nl> let mut aast_env = AastEnv : : default ( ) ; <nl> aast_env . codegen = true ; <nl> aast_env . fail_open = false ; <nl> fn parse_file ( <nl> errors , <nl> aast , <nl> scoured_comments , <nl> - file_mode , <nl> . . <nl> } = > { <nl> let mut errors = errors . iter ( ) . filter ( | e | { <nl> fn parse_file ( <nl> Left ( ( Pos : : make_none ( ) , String : : new ( ) , false ) ) <nl> } else { <nl> match aast { <nl> - Ok ( aast ) = > Right ( ( aast , file_mode . is_hh_file ( ) ) ) , <nl> + Ok ( aast ) = > Right ( aast ) , <nl> Err ( msg ) = > Left ( ( Pos : : make_none ( ) , msg , false ) ) , <nl> } <nl> } <nl> mmm a / hphp / hack / src / hhbc / emit_program . rs <nl> ppp b / hphp / hack / src / hhbc / emit_program . rs <nl> pub fn emit_fatal_program < ' p > ( <nl> None , <nl> ) ? ; <nl> Ok ( HhasProgram { <nl> - is_hh : true , <nl> fatal : Some ( ( op , pos . clone ( ) , msg . as_ref ( ) . to_string ( ) ) ) , <nl> main , <nl> . . HhasProgram : : default ( ) <nl> fn emit_program_ < ' p > ( <nl> typedefs , <nl> constants , <nl> adata , <nl> - is_hh : flags . contains ( FromAstFlags : : IS_HH_FILE ) , <nl> file_attributes , <nl> symbol_refs , <nl> fatal , <nl> fn emit_program_ < ' p > ( <nl> <nl> bitflags ! { <nl> pub struct FromAstFlags : u8 { <nl> - const IS_HH_FILE = 0b0001 ; <nl> - const IS_EVALED = 0b0010 ; <nl> - const FOR_DEBUGGER_EVAL = 0b0100 ; <nl> - const IS_SYSTEMLIB = 0b1000 ; <nl> + const IS_EVALED = 0b0001 ; <nl> + const FOR_DEBUGGER_EVAL = 0b0010 ; <nl> + const IS_SYSTEMLIB = 0b0100 ; <nl> } <nl> } <nl> <nl> mmm a / hphp / hack / src / hhbc / hhas_program . rs <nl> ppp b / hphp / hack / src / hhbc / hhas_program . rs <nl> use oxidized : : pos : : Pos ; <nl> <nl> # [ derive ( Default , Debug ) ] <nl> pub struct HhasProgram < ' a > { <nl> - pub is_hh : bool , <nl> pub adata : Vec < HhasAdata > , <nl> pub functions : Vec < HhasFunction < ' a > > , <nl> pub classes : Vec < HhasClass < ' a > > , <nl> mmm a / hphp / hack / src / hhbc / print . rs <nl> ppp b / hphp / hack / src / hhbc / print . rs <nl> fn print_program_ < W : Write > ( <nl> w : & mut W , <nl> prog : & HhasProgram , <nl> ) - > Result < ( ) , W : : Error > { <nl> - let is_hh = if prog . is_hh { " 1 " } else { " 0 " } ; <nl> newline ( w ) ? ; <nl> - concat_str ( w , [ " . hh_file " , is_hh , " ; " ] ) ? ; <nl> + concat_str ( w , [ " . hh_file 1 ; " ] ) ? ; <nl> <nl> if let Some ( ( fop , p , msg ) ) = & prog . fatal { <nl> newline ( w ) ? ; <nl> mmm a / hphp / hack / src / name_index / sqlite / datatypes . rs <nl> ppp b / hphp / hack / src / name_index / sqlite / datatypes . rs <nl> pub ( crate ) mod convert { <nl> pub fn mode_to_i64 ( mode : Option < Mode > ) - > Option < i64 > { <nl> match mode { <nl> Some ( mode ) = > Some ( match mode { <nl> - Mode : : Mphp = > 0 , <nl> - Mode : : Mdecl = > 1 , <nl> - Mode : : Mstrict = > 2 , <nl> - Mode : : Mpartial = > 3 , <nl> + Mode : : Mdecl = > 0 , <nl> + Mode : : Mstrict = > 1 , <nl> + Mode : : Mpartial = > 2 , <nl> } ) , <nl> None = > None , <nl> } <nl> mmm a / hphp / hack / src / naming / naming . ml <nl> ppp b / hphp / hack / src / naming / naming . ml <nl> and method_ genv m = <nl> in <nl> let body = <nl> match genv . in_mode with <nl> - | FileInfo . Mdecl <nl> - | FileInfo . Mphp - > <nl> + | FileInfo . Mdecl - > <nl> { N . fb_ast = [ ] ; fb_annotation = Nast . NamedWithUnsafeBlocks } <nl> | FileInfo . Mstrict <nl> | FileInfo . Mpartial - > <nl> and fun_ ctx f = <nl> let f_kind = f . Aast . f_fun_kind in <nl> let body = <nl> match genv . in_mode with <nl> - | FileInfo . Mdecl <nl> - | FileInfo . Mphp - > <nl> + | FileInfo . Mdecl - > <nl> { N . fb_ast = [ ] ; fb_annotation = Nast . NamedWithUnsafeBlocks } <nl> | FileInfo . Mstrict <nl> | FileInfo . Mpartial - > <nl> mmm a / hphp / hack / src / oxidized / gen / file_info . rs <nl> ppp b / hphp / hack / src / oxidized / gen / file_info . rs <nl> <nl> / / This source code is licensed under the MIT license found in the <nl> / / LICENSE file in the " hack " directory of this source tree . <nl> / / <nl> - / / @ generated SignedSource < < 37b0c8b4e70520e242a2532d548348ef > > <nl> + / / @ generated SignedSource < < c97ac7c73c6d806c96cc2de556a289b2 > > <nl> / / <nl> / / To regenerate this file , run : <nl> / / hphp / hack / src / oxidized / regen . sh <nl> pub use prim_defs : : * ; <nl> ToOcamlRep <nl> ) ] <nl> pub enum Mode { <nl> - / / / Do the best you can to support legacy PHP <nl> - Mphp , <nl> / / / just declare signatures , don ' t check anything <nl> Mdecl , <nl> / / / check everything ! <nl> mmm a / hphp / hack / src / oxidized / manual / file_info_impl . rs <nl> ppp b / hphp / hack / src / oxidized / manual / file_info_impl . rs <nl> impl Mode { <nl> _ = > None , <nl> } <nl> } <nl> - <nl> - pub fn is_hh_file ( self ) - > bool { <nl> - Self : : Mphp ! = self <nl> - } <nl> } <nl> <nl> impl TryFrom < u32 > for NameType { <nl> mmm a / hphp / hack / src / parser / aast_parser . rs <nl> ppp b / hphp / hack / src / parser / aast_parser . rs <nl> impl < ' a > AastParser { <nl> mode = Some ( Mode : : Mstrict ) ; <nl> } <nl> let quick_mode = match mode { <nl> - None | Some ( Mode : : Mdecl ) | Some ( Mode : : Mphp ) = > ! env . codegen , <nl> + None | Some ( Mode : : Mdecl ) = > ! env . codegen , <nl> _ = > ! env . codegen & & env . quick_mode , <nl> } ; <nl> let parser_env = ParserEnv { <nl> mmm a / hphp / hack / src / parser / core / lexer . rs <nl> ppp b / hphp / hack / src / parser / core / lexer . rs <nl> impl < ' a , Token : LexableToken < ' a > > Lexer < ' a , Token > { <nl> let name_token_offset = self . offset ; <nl> let ch0 = self . peek_char ( 0 ) . to_ascii_lowercase ( ) ; <nl> let ch1 = self . peek_char ( 1 ) . to_ascii_lowercase ( ) ; <nl> - let ch2 = self . peek_char ( 2 ) . to_ascii_lowercase ( ) ; <nl> - match ( ch0 , ch1 , ch2 ) { <nl> - ( ' h ' , ' h ' , _ ) = > { <nl> + match ( ch0 , ch1 ) { <nl> + ( ' h ' , ' h ' ) = > { <nl> self . make_long_tag ( name_token_offset , 2 , markup_text , less_than_question_token ) <nl> } <nl> - ( ' p ' , ' h ' , ' p ' ) = > { <nl> - self . make_long_tag ( name_token_offset , 3 , markup_text , less_than_question_token ) <nl> - } <nl> _ = > ( markup_text , Some ( ( less_than_question_token , ( None ) ) ) ) , <nl> } <nl> } <nl> mmm a / hphp / hack / src / parser / full_fidelity_ast . ml <nl> ppp b / hphp / hack / src / parser / full_fidelity_ast . ml <nl> let from_text_to_empty_tast ( env : env ) ( source_text : SourceText . t ) : <nl> <nl> let legacy ( x : aast_result ) : Parser_return . t = <nl> { <nl> - Parser_return . file_mode = <nl> - Option . some_if <nl> - ( match x . fi_mode with <nl> - | FileInfo . Mphp - > false <nl> - | _ - > true ) <nl> - x . fi_mode ; <nl> + Parser_return . file_mode = Some x . fi_mode ; <nl> Parser_return . comments = x . comments . sc_comments ; <nl> Parser_return . ast = aast_to_nast x . ast ; <nl> Parser_return . content = x . content ; <nl> mmm a / hphp / hack / src / parser / full_fidelity_syntax_tree . ml <nl> ppp b / hphp / hack / src / parser / full_fidelity_syntax_tree . ml <nl> module WithSyntax ( Syntax : Syntax_sig . Syntax_S ) = struct <nl> <nl> let sc_state tree = tree . state <nl> <nl> - let is_hack tree = <nl> - match tree . mode with <nl> - | Some FileInfo . Mphp - > false <nl> - | _ - > true <nl> - <nl> - let is_php tree = <nl> - match tree . mode with <nl> - | Some FileInfo . Mphp - > true <nl> - | _ - > false <nl> - <nl> let is_strict tree = <nl> match tree . mode with <nl> | Some mode - > FileInfo . is_strict mode <nl> mmm a / hphp / hack / src / parser / full_fidelity_syntax_tree . mli <nl> ppp b / hphp / hack / src / parser / full_fidelity_syntax_tree . mli <nl> module WithSyntax ( Syntax : Syntax_sig . Syntax_S ) : sig <nl> <nl> val mode : t - > FileInfo . mode option <nl> <nl> - val is_hack : t - > bool <nl> - <nl> - val is_php : t - > bool <nl> - <nl> val is_strict : t - > bool <nl> <nl> val is_decl : t - > bool <nl> mmm a / hphp / hack / src / parser / lowerer / lowerer . rs <nl> ppp b / hphp / hack / src / parser / lowerer / lowerer . rs <nl> where <nl> Syntax < T , V > : PositionedSyntaxTrait , <nl> V : SyntaxValueWithKind + SyntaxValueType < T > + std : : fmt : : Debug , <nl> { <nl> - fn mode_annotation ( mode : file_info : : Mode ) - > file_info : : Mode { <nl> - match mode { <nl> - file_info : : Mode : : Mphp = > file_info : : Mode : : Mdecl , <nl> - m = > m , <nl> - } <nl> - } <nl> - <nl> fn p_pos ( node : & Syntax < T , V > , env : & Env ) - > Pos { <nl> node . position_exclusive ( env . indexed_source_text ) <nl> . unwrap_or_else ( | | env . mk_none_pos ( ) ) <nl> where <nl> let fun = ast : : Fun_ { <nl> span : pos . clone ( ) , <nl> annotation : ( ) , <nl> - mode : Self : : mode_annotation ( env . file_mode ( ) ) , <nl> + mode : env . file_mode ( ) , <nl> ret : ast : : TypeHint ( ( ) , ret ) , <nl> name : ast : : Id ( pos , String : : from ( " ; anonymous " ) ) , <nl> tparams : vec ! [ ] , <nl> where <nl> let fun = ast : : Fun_ { <nl> span : Self : : p_pos ( node , env ) , <nl> annotation : ( ) , <nl> - mode : Self : : mode_annotation ( env . file_mode ( ) ) , <nl> + mode : env . file_mode ( ) , <nl> ret : ast : : TypeHint ( <nl> ( ) , <nl> Self : : mp_optional ( Self : : p_hint , & c . anonymous_type , env ) ? , <nl> where <nl> let body = ast : : Fun_ { <nl> span : pos . clone ( ) , <nl> annotation : ( ) , <nl> - mode : Self : : mode_annotation ( env . file_mode ( ) ) , <nl> + mode : env . file_mode ( ) , <nl> ret : ast : : TypeHint ( ( ) , None ) , <nl> name : ast : : Id ( name_pos , String : : from ( " ; anonymous " ) ) , <nl> tparams : vec ! [ ] , <nl> where <nl> Ok ( vec ! [ ast : : Def : : mk_fun ( ast : : Fun_ { <nl> span : Self : : p_fun_pos ( node , env ) , <nl> annotation : ( ) , <nl> - mode : Self : : mode_annotation ( env . file_mode ( ) ) , <nl> + mode : env . file_mode ( ) , <nl> ret , <nl> name : hdr . name , <nl> tparams : hdr . type_parameters , <nl> where <nl> ClassishDeclaration ( c ) if Self : : contains_class_body ( c ) = > { <nl> let mut env = Env : : clone_and_unset_toplevel_if_toplevel ( env ) ; <nl> let env = env . as_mut ( ) ; <nl> - let mode = Self : : mode_annotation ( env . file_mode ( ) ) ; <nl> + let mode = env . file_mode ( ) ; <nl> let user_attributes = Self : : p_user_attributes ( & c . classish_attribute , env ) ? ; <nl> let kinds = Self : : p_kinds ( & c . classish_modifiers , env ) ? ; <nl> let final_ = kinds . has ( modifier : : FINAL ) ; <nl> where <nl> let init = & c . constant_declarator_initializer ; <nl> let gconst = ast : : Gconst { <nl> annotation : ( ) , <nl> - mode : Self : : mode_annotation ( env . file_mode ( ) ) , <nl> + mode : env . file_mode ( ) , <nl> name : Self : : pos_name ( name , env ) ? , <nl> type_ : Self : : mp_optional ( Self : : p_hint , ty , env ) ? , <nl> value : Self : : p_simple_initializer ( init , env ) ? , <nl> where <nl> . collect : : < std : : result : : Result < Vec < Vec < _ > > , _ > > ( ) ? , <nl> ) , <nl> namespace : Self : : mk_empty_ns_env ( env ) , <nl> - mode : Self : : mode_annotation ( env . file_mode ( ) ) , <nl> + mode : env . file_mode ( ) , <nl> vis : match Self : : token_kind ( & c . alias_keyword ) { <nl> Some ( TK : : Type ) = > ast : : TypedefVisibility : : Transparent , <nl> Some ( TK : : Newtype ) = > ast : : TypedefVisibility : : Opaque , <nl> where <nl> } ; <nl> Ok ( vec ! [ ast : : Def : : mk_class ( ast : : Class_ { <nl> annotation : ( ) , <nl> - mode : Self : : mode_annotation ( env . file_mode ( ) ) , <nl> + mode : env . file_mode ( ) , <nl> user_attributes : Self : : p_user_attributes ( & c . enum_attribute_spec , env ) ? , <nl> file_attributes : vec ! [ ] , <nl> final_ : false , <nl> where <nl> emit_id : None , <nl> } ) ] ) <nl> } <nl> - InclusionDirective ( c ) <nl> - if env . file_mode ( ) ! = file_info : : Mode : : Mdecl <nl> - & & env . file_mode ( ) ! = file_info : : Mode : : Mphp <nl> - | | env . codegen ( ) = > <nl> - { <nl> + InclusionDirective ( c ) if env . file_mode ( ) ! = file_info : : Mode : : Mdecl | | env . codegen ( ) = > { <nl> let expr = Self : : p_expr ( & c . inclusion_expression , env ) ? ; <nl> Ok ( vec ! [ ast : : Def : : mk_stmt ( ast : : Stmt : : new ( <nl> Self : : p_pos ( node , env ) , <nl> where <nl> namespace : Self : : mk_empty_ns_env ( env ) , <nl> } ) ] ) <nl> } <nl> - _ if env . file_mode ( ) = = file_info : : Mode : : Mdecl <nl> - | | ( env . file_mode ( ) = = file_info : : Mode : : Mphp & & ! env . codegen ) = > <nl> - { <nl> - Ok ( vec ! [ ] ) <nl> - } <nl> + _ if env . file_mode ( ) = = file_info : : Mode : : Mdecl = > Ok ( vec ! [ ] ) , <nl> _ = > Ok ( vec ! [ ast : : Def : : mk_stmt ( Self : : p_stmt ( node , env ) ? ) ] ) , <nl> } <nl> } <nl> mmm a / hphp / hack / src / parser / mode_parser . rs <nl> ppp b / hphp / hack / src / parser / mode_parser . rs <nl> <nl> <nl> use oxidized : : file_info : : Mode ; <nl> use parser_core_types : : { <nl> - lexable_token : : LexableToken , <nl> parser_env : : ParserEnv , <nl> source_text : : SourceText , <nl> syntax : : { self , SyntaxVariant } , <nl> - token_kind : : TokenKind , <nl> } ; <nl> <nl> pub fn parse_mode ( text : & SourceText ) - > Option < Mode > { <nl> pub fn parse_mode ( text : & SourceText ) - > Option < Mode > { <nl> markup_suffix_name : name , <nl> } = * suffix_children ; <nl> return match & name . syntax { <nl> - SyntaxVariant : : Missing = > Some ( Mode : : Mphp ) , <nl> - SyntaxVariant : : Token ( t ) if t . kind ( ) = = TokenKind : : Equal = > Some ( Mode : : Mphp ) , <nl> + SyntaxVariant : : Missing = > None , <nl> _ = > { <nl> - let is_hhi = text . file_path ( ) . has_extension ( " hhi " ) ; <nl> - let skip_length = <nl> - txt . value . full_width + ltq . value . full_width + name . leading_width ( ) ; <nl> - <nl> - let language = text <nl> - . sub_as_str ( skip_length , name . width ( ) ) <nl> - . to_ascii_lowercase ( ) ; <nl> - if language = = " php " { <nl> - Some ( Mode : : Mphp ) <nl> - } else if is_hhi { <nl> + if text . file_path ( ) . has_extension ( " hhi " ) { <nl> Some ( Mode : : Mdecl ) <nl> } else { <nl> - let skip_length = skip_length + name . width ( ) ; <nl> + let skip_length = txt . value . full_width <nl> + + ltq . value . full_width <nl> + + name . leading_width ( ) <nl> + + name . width ( ) ; <nl> let s = text . sub_as_str ( skip_length , name . trailing_width ( ) ) . trim ( ) ; <nl> <nl> let mut chars = s . chars ( ) ; <nl> mmm a / hphp / hack / src / parser / syntax_tree . rs <nl> ppp b / hphp / hack / src / parser / syntax_tree . rs <nl> where <nl> & self . state <nl> } <nl> <nl> - pub fn is_hack ( & self ) - > bool { <nl> - self . mode ! = Some ( Mode : : Mphp ) <nl> - } <nl> - <nl> - pub fn is_php ( & self ) - > bool { <nl> - self . mode = = Some ( Mode : : Mphp ) <nl> - } <nl> - <nl> pub fn is_strict ( & self ) - > bool { <nl> self . mode = = Some ( Mode : : Mstrict ) <nl> } <nl> mmm a / hphp / hack / src / providers / ast_provider . ml <nl> ppp b / hphp / hack / src / providers / ast_provider . ml <nl> let get_from_local_cache ~ full ctx file_name = <nl> | None - > <nl> let source = Full_fidelity_source_text . make file_name contents in <nl> ( match Full_fidelity_parser . parse_mode source with <nl> - | None <nl> - | Some FileInfo . Mphp - > <nl> - [ ] <nl> + | None - > [ ] <nl> | Some _ - > <nl> ( * It ' s up to Parsing_service to add parsing errors . * ) <nl> Errors . ignore_ @ @ fun ( ) - > <nl> mmm a / hphp / hack / src / providers / partial_provider . ml <nl> ppp b / hphp / hack / src / providers / partial_provider . ml <nl> let should_check_error mode code = <nl> | FileInfo . Mstrict - > true <nl> | FileInfo . Mpartial - > Errors . is_strict_code code <nl> | FileInfo . Mdecl - > false <nl> - | FileInfo . Mphp - > false <nl> mmm a / hphp / hack / src / typing / nast_check / unbound_name_check . ml <nl> ppp b / hphp / hack / src / typing / nast_check / unbound_name_check . ml <nl> let handle_unbound_name env ( pos , name ) kind = <nl> ( ) <nl> else <nl> match env . mode with <nl> - | FileInfo . Mphp - > ( ) <nl> | FileInfo . Mstrict <nl> | FileInfo . Mpartial <nl> | FileInfo . Mdecl - > <nl> mmm a / hphp / hack / src / typing / typing . ml <nl> ppp b / hphp / hack / src / typing / typing . ml <nl> let unbound_name env ( pos , name ) e = <nl> Errors . unbound_name_typing pos name ; <nl> expr_error env ( Reason . Rwitness pos ) e <nl> | FileInfo . Mdecl <nl> - | FileInfo . Mpartial <nl> - | FileInfo . Mphp - > <nl> + | FileInfo . Mpartial - > <nl> expr_any env pos e <nl> <nl> ( * Is this type Traversable < vty > or Container < vty > for some vty ? * ) <nl> mmm a / hphp / hack / test / full_fidelity / cases / context / test_nested_function . php <nl> ppp b / hphp / hack / test / full_fidelity / cases / context / test_nested_function . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> class C { <nl> public function f ( ) { <nl> mmm a / hphp / hack / test / full_fidelity / cases / context / test_nested_function . php . json . exp <nl> ppp b / hphp / hack / test / full_fidelity / cases / context / test_nested_function . php . json . exp <nl> <nl> " kind " : " token " , <nl> " token " : { <nl> " kind " : " name " , <nl> - " text " : " php " , <nl> + " text " : " hh " , <nl> " offset " : 2 , <nl> " leading_width " : 0 , <nl> - " width " : 3 , <nl> + " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 4 , " width " : 1 } ] , <nl> " line_number " : 1 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 6 , <nl> + " offset " : 5 , <nl> " leading_width " : 1 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 12 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 11 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " C " , <nl> - " offset " : 13 , <nl> + " offset " : 12 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 14 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 13 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 15 , <nl> + " offset " : 14 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 16 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 15 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " public " , <nl> " text " : " public " , <nl> - " offset " : 17 , <nl> + " offset " : 16 , <nl> " leading_width " : 2 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 17 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 25 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 16 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 24 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 26 , <nl> + " offset " : 25 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 34 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 33 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " f " , <nl> - " offset " : 35 , <nl> + " offset " : 34 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 36 , <nl> + " offset " : 35 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 37 , <nl> + " offset " : 36 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 38 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 37 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 39 , <nl> + " offset " : 38 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 40 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 39 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " public " , <nl> " text " : " public " , <nl> - " offset " : 41 , <nl> + " offset " : 40 , <nl> " leading_width " : 73 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> <nl> { <nl> " kind " : " whitespace " , <nl> " text " : " " , <nl> - " offset " : 41 , <nl> + " offset " : 40 , <nl> " width " : 26 <nl> } , <nl> { <nl> " kind " : " single_line_comment " , <nl> " text " : " / / ERROR RECOVERY : report missing brace here " , <nl> - " offset " : 67 , <nl> + " offset " : 66 , <nl> " width " : 44 <nl> } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 111 , " width " : 1 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 112 , " width " : 2 } <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 110 , " width " : 1 } , <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 111 , " width " : 2 } <nl> ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 120 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 119 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 121 , <nl> + " offset " : 120 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 129 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 128 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " g " , <nl> - " offset " : 130 , <nl> + " offset " : 129 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 131 , <nl> + " offset " : 130 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 132 , <nl> + " offset " : 131 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 133 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 132 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 134 , <nl> + " offset " : 133 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 135 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 134 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 136 , <nl> + " offset " : 135 , <nl> " leading_width " : 2 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 136 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 139 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 135 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 138 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 140 , <nl> + " offset " : 139 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 56 , <nl> " leading " : [ ] , <nl> " trailing " : [ <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 141 , " width " : 1 } , <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 140 , " width " : 1 } , <nl> { <nl> " kind " : " single_line_comment " , <nl> " text " : " / / instead of reporting it here , as was formerly done . " , <nl> - " offset " : 142 , <nl> + " offset " : 141 , <nl> " width " : 54 <nl> } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 196 , " width " : 1 } <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 195 , " width " : 1 } <nl> ] , <nl> " line_number " : 8 <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 197 , <nl> + " offset " : 196 , <nl> " leading_width " : 166 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 197 , " width " : 1 } , <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 196 , " width " : 1 } , <nl> { <nl> " kind " : " single_line_comment " , <nl> " text " : " / / note that if there * is * a ' } ' at ( 9 , 1 ) , the new behavior will report " , <nl> - " offset " : 198 , <nl> + " offset " : 197 , <nl> " width " : 71 <nl> } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 269 , " width " : 1 } , <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 268 , " width " : 1 } , <nl> { <nl> " kind " : " single_line_comment " , <nl> " text " : " / / two distinct errors : \ " missing ' } ' on line 5 , \ " and \ " extra ' } ' on line 9 . \ " " , <nl> - " offset " : 270 , <nl> + " offset " : 269 , <nl> " width " : 75 <nl> } , <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 344 , " width " : 1 } , <nl> { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 345 , " width " : 1 } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 346 , " width " : 1 } , <nl> - { " kind " : " single_line_comment " , " text " : " / / More cases . " , " offset " : 347 , " width " : 14 } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 361 , " width " : 1 } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 362 , " width " : 1 } <nl> + { " kind " : " single_line_comment " , " text " : " / / More cases . " , " offset " : 346 , " width " : 14 } , <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 360 , " width " : 1 } , <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 361 , " width " : 1 } <nl> ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 368 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 367 , " width " : 1 } ] , <nl> " line_number " : 15 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " C " , <nl> - " offset " : 369 , <nl> + " offset " : 368 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 370 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 369 , " width " : 1 } ] , <nl> " line_number " : 15 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 371 , <nl> + " offset " : 370 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 372 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 371 , " width " : 1 } ] , <nl> " line_number " : 15 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " public " , <nl> " text " : " public " , <nl> - " offset " : 373 , <nl> + " offset " : 372 , <nl> " leading_width " : 2 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 373 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 381 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 372 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 380 , " width " : 1 } ] , <nl> " line_number " : 16 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 382 , <nl> + " offset " : 381 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 390 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 389 , " width " : 1 } ] , <nl> " line_number " : 16 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " f " , <nl> - " offset " : 391 , <nl> + " offset " : 390 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 392 , <nl> + " offset " : 391 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 393 , <nl> + " offset " : 392 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 394 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 393 , " width " : 1 } ] , <nl> " line_number " : 16 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 395 , <nl> + " offset " : 394 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 396 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 395 , " width " : 1 } ] , <nl> " line_number " : 16 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " private " , <nl> " text " : " private " , <nl> - " offset " : 397 , <nl> + " offset " : 396 , <nl> " leading_width " : 73 , <nl> " width " : 7 , <nl> " trailing_width " : 1 , <nl> <nl> { <nl> " kind " : " whitespace " , <nl> " text " : " " , <nl> - " offset " : 397 , <nl> + " offset " : 396 , <nl> " width " : 26 <nl> } , <nl> { <nl> " kind " : " single_line_comment " , <nl> " text " : " / / ERROR RECOVERY : report missing brace here " , <nl> - " offset " : 423 , <nl> + " offset " : 422 , <nl> " width " : 44 <nl> } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 467 , " width " : 1 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 468 , " width " : 2 } <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 466 , " width " : 1 } , <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 467 , " width " : 2 } <nl> ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 477 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 476 , " width " : 1 } ] , <nl> " line_number " : 18 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 478 , <nl> + " offset " : 477 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 486 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 485 , " width " : 1 } ] , <nl> " line_number " : 18 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " g " , <nl> - " offset " : 487 , <nl> + " offset " : 486 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 488 , <nl> + " offset " : 487 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 489 , <nl> + " offset " : 488 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 490 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 489 , " width " : 1 } ] , <nl> " line_number " : 18 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 491 , <nl> + " offset " : 490 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 492 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 491 , " width " : 1 } ] , <nl> " line_number " : 18 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 493 , <nl> + " offset " : 492 , <nl> " leading_width " : 2 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 493 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 496 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 492 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 495 , " width " : 1 } ] , <nl> " line_number " : 19 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 497 , <nl> + " offset " : 496 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 498 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 497 , " width " : 1 } ] , <nl> " line_number " : 20 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 499 , <nl> + " offset " : 498 , <nl> " leading_width " : 1 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 499 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 505 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 498 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 504 , " width " : 1 } ] , <nl> " line_number " : 22 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " C " , <nl> - " offset " : 506 , <nl> + " offset " : 505 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 507 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 506 , " width " : 1 } ] , <nl> " line_number " : 22 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 508 , <nl> + " offset " : 507 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 509 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 508 , " width " : 1 } ] , <nl> " line_number " : 22 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " public " , <nl> " text " : " public " , <nl> - " offset " : 510 , <nl> + " offset " : 509 , <nl> " leading_width " : 2 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 510 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 518 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 509 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 517 , " width " : 1 } ] , <nl> " line_number " : 23 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 519 , <nl> + " offset " : 518 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 527 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 526 , " width " : 1 } ] , <nl> " line_number " : 23 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " f " , <nl> - " offset " : 528 , <nl> + " offset " : 527 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 529 , <nl> + " offset " : 528 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 530 , <nl> + " offset " : 529 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 531 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 530 , " width " : 1 } ] , <nl> " line_number " : 23 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 532 , <nl> + " offset " : 531 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 533 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 532 , " width " : 1 } ] , <nl> " line_number " : 23 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " protected " , <nl> " text " : " protected " , <nl> - " offset " : 534 , <nl> + " offset " : 533 , <nl> " leading_width " : 73 , <nl> " width " : 9 , <nl> " trailing_width " : 1 , <nl> <nl> { <nl> " kind " : " whitespace " , <nl> " text " : " " , <nl> - " offset " : 534 , <nl> + " offset " : 533 , <nl> " width " : 26 <nl> } , <nl> { <nl> " kind " : " single_line_comment " , <nl> " text " : " / / ERROR RECOVERY : report missing brace here " , <nl> - " offset " : 560 , <nl> + " offset " : 559 , <nl> " width " : 44 <nl> } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 604 , " width " : 1 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 605 , " width " : 2 } <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 603 , " width " : 1 } , <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 604 , " width " : 2 } <nl> ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 616 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 615 , " width " : 1 } ] , <nl> " line_number " : 25 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 617 , <nl> + " offset " : 616 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 625 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 624 , " width " : 1 } ] , <nl> " line_number " : 25 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " g " , <nl> - " offset " : 626 , <nl> + " offset " : 625 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 627 , <nl> + " offset " : 626 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 628 , <nl> + " offset " : 627 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 629 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 628 , " width " : 1 } ] , <nl> " line_number " : 25 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 630 , <nl> + " offset " : 629 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 631 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 630 , " width " : 1 } ] , <nl> " line_number " : 25 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 632 , <nl> + " offset " : 631 , <nl> " leading_width " : 2 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 632 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 635 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 631 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 634 , " width " : 1 } ] , <nl> " line_number " : 26 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " public " , <nl> " text " : " public " , <nl> - " offset " : 636 , <nl> + " offset " : 635 , <nl> " leading_width " : 3 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> " leading " : [ <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 636 , " width " : 1 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 637 , " width " : 2 } <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 635 , " width " : 1 } , <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 636 , " width " : 2 } <nl> ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 645 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 644 , " width " : 1 } ] , <nl> " line_number " : 28 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 646 , <nl> + " offset " : 645 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 654 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 653 , " width " : 1 } ] , <nl> " line_number " : 28 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " h " , <nl> - " offset " : 655 , <nl> + " offset " : 654 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 656 , <nl> + " offset " : 655 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 657 , <nl> + " offset " : 656 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 658 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 657 , " width " : 1 } ] , <nl> " line_number " : 28 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 659 , <nl> + " offset " : 658 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 660 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 659 , " width " : 1 } ] , <nl> " line_number " : 28 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 661 , <nl> + " offset " : 660 , <nl> " leading_width " : 2 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 661 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 664 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 660 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 663 , " width " : 1 } ] , <nl> " line_number " : 29 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 665 , <nl> + " offset " : 664 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 666 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 665 , " width " : 1 } ] , <nl> " line_number " : 30 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 667 , <nl> + " offset " : 666 , <nl> " leading_width " : 1 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 667 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 673 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 666 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 672 , " width " : 1 } ] , <nl> " line_number " : 32 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " C " , <nl> - " offset " : 674 , <nl> + " offset " : 673 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 675 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 674 , " width " : 1 } ] , <nl> " line_number " : 32 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 676 , <nl> + " offset " : 675 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 677 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 676 , " width " : 1 } ] , <nl> " line_number " : 32 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " public " , <nl> " text " : " public " , <nl> - " offset " : 678 , <nl> + " offset " : 677 , <nl> " leading_width " : 2 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 678 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 686 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 677 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 685 , " width " : 1 } ] , <nl> " line_number " : 33 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 687 , <nl> + " offset " : 686 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 695 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 694 , " width " : 1 } ] , <nl> " line_number " : 33 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " f " , <nl> - " offset " : 696 , <nl> + " offset " : 695 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 697 , <nl> + " offset " : 696 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 698 , <nl> + " offset " : 697 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 699 , <nl> + " offset " : 698 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 700 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 699 , " width " : 1 } ] , <nl> " line_number " : 33 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 701 , <nl> + " offset " : 700 , <nl> " leading_width " : 3 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 701 , " width " : 1 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 702 , " width " : 2 } <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 700 , " width " : 1 } , <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 701 , " width " : 2 } <nl> ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 712 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 711 , " width " : 1 } ] , <nl> " line_number " : 35 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " g " , <nl> - " offset " : 713 , <nl> + " offset " : 712 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 714 , <nl> + " offset " : 713 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 715 , <nl> + " offset " : 714 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 716 , <nl> + " offset " : 715 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 65 , <nl> " leading " : [ ] , <nl> " trailing " : [ <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 717 , " width " : 1 } , <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 716 , " width " : 1 } , <nl> { <nl> " kind " : " single_line_comment " , <nl> " text " : " / / however , this is still parsed as a function inside method f . " , <nl> - " offset " : 718 , <nl> + " offset " : 717 , <nl> " width " : 63 <nl> } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 781 , " width " : 1 } <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 780 , " width " : 1 } <nl> ] , <nl> " line_number " : 35 <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 782 , <nl> + " offset " : 781 , <nl> " leading_width " : 2 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 782 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 785 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 781 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 784 , " width " : 1 } ] , <nl> " line_number " : 36 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 786 , <nl> + " offset " : 785 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 787 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 786 , " width " : 1 } ] , <nl> " line_number " : 37 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " end_of_file " , <nl> " text " : " " , <nl> - " offset " : 788 , <nl> + " offset " : 787 , <nl> " leading_width " : 30 , <nl> " width " : 0 , <nl> " trailing_width " : 0 , <nl> <nl> { <nl> " kind " : " single_line_comment " , <nl> " text " : " / / missing ' } ' reported here . " , <nl> - " offset " : 788 , <nl> + " offset " : 787 , <nl> " width " : 29 <nl> } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 817 , " width " : 1 } <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 816 , " width " : 1 } <nl> ] , <nl> " trailing " : [ ] , <nl> " line_number " : 39 <nl> <nl> ] <nl> } <nl> } , <nl> - " program_text " : " < ? php \ n \ nclass C { \ n public function f ( ) { \ n / / ERROR RECOVERY : report missing brace here \ n public function g ( ) { \ n } \ n } / / instead of reporting it here , as was formerly done . \ n \ n / / note that if there * is * a ' } ' at ( 9 , 1 ) , the new behavior will report \ n / / two distinct errors : \ " missing ' } ' on line 5 , \ " and \ " extra ' } ' on line 9 . \ " \ n \ n / / More cases . \ n \ nclass C { \ n public function f ( ) { \ n / / ERROR RECOVERY : report missing brace here \ n private function g ( ) { \ n } \ n } \ n \ nclass C { \ n public function f ( ) { \ n / / ERROR RECOVERY : report missing brace here \ n protected function g ( ) { \ n } \ n \ n public function h ( ) { \ n } \ n } \ n \ nclass C { \ n public function f ( ) { \ n \ n function g ( ) { / / however , this is still parsed as a function inside method f . \ n } \ n } \ n / / missing ' } ' reported here . \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> + " program_text " : " < ? hh \ n \ nclass C { \ n public function f ( ) { \ n / / ERROR RECOVERY : report missing brace here \ n public function g ( ) { \ n } \ n } / / instead of reporting it here , as was formerly done . \ n \ n / / note that if there * is * a ' } ' at ( 9 , 1 ) , the new behavior will report \ n / / two distinct errors : \ " missing ' } ' on line 5 , \ " and \ " extra ' } ' on line 9 . \ " \ n \ n / / More cases . \ n \ nclass C { \ n public function f ( ) { \ n / / ERROR RECOVERY : report missing brace here \ n private function g ( ) { \ n } \ n } \ n \ nclass C { \ n public function f ( ) { \ n / / ERROR RECOVERY : report missing brace here \ n protected function g ( ) { \ n } \ n \ n public function h ( ) { \ n } \ n } \ n \ nclass C { \ n public function f ( ) { \ n \ n function g ( ) { / / however , this is still parsed as a function inside method f . \ n } \ n } \ n / / missing ' } ' reported here . \ n " , <nl> + " version " : " 2020 - 06 - 30 - 0000 " <nl> } <nl> mmm a / hphp / hack / test / full_fidelity / cases / function_default_args / call_in_static_vec . php <nl> ppp b / hphp / hack / test / full_fidelity / cases / function_default_args / call_in_static_vec . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> class C { <nl> public static function f ( ) { <nl> mmm a / hphp / hack / test / full_fidelity / cases / function_default_args / call_in_static_vec . php . json . exp <nl> ppp b / hphp / hack / test / full_fidelity / cases / function_default_args / call_in_static_vec . php . json . exp <nl> <nl> " kind " : " token " , <nl> " token " : { <nl> " kind " : " name " , <nl> - " text " : " php " , <nl> + " text " : " hh " , <nl> " offset " : 2 , <nl> " leading_width " : 0 , <nl> - " width " : 3 , <nl> + " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 4 , " width " : 1 } ] , <nl> " line_number " : 1 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 6 , <nl> + " offset " : 5 , <nl> " leading_width " : 1 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 12 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 11 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " C " , <nl> - " offset " : 13 , <nl> + " offset " : 12 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 14 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 13 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 15 , <nl> + " offset " : 14 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 16 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 15 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " public " , <nl> " text " : " public " , <nl> - " offset " : 17 , <nl> + " offset " : 16 , <nl> " leading_width " : 2 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 17 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 25 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 16 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 24 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " static " , <nl> " text " : " static " , <nl> - " offset " : 26 , <nl> + " offset " : 25 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 32 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 31 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 33 , <nl> + " offset " : 32 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 41 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 40 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " f " , <nl> - " offset " : 42 , <nl> + " offset " : 41 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 43 , <nl> + " offset " : 42 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 44 , <nl> + " offset " : 43 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 45 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 44 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 46 , <nl> + " offset " : 45 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 47 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 46 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " return " , <nl> " text " : " return " , <nl> - " offset " : 48 , <nl> + " offset " : 47 , <nl> " leading_width " : 4 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 48 , " width " : 4 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 58 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 47 , " width " : 4 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 57 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " double_quoted_string_literal " , <nl> " text " : " \ " lol \ " " , <nl> - " offset " : 59 , <nl> + " offset " : 58 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 64 , <nl> + " offset " : 63 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 65 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 64 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 66 , <nl> + " offset " : 65 , <nl> " leading_width " : 2 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 66 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 69 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 65 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 68 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 70 , <nl> + " offset " : 69 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 71 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 70 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 72 , <nl> + " offset " : 71 , <nl> " leading_width " : 1 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 72 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 81 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 71 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 80 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " f1 " , <nl> - " offset " : 82 , <nl> + " offset " : 81 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 84 , <nl> + " offset " : 83 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ x " , <nl> - " offset " : 85 , <nl> + " offset " : 84 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 87 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 86 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 88 , <nl> + " offset " : 87 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 89 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 88 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " vec " , <nl> " text " : " vec " , <nl> - " offset " : 90 , <nl> + " offset " : 89 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " [ " , <nl> " text " : " [ " , <nl> - " offset " : 93 , <nl> + " offset " : 92 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " C " , <nl> - " offset " : 94 , <nl> + " offset " : 93 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " : : " , <nl> " text " : " : : " , <nl> - " offset " : 95 , <nl> + " offset " : 94 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " f " , <nl> - " offset " : 97 , <nl> + " offset " : 96 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 98 , <nl> + " offset " : 97 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 99 , <nl> + " offset " : 98 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ] " , <nl> " text " : " ] " , <nl> - " offset " : 100 , <nl> + " offset " : 99 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 101 , <nl> + " offset " : 100 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " : " , <nl> " text " : " : " , <nl> - " offset " : 102 , <nl> + " offset " : 101 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 103 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 102 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " void " , <nl> " text " : " void " , <nl> - " offset " : 104 , <nl> + " offset " : 103 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 108 , <nl> + " offset " : 107 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 109 , <nl> + " offset " : 108 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 110 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 109 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " end_of_file " , <nl> " text " : " " , <nl> - " offset " : 111 , <nl> + " offset " : 110 , <nl> " leading_width " : 0 , <nl> " width " : 0 , <nl> " trailing_width " : 0 , <nl> <nl> ] <nl> } <nl> } , <nl> - " program_text " : " < ? php \ n \ nclass C { \ n public static function f ( ) { \ n return \ " lol \ " ; \ n } \ n } \ n \ nfunction f1 ( $ x = vec [ C : : f ( ) ] ) : void { } \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> + " program_text " : " < ? hh \ n \ nclass C { \ n public static function f ( ) { \ n return \ " lol \ " ; \ n } \ n } \ n \ nfunction f1 ( $ x = vec [ C : : f ( ) ] ) : void { } \ n " , <nl> + " version " : " 2020 - 06 - 30 - 0000 " <nl> } <nl> mmm a / hphp / hack / test / full_fidelity / cases / function_default_args / call_in_static_vec_like_array . php <nl> ppp b / hphp / hack / test / full_fidelity / cases / function_default_args / call_in_static_vec_like_array . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> class C { <nl> public static function f ( ) { <nl> mmm a / hphp / hack / test / full_fidelity / cases / function_default_args / call_in_static_vec_like_array . php . json . exp <nl> ppp b / hphp / hack / test / full_fidelity / cases / function_default_args / call_in_static_vec_like_array . php . json . exp <nl> <nl> " kind " : " token " , <nl> " token " : { <nl> " kind " : " name " , <nl> - " text " : " php " , <nl> + " text " : " hh " , <nl> " offset " : 2 , <nl> " leading_width " : 0 , <nl> - " width " : 3 , <nl> + " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 4 , " width " : 1 } ] , <nl> " line_number " : 1 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 6 , <nl> + " offset " : 5 , <nl> " leading_width " : 1 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 12 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 11 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " C " , <nl> - " offset " : 13 , <nl> + " offset " : 12 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 14 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 13 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 15 , <nl> + " offset " : 14 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 16 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 15 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " public " , <nl> " text " : " public " , <nl> - " offset " : 17 , <nl> + " offset " : 16 , <nl> " leading_width " : 2 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 17 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 25 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 16 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 24 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " static " , <nl> " text " : " static " , <nl> - " offset " : 26 , <nl> + " offset " : 25 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 32 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 31 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 33 , <nl> + " offset " : 32 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 41 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 40 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " f " , <nl> - " offset " : 42 , <nl> + " offset " : 41 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 43 , <nl> + " offset " : 42 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 44 , <nl> + " offset " : 43 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 45 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 44 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 46 , <nl> + " offset " : 45 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 47 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 46 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " return " , <nl> " text " : " return " , <nl> - " offset " : 48 , <nl> + " offset " : 47 , <nl> " leading_width " : 4 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 48 , " width " : 4 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 58 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 47 , " width " : 4 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 57 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " double_quoted_string_literal " , <nl> " text " : " \ " lol \ " " , <nl> - " offset " : 59 , <nl> + " offset " : 58 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 64 , <nl> + " offset " : 63 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 65 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 64 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 66 , <nl> + " offset " : 65 , <nl> " leading_width " : 2 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 66 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 69 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 65 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 68 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 70 , <nl> + " offset " : 69 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 71 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 70 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 72 , <nl> + " offset " : 71 , <nl> " leading_width " : 1 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 72 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 81 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 71 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 80 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " f " , <nl> - " offset " : 82 , <nl> + " offset " : 81 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 83 , <nl> + " offset " : 82 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ x " , <nl> - " offset " : 84 , <nl> + " offset " : 83 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 86 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 85 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 87 , <nl> + " offset " : 86 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 88 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 87 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " varray " , <nl> " text " : " varray " , <nl> - " offset " : 89 , <nl> + " offset " : 88 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " [ " , <nl> " text " : " [ " , <nl> - " offset " : 95 , <nl> + " offset " : 94 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " C " , <nl> - " offset " : 96 , <nl> + " offset " : 95 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " : : " , <nl> " text " : " : : " , <nl> - " offset " : 97 , <nl> + " offset " : 96 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " f " , <nl> - " offset " : 99 , <nl> + " offset " : 98 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 100 , <nl> + " offset " : 99 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 101 , <nl> + " offset " : 100 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ] " , <nl> " text " : " ] " , <nl> - " offset " : 102 , <nl> + " offset " : 101 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 103 , <nl> + " offset " : 102 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " : " , <nl> " text " : " : " , <nl> - " offset " : 104 , <nl> + " offset " : 103 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 105 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 104 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " void " , <nl> " text " : " void " , <nl> - " offset " : 106 , <nl> + " offset " : 105 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 110 , <nl> + " offset " : 109 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 111 , <nl> + " offset " : 110 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 112 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 111 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " end_of_file " , <nl> " text " : " " , <nl> - " offset " : 113 , <nl> + " offset " : 112 , <nl> " leading_width " : 0 , <nl> " width " : 0 , <nl> " trailing_width " : 0 , <nl> <nl> ] <nl> } <nl> } , <nl> - " program_text " : " < ? php \ n \ nclass C { \ n public static function f ( ) { \ n return \ " lol \ " ; \ n } \ n } \ n \ nfunction f ( $ x = varray [ C : : f ( ) ] ) : void { } \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> + " program_text " : " < ? hh \ n \ nclass C { \ n public static function f ( ) { \ n return \ " lol \ " ; \ n } \ n } \ n \ nfunction f ( $ x = varray [ C : : f ( ) ] ) : void { } \ n " , <nl> + " version " : " 2020 - 06 - 30 - 0000 " <nl> } <nl> deleted file mode 100644 <nl> index ed84c9a369a . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php1 . php <nl> ppp / dev / null <nl> <nl> - < ? php <nl> - <nl> - class inout { } <nl> - <nl> - function foo ( ) : inout { <nl> - return new inout ( ) ; <nl> - } <nl> - <nl> - class bar extends inout { } <nl> - <nl> - <nl> - <nl> - <nl> - class suspend { } <nl> - <nl> - function s ( ) : suspend { <nl> - return new suspend ( ) ; <nl> - } <nl> - <nl> - class S extends suspend { } <nl> deleted file mode 100644 <nl> index 61b34f82790 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php1 . php . errors . exp <nl> ppp / dev / null <nl> <nl> - ( 3 , 7 ) - ( 3 , 7 ) A name is expected here . <nl> - ( 3 , 7 ) - ( 3 , 12 ) Encountered unexpected token ' inout ' . <nl> - ( 5 , 17 ) - ( 5 , 22 ) A type specifier is expected here . <nl> - ( 6 , 14 ) - ( 6 , 19 ) Unexpected node on right hand side of new or instanceof : token <nl> - ( 6 , 19 ) - ( 6 , 19 ) An expression is expected here . <nl> - ( 9 , 19 ) - ( 9 , 19 ) A type specifier is expected here . <nl> - ( 9 , 19 ) - ( 9 , 24 ) Encountered unexpected token ' inout ' . <nl> - ( 16 , 15 ) - ( 16 , 22 ) A type specifier is expected here . <nl> - ( 17 , 14 ) - ( 17 , 23 ) A constructor initializing an object must be passed a ( possibly empty ) list of arguments . Did you mean ' new suspend ( ) ( ) ' ? <nl> - ( 17 , 14 ) - ( 17 , 23 ) Unexpected node on right hand side of new or instanceof : prefix_unary_expression <nl> - ( 17 , 23 ) - ( 17 , 23 ) An expression is expected here . <nl> - ( 20 , 17 ) - ( 20 , 17 ) A type specifier is expected here . <nl> - ( 20 , 17 ) - ( 20 , 24 ) Encountered unexpected token ' suspend ' . <nl> deleted file mode 100644 <nl> index bf4d38180dc . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php1 . php . json . exp <nl> ppp / dev / null <nl> <nl> - { <nl> - " parse_tree " : { <nl> - " kind " : " script " , <nl> - " script_declarations " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " markup_section " , <nl> - " markup_text " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " markup " , <nl> - " text " : " " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix " : { <nl> - " kind " : " markup_suffix " , <nl> - " markup_suffix_less_than_question " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " < ? " , <nl> - " text " : " < ? " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " php " , <nl> - " offset " : 2 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> - " line_number " : 1 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 6 , <nl> - " leading_width " : 1 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 12 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " classish_name " : { " kind " : " missing " } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 19 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ n \ nfu " , " offset " : 20 , " width " : 5 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 18 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 20 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 21 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 22 , <nl> - " leading_width " : 1 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 22 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 31 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " foo " , <nl> - " offset " : 32 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 35 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 36 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_colon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " : " , <nl> - " text " : " : " , <nl> - " offset " : 37 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 38 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_type " : { <nl> - " kind " : " error " , <nl> - " error_error " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " inout " , <nl> - " text " : " inout " , <nl> - " offset " : 39 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 44 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } <nl> - } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 45 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 46 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " compound_statements " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " return_statement " , <nl> - " return_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " return " , <nl> - " text " : " return " , <nl> - " offset " : 47 , <nl> - " leading_width " : 2 , <nl> - " width " : 6 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 47 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 55 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " return_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 56 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 59 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " inout " , <nl> - " text " : " inout " , <nl> - " offset " : 60 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 65 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 66 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 6 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " return_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 67 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 68 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } <nl> - } <nl> - ] <nl> - } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 69 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 70 , " width " : 1 } ] , <nl> - " line_number " : 7 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 71 , <nl> - " leading_width " : 1 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 71 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 77 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " bar " , <nl> - " offset " : 78 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 81 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " extends " , <nl> - " text " : " extends " , <nl> - " offset " : 82 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 89 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_extends_list " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " list_item " , <nl> - " list_item " : { " kind " : " missing " } , <nl> - " list_separator " : { " kind " : " missing " } <nl> - } <nl> - ] <nl> - } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 96 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ n \ n \ n \ n " , " offset " : 97 , " width " : 5 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 95 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 97 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 98 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 99 , <nl> - " leading_width " : 4 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 99 , " width " : 1 } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 100 , " width " : 1 } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 101 , " width " : 1 } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 102 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 108 , " width " : 1 } ] , <nl> - " line_number " : 14 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " suspend " , <nl> - " offset " : 109 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 116 , " width " : 1 } ] , <nl> - " line_number " : 14 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 117 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 14 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 118 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 119 , " width " : 1 } ] , <nl> - " line_number " : 14 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 120 , <nl> - " leading_width " : 1 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 120 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 129 , " width " : 1 } ] , <nl> - " line_number " : 16 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " s " , <nl> - " offset " : 130 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 16 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 131 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 16 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 132 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 16 <nl> - } <nl> - } , <nl> - " function_colon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " : " , <nl> - " text " : " : " , <nl> - " offset " : 133 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 134 , " width " : 1 } ] , <nl> - " line_number " : 16 <nl> - } <nl> - } , <nl> - " function_type " : { <nl> - " kind " : " error " , <nl> - " error_error " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " suspend " , <nl> - " text " : " suspend " , <nl> - " offset " : 135 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 142 , " width " : 1 } ] , <nl> - " line_number " : 16 <nl> - } <nl> - } <nl> - } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 143 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 144 , " width " : 1 } ] , <nl> - " line_number " : 16 <nl> - } <nl> - } , <nl> - " compound_statements " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " return_statement " , <nl> - " return_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " return " , <nl> - " text " : " return " , <nl> - " offset " : 145 , <nl> - " leading_width " : 2 , <nl> - " width " : 6 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 145 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 153 , " width " : 1 } ] , <nl> - " line_number " : 17 <nl> - } <nl> - } , <nl> - " return_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 154 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 157 , " width " : 1 } ] , <nl> - " line_number " : 17 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " prefix_unary_expression " , <nl> - " prefix_unary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " suspend " , <nl> - " text " : " suspend " , <nl> - " offset " : 158 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 17 <nl> - } <nl> - } , <nl> - " prefix_unary_operand " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 165 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 17 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 166 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 17 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { " kind " : " missing " } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { " kind " : " missing " } <nl> - } <nl> - } , <nl> - " return_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 167 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 168 , " width " : 1 } ] , <nl> - " line_number " : 17 <nl> - } <nl> - } <nl> - } <nl> - ] <nl> - } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 169 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 170 , " width " : 1 } ] , <nl> - " line_number " : 18 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 171 , <nl> - " leading_width " : 1 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 171 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 177 , " width " : 1 } ] , <nl> - " line_number " : 20 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " S " , <nl> - " offset " : 178 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 179 , " width " : 1 } ] , <nl> - " line_number " : 20 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " extends " , <nl> - " text " : " extends " , <nl> - " offset " : 180 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 187 , " width " : 1 } ] , <nl> - " line_number " : 20 <nl> - } <nl> - } , <nl> - " classish_extends_list " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " list_item " , <nl> - " list_item " : { " kind " : " missing " } , <nl> - " list_separator " : { " kind " : " missing " } <nl> - } <nl> - ] <nl> - } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 196 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ n " , " offset " : 197 , " width " : 7 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 195 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 20 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 197 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 198 , " width " : 1 } ] , <nl> - " line_number " : 20 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " end_of_file " , <nl> - " end_of_file_token " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " end_of_file " , <nl> - " text " : " " , <nl> - " offset " : 199 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 21 <nl> - } <nl> - } <nl> - } <nl> - ] <nl> - } <nl> - } , <nl> - " program_text " : " < ? php \ n \ nclass inout { } \ n \ nfunction foo ( ) : inout { \ n return new inout ( ) ; \ n } \ n \ nclass bar extends inout { } \ n \ n \ n \ n \ nclass suspend { } \ n \ nfunction s ( ) : suspend { \ n return new suspend ( ) ; \ n } \ n \ nclass S extends suspend { } \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> - } <nl> deleted file mode 100644 <nl> index 7fa5f2a1dab . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php2 . php <nl> ppp / dev / null <nl> <nl> - < ? php <nl> - <nl> - class using { } <nl> - <nl> - function foo ( ) : using { <nl> - return new using ( ) ; <nl> - } <nl> - <nl> - class bar extends using { } <nl> deleted file mode 100644 <nl> index 1e3db7b3e6f . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php2 . php . errors . exp <nl> ppp / dev / null <nl> <nl> - ( 3 , 7 ) - ( 3 , 7 ) A name is expected here . <nl> - ( 3 , 7 ) - ( 3 , 12 ) Encountered unexpected token ' using ' . <nl> - ( 5 , 17 ) - ( 5 , 22 ) A type specifier is expected here . <nl> - ( 6 , 14 ) - ( 6 , 19 ) Unexpected node on right hand side of new or instanceof : token <nl> - ( 6 , 19 ) - ( 6 , 19 ) An expression is expected here . <nl> - ( 9 , 19 ) - ( 9 , 19 ) A type specifier is expected here . <nl> - ( 9 , 19 ) - ( 9 , 24 ) Encountered unexpected token ' using ' . <nl> deleted file mode 100644 <nl> index d813ccc1831 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php2 . php . json . exp <nl> ppp / dev / null <nl> <nl> - { <nl> - " parse_tree " : { <nl> - " kind " : " script " , <nl> - " script_declarations " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " markup_section " , <nl> - " markup_text " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " markup " , <nl> - " text " : " " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix " : { <nl> - " kind " : " markup_suffix " , <nl> - " markup_suffix_less_than_question " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " < ? " , <nl> - " text " : " < ? " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " php " , <nl> - " offset " : 2 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> - " line_number " : 1 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 6 , <nl> - " leading_width " : 1 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 12 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " classish_name " : { " kind " : " missing " } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 19 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ n \ nfu " , " offset " : 20 , " width " : 5 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 18 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 20 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 21 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 22 , <nl> - " leading_width " : 1 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 22 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 31 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " foo " , <nl> - " offset " : 32 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 35 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 36 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_colon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " : " , <nl> - " text " : " : " , <nl> - " offset " : 37 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 38 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_type " : { <nl> - " kind " : " error " , <nl> - " error_error " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " using " , <nl> - " text " : " using " , <nl> - " offset " : 39 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 44 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } <nl> - } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 45 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 46 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " compound_statements " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " return_statement " , <nl> - " return_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " return " , <nl> - " text " : " return " , <nl> - " offset " : 47 , <nl> - " leading_width " : 2 , <nl> - " width " : 6 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 47 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 55 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " return_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 56 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 59 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " using " , <nl> - " text " : " using " , <nl> - " offset " : 60 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 65 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 66 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 6 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " return_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 67 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 68 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } <nl> - } <nl> - ] <nl> - } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 69 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 70 , " width " : 1 } ] , <nl> - " line_number " : 7 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 71 , <nl> - " leading_width " : 1 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 71 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 77 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " bar " , <nl> - " offset " : 78 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 81 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " extends " , <nl> - " text " : " extends " , <nl> - " offset " : 82 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 89 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_extends_list " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " list_item " , <nl> - " list_item " : { " kind " : " missing " } , <nl> - " list_separator " : { " kind " : " missing " } <nl> - } <nl> - ] <nl> - } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 96 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ n " , " offset " : 97 , " width " : 5 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 95 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 97 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 98 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " end_of_file " , <nl> - " end_of_file_token " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " end_of_file " , <nl> - " text " : " " , <nl> - " offset " : 99 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 10 <nl> - } <nl> - } <nl> - } <nl> - ] <nl> - } <nl> - } , <nl> - " program_text " : " < ? php \ n \ nclass using { } \ n \ nfunction foo ( ) : using { \ n return new using ( ) ; \ n } \ n \ nclass bar extends using { } \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> - } <nl> deleted file mode 100644 <nl> index b6a4248a5da . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php3 . php <nl> ppp / dev / null <nl> <nl> - < ? php <nl> - <nl> - class async { } <nl> - class attribute { } <nl> - class await { } <nl> - class category { } <nl> - class children { } <nl> - class classname { } <nl> - class coroutine { } <nl> - class darray { } <nl> - class dict { } <nl> - class enum { } <nl> - class fallthrough { } <nl> - class inout { } <nl> - class is { } <nl> - class keyset { } <nl> - class let { } <nl> - class newtype { } <nl> - class num { } <nl> - class required { } <nl> - class shape { } <nl> - class suspend { } <nl> - class tuple { } <nl> - class type { } <nl> - class using { } <nl> - class varray { } <nl> - class vec { } <nl> - class where { } <nl> - <nl> - new async ( ) ; <nl> - new attribute ( ) ; <nl> - new await ( ) ; <nl> - new category ( ) ; <nl> - new children ( ) ; <nl> - new classname ( ) ; <nl> - new coroutine ( ) ; <nl> - new darray ( ) ; <nl> - new dict ( ) ; <nl> - new enum ( ) ; <nl> - new fallthrough ( ) ; <nl> - new inout ( ) ; <nl> - new is ( ) ; <nl> - new keyset ( ) ; <nl> - new let ( ) ; <nl> - new newtype ( ) ; <nl> - new num ( ) ; <nl> - new required ( ) ; <nl> - new shape ( ) ; <nl> - new suspend ( ) ; <nl> - new tuple ( ) ; <nl> - new type ( ) ; <nl> - new using ( ) ; <nl> - new varray ( ) ; <nl> - new vec ( ) ; <nl> - new where ( ) ; <nl> - <nl> - function async ( ) { } <nl> - function attribute ( ) { } <nl> - function await ( ) { } <nl> - function category ( ) { } <nl> - function children ( ) { } <nl> - function classname ( ) { } <nl> - function coroutine ( ) { } <nl> - function darray ( ) { } <nl> - function dict ( ) { } <nl> - function enum ( ) { } <nl> - function fallthrough ( ) { } <nl> - function inout ( ) { } <nl> - function is ( ) { } <nl> - function keyset ( ) { } <nl> - function let ( ) { } <nl> - function newtype ( ) { } <nl> - function num ( ) { } <nl> - function required ( ) { } <nl> - function shape ( ) { } <nl> - function suspend ( ) { } <nl> - function tuple ( ) { } <nl> - function type ( ) { } <nl> - function using ( ) { } <nl> - function varray ( ) { } <nl> - function vec ( ) { } <nl> - function where ( ) { } <nl> - <nl> - <nl> - async ( ) ; <nl> - attribute ( ) ; <nl> - await ( ) ; <nl> - category ( ) ; <nl> - children ( ) ; <nl> - classname ( ) ; <nl> - coroutine ( ) ; <nl> - darray ( ) ; <nl> - dict ( ) ; <nl> - enum ( ) ; <nl> - fallthrough ( ) ; <nl> - inout ( ) ; <nl> - is ( ) ; <nl> - keyset ( ) ; <nl> - let ( ) ; <nl> - newtype ( ) ; <nl> - num ( ) ; <nl> - required ( ) ; <nl> - shape ( ) ; <nl> - suspend ( ) ; <nl> - tuple ( ) ; <nl> - type ( ) ; <nl> - using ( ) ; <nl> - varray ( ) ; <nl> - vec ( ) ; <nl> - where ( ) ; <nl> deleted file mode 100644 <nl> index 78e91e76b37 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php3 . php . errors . exp <nl> ppp / dev / null <nl> <nl> - ( 3 , 7 ) - ( 3 , 7 ) A name is expected here . <nl> - ( 3 , 7 ) - ( 3 , 12 ) Encountered unexpected token ' async ' . <nl> - ( 5 , 7 ) - ( 5 , 7 ) A name is expected here . <nl> - ( 5 , 7 ) - ( 5 , 12 ) Encountered unexpected token ' await ' . <nl> - ( 8 , 7 ) - ( 8 , 16 ) Cannot use ' classname ' as class name as it is reserved <nl> - ( 10 , 7 ) - ( 10 , 13 ) Cannot use ' darray ' as class name as it is reserved <nl> - ( 14 , 7 ) - ( 14 , 7 ) A name is expected here . <nl> - ( 14 , 7 ) - ( 14 , 12 ) Encountered unexpected token ' inout ' . <nl> - ( 20 , 7 ) - ( 20 , 7 ) A name is expected here . <nl> - ( 20 , 7 ) - ( 20 , 15 ) Encountered unexpected token ' required ' . <nl> - ( 21 , 7 ) - ( 21 , 7 ) A name is expected here . <nl> - ( 21 , 7 ) - ( 21 , 12 ) Encountered unexpected token ' shape ' . <nl> - ( 23 , 7 ) - ( 23 , 7 ) A name is expected here . <nl> - ( 23 , 7 ) - ( 23 , 12 ) Encountered unexpected token ' tuple ' . <nl> - ( 25 , 7 ) - ( 25 , 7 ) A name is expected here . <nl> - ( 25 , 7 ) - ( 25 , 12 ) Encountered unexpected token ' using ' . <nl> - ( 26 , 7 ) - ( 26 , 13 ) Cannot use ' varray ' as class name as it is reserved <nl> - ( 30 , 5 ) - ( 30 , 12 ) A constructor initializing an object must be passed a ( possibly empty ) list of arguments . Did you mean ' new async ( ) ( ) ' ? <nl> - ( 30 , 5 ) - ( 30 , 12 ) Unexpected node on right hand side of new or instanceof : lambda_expression <nl> - ( 30 , 12 ) - ( 30 , 12 ) A lambda arrow ( ' = = > ' ) is expected here . <nl> - ( 32 , 5 ) - ( 32 , 12 ) A constructor initializing an object must be passed a ( possibly empty ) list of arguments . Did you mean ' new await ( ) ( ) ' ? <nl> - ( 32 , 5 ) - ( 32 , 12 ) Unexpected node on right hand side of new or instanceof : prefix_unary_expression <nl> - ( 32 , 12 ) - ( 32 , 12 ) An expression is expected here . <nl> - ( 36 , 5 ) - ( 36 , 16 ) A constructor initializing an object must be passed a ( possibly empty ) list of arguments . Did you mean ' new coroutine ( ) ( ) ' ? <nl> - ( 36 , 5 ) - ( 36 , 16 ) Unexpected node on right hand side of new or instanceof : lambda_expression <nl> - ( 36 , 16 ) - ( 36 , 16 ) A lambda arrow ( ' = = > ' ) is expected here . <nl> - ( 41 , 5 ) - ( 41 , 10 ) Unexpected node on right hand side of new or instanceof : token <nl> - ( 41 , 10 ) - ( 41 , 10 ) An expression is expected here . <nl> - ( 47 , 5 ) - ( 47 , 13 ) Unexpected node on right hand side of new or instanceof : token <nl> - ( 47 , 13 ) - ( 47 , 13 ) An expression is expected here . <nl> - ( 48 , 5 ) - ( 48 , 12 ) A constructor initializing an object must be passed a ( possibly empty ) list of arguments . Did you mean ' new shape ( ) ( ) ' ? <nl> - ( 48 , 5 ) - ( 48 , 12 ) Unexpected node on right hand side of new or instanceof : shape_expression <nl> - ( 49 , 5 ) - ( 49 , 14 ) A constructor initializing an object must be passed a ( possibly empty ) list of arguments . Did you mean ' new suspend ( ) ( ) ' ? <nl> - ( 49 , 5 ) - ( 49 , 14 ) Unexpected node on right hand side of new or instanceof : prefix_unary_expression <nl> - ( 49 , 14 ) - ( 49 , 14 ) An expression is expected here . <nl> - ( 50 , 5 ) - ( 50 , 12 ) A constructor initializing an object must be passed a ( possibly empty ) list of arguments . Did you mean ' new tuple ( ) ( ) ' ? <nl> - ( 50 , 5 ) - ( 50 , 12 ) Unexpected node on right hand side of new or instanceof : tuple_expression <nl> - ( 52 , 5 ) - ( 52 , 10 ) Unexpected node on right hand side of new or instanceof : token <nl> - ( 52 , 10 ) - ( 52 , 10 ) An expression is expected here . <nl> - ( 57 , 15 ) - ( 57 , 15 ) A name or __construct keyword is expected here . <nl> - ( 59 , 15 ) - ( 59 , 15 ) A name or __construct keyword is expected here . <nl> - ( 68 , 15 ) - ( 68 , 15 ) A name or __construct keyword is expected here . <nl> - ( 74 , 18 ) - ( 74 , 18 ) A name or __construct keyword is expected here . <nl> - ( 75 , 15 ) - ( 75 , 15 ) A name or __construct keyword is expected here . <nl> - ( 77 , 15 ) - ( 77 , 15 ) A name or __construct keyword is expected here . <nl> - ( 79 , 15 ) - ( 79 , 15 ) A name or __construct keyword is expected here . <nl> - ( 85 , 8 ) - ( 85 , 8 ) A lambda arrow ( ' = = > ' ) is expected here . <nl> - ( 87 , 8 ) - ( 87 , 8 ) An expression is expected here . <nl> - ( 91 , 12 ) - ( 91 , 12 ) A lambda arrow ( ' = = > ' ) is expected here . <nl> - ( 94 , 5 ) - ( 94 , 5 ) A name is expected here . <nl> - ( 94 , 6 ) - ( 94 , 6 ) A type specifier is expected here . <nl> - ( 94 , 7 ) - ( 94 , 7 ) A left brace ( ' { ' ) is expected here . <nl> - ( 94 , 7 ) - ( 94 , 8 ) Invalid expression in constant initializer <nl> - ( 94 , 8 ) - ( 95 , 1 ) An expression is expected here . <nl> - ( 95 , 12 ) - ( 95 , 12 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 95 , 13 ) - ( 95 , 14 ) Invalid expression in constant initializer <nl> - ( 95 , 14 ) - ( 95 , 14 ) An expression is expected here . <nl> - ( 96 , 6 ) - ( 96 , 6 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 96 , 7 ) - ( 96 , 8 ) Invalid expression in constant initializer <nl> - ( 96 , 8 ) - ( 96 , 8 ) An expression is expected here . <nl> - ( 97 , 3 ) - ( 97 , 3 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 97 , 4 ) - ( 97 , 5 ) Invalid expression in constant initializer <nl> - ( 97 , 5 ) - ( 97 , 5 ) An expression is expected here . <nl> - ( 98 , 7 ) - ( 98 , 7 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 98 , 8 ) - ( 98 , 9 ) Invalid expression in constant initializer <nl> - ( 98 , 9 ) - ( 98 , 9 ) An expression is expected here . <nl> - ( 99 , 4 ) - ( 99 , 4 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 99 , 5 ) - ( 99 , 6 ) Invalid expression in constant initializer <nl> - ( 99 , 6 ) - ( 99 , 6 ) An expression is expected here . <nl> - ( 100 , 8 ) - ( 100 , 8 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 100 , 9 ) - ( 100 , 10 ) Invalid expression in constant initializer <nl> - ( 100 , 10 ) - ( 100 , 10 ) An expression is expected here . <nl> - ( 101 , 4 ) - ( 101 , 4 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 101 , 5 ) - ( 101 , 6 ) Invalid expression in constant initializer <nl> - ( 101 , 6 ) - ( 101 , 6 ) An expression is expected here . <nl> - ( 102 , 9 ) - ( 102 , 9 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 102 , 10 ) - ( 102 , 11 ) Invalid expression in constant initializer <nl> - ( 102 , 11 ) - ( 102 , 11 ) An expression is expected here . <nl> - ( 103 , 6 ) - ( 103 , 6 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 103 , 7 ) - ( 103 , 8 ) Invalid expression in constant initializer <nl> - ( 103 , 8 ) - ( 103 , 8 ) An expression is expected here . <nl> - ( 104 , 8 ) - ( 104 , 8 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 104 , 9 ) - ( 104 , 10 ) Invalid expression in constant initializer <nl> - ( 104 , 10 ) - ( 104 , 10 ) An expression is expected here . <nl> - ( 105 , 6 ) - ( 105 , 6 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 105 , 7 ) - ( 105 , 8 ) Invalid expression in constant initializer <nl> - ( 105 , 8 ) - ( 105 , 8 ) An expression is expected here . <nl> - ( 106 , 5 ) - ( 106 , 5 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 106 , 6 ) - ( 106 , 7 ) Invalid expression in constant initializer <nl> - ( 106 , 7 ) - ( 106 , 7 ) An expression is expected here . <nl> - ( 107 , 6 ) - ( 107 , 6 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 107 , 7 ) - ( 107 , 8 ) Invalid expression in constant initializer <nl> - ( 107 , 8 ) - ( 107 , 8 ) An expression is expected here . <nl> - ( 108 , 7 ) - ( 108 , 7 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 108 , 8 ) - ( 108 , 9 ) Invalid expression in constant initializer <nl> - ( 108 , 9 ) - ( 108 , 9 ) An expression is expected here . <nl> - ( 109 , 4 ) - ( 109 , 4 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 109 , 5 ) - ( 109 , 6 ) Invalid expression in constant initializer <nl> - ( 109 , 6 ) - ( 109 , 6 ) An expression is expected here . <nl> - ( 110 , 6 ) - ( 110 , 6 ) An equals sign ( ' = ' ) is expected here . <nl> - ( 110 , 7 ) - ( 110 , 8 ) Invalid expression in constant initializer <nl> - ( 110 , 8 ) - ( 110 , 8 ) An expression is expected here . <nl> - ( 110 , 9 ) - ( 111 , 1 ) A right brace ( ' } ' ) is expected here . <nl> deleted file mode 100644 <nl> index 9ea519b3654 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php3 . php . json . exp <nl> ppp / dev / null <nl> <nl> - { <nl> - " parse_tree " : { <nl> - " kind " : " script " , <nl> - " script_declarations " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " markup_section " , <nl> - " markup_text " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " markup " , <nl> - " text " : " " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix " : { <nl> - " kind " : " markup_suffix " , <nl> - " markup_suffix_less_than_question " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " < ? " , <nl> - " text " : " < ? " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " php " , <nl> - " offset " : 2 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> - " line_number " : 1 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 6 , <nl> - " leading_width " : 1 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 12 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " classish_name " : { " kind " : " missing " } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 19 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ ncla " , " offset " : 20 , " width " : 5 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 18 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 20 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 21 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 22 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 27 , " width " : 1 } ] , <nl> - " line_number " : 4 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " attribute " , <nl> - " offset " : 28 , <nl> - " leading_width " : 0 , <nl> - " width " : 9 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 37 , " width " : 1 } ] , <nl> - " line_number " : 4 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 38 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 4 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 39 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 40 , " width " : 1 } ] , <nl> - " line_number " : 4 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 41 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 46 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " classish_name " : { " kind " : " missing " } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 53 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ ncla " , " offset " : 54 , " width " : 5 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 52 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 54 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 55 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 56 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 61 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " category " , <nl> - " offset " : 62 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 70 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 71 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 72 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 73 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 74 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 79 , " width " : 1 } ] , <nl> - " line_number " : 7 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " children " , <nl> - " offset " : 80 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 88 , " width " : 1 } ] , <nl> - " line_number " : 7 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 89 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 7 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 90 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 91 , " width " : 1 } ] , <nl> - " line_number " : 7 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 92 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 97 , " width " : 1 } ] , <nl> - " line_number " : 8 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " classname " , <nl> - " offset " : 98 , <nl> - " leading_width " : 0 , <nl> - " width " : 9 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 107 , " width " : 1 } ] , <nl> - " line_number " : 8 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 108 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 8 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 109 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 110 , " width " : 1 } ] , <nl> - " line_number " : 8 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 111 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 116 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " coroutine " , <nl> - " offset " : 117 , <nl> - " leading_width " : 0 , <nl> - " width " : 9 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 126 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 127 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 128 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 129 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 130 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 135 , " width " : 1 } ] , <nl> - " line_number " : 10 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " darray " , <nl> - " offset " : 136 , <nl> - " leading_width " : 0 , <nl> - " width " : 6 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 142 , " width " : 1 } ] , <nl> - " line_number " : 10 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 143 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 10 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 144 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 145 , " width " : 1 } ] , <nl> - " line_number " : 10 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 146 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 151 , " width " : 1 } ] , <nl> - " line_number " : 11 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " dict " , <nl> - " offset " : 152 , <nl> - " leading_width " : 0 , <nl> - " width " : 4 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 156 , " width " : 1 } ] , <nl> - " line_number " : 11 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 157 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 11 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 158 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 159 , " width " : 1 } ] , <nl> - " line_number " : 11 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 160 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 165 , " width " : 1 } ] , <nl> - " line_number " : 12 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " enum " , <nl> - " offset " : 166 , <nl> - " leading_width " : 0 , <nl> - " width " : 4 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 170 , " width " : 1 } ] , <nl> - " line_number " : 12 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 171 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 12 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 172 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 173 , " width " : 1 } ] , <nl> - " line_number " : 12 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 174 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 179 , " width " : 1 } ] , <nl> - " line_number " : 13 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " fallthrough " , <nl> - " offset " : 180 , <nl> - " leading_width " : 0 , <nl> - " width " : 11 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 191 , " width " : 1 } ] , <nl> - " line_number " : 13 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 192 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 13 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 193 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 194 , " width " : 1 } ] , <nl> - " line_number " : 13 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 195 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 200 , " width " : 1 } ] , <nl> - " line_number " : 14 <nl> - } <nl> - } , <nl> - " classish_name " : { " kind " : " missing " } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 207 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ ncla " , " offset " : 208 , " width " : 5 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 206 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 14 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 208 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 209 , " width " : 1 } ] , <nl> - " line_number " : 14 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 210 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 215 , " width " : 1 } ] , <nl> - " line_number " : 15 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " is " , <nl> - " offset " : 216 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 218 , " width " : 1 } ] , <nl> - " line_number " : 15 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 219 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 15 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 220 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 221 , " width " : 1 } ] , <nl> - " line_number " : 15 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 222 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 227 , " width " : 1 } ] , <nl> - " line_number " : 16 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " keyset " , <nl> - " offset " : 228 , <nl> - " leading_width " : 0 , <nl> - " width " : 6 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 234 , " width " : 1 } ] , <nl> - " line_number " : 16 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 235 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 16 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 236 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 237 , " width " : 1 } ] , <nl> - " line_number " : 16 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 238 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 243 , " width " : 1 } ] , <nl> - " line_number " : 17 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " let " , <nl> - " offset " : 244 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 247 , " width " : 1 } ] , <nl> - " line_number " : 17 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 248 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 17 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 249 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 250 , " width " : 1 } ] , <nl> - " line_number " : 17 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 251 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 256 , " width " : 1 } ] , <nl> - " line_number " : 18 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " newtype " , <nl> - " offset " : 257 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 264 , " width " : 1 } ] , <nl> - " line_number " : 18 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 265 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 18 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 266 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 267 , " width " : 1 } ] , <nl> - " line_number " : 18 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 268 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 273 , " width " : 1 } ] , <nl> - " line_number " : 19 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " num " , <nl> - " offset " : 274 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 277 , " width " : 1 } ] , <nl> - " line_number " : 19 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 278 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 19 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 279 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 280 , " width " : 1 } ] , <nl> - " line_number " : 19 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 281 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 286 , " width " : 1 } ] , <nl> - " line_number " : 20 <nl> - } <nl> - } , <nl> - " classish_name " : { " kind " : " missing " } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 296 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ nclass " , " offset " : 297 , " width " : 8 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 295 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 20 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 297 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 298 , " width " : 1 } ] , <nl> - " line_number " : 20 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 299 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 304 , " width " : 1 } ] , <nl> - " line_number " : 21 <nl> - } <nl> - } , <nl> - " classish_name " : { " kind " : " missing " } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 311 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ ncla " , " offset " : 312 , " width " : 5 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 310 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 21 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 312 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 313 , " width " : 1 } ] , <nl> - " line_number " : 21 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 314 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 319 , " width " : 1 } ] , <nl> - " line_number " : 22 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " suspend " , <nl> - " offset " : 320 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 327 , " width " : 1 } ] , <nl> - " line_number " : 22 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 328 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 22 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 329 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 330 , " width " : 1 } ] , <nl> - " line_number " : 22 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 331 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 336 , " width " : 1 } ] , <nl> - " line_number " : 23 <nl> - } <nl> - } , <nl> - " classish_name " : { " kind " : " missing " } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 343 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ ncla " , " offset " : 344 , " width " : 5 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 342 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 23 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 344 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 345 , " width " : 1 } ] , <nl> - " line_number " : 23 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 346 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 351 , " width " : 1 } ] , <nl> - " line_number " : 24 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " type " , <nl> - " offset " : 352 , <nl> - " leading_width " : 0 , <nl> - " width " : 4 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 356 , " width " : 1 } ] , <nl> - " line_number " : 24 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 357 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 24 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 358 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 359 , " width " : 1 } ] , <nl> - " line_number " : 24 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 360 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 365 , " width " : 1 } ] , <nl> - " line_number " : 25 <nl> - } <nl> - } , <nl> - " classish_name " : { " kind " : " missing " } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 372 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ ncla " , " offset " : 373 , " width " : 5 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 371 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 25 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 373 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 374 , " width " : 1 } ] , <nl> - " line_number " : 25 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 375 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 380 , " width " : 1 } ] , <nl> - " line_number " : 26 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " varray " , <nl> - " offset " : 381 , <nl> - " leading_width " : 0 , <nl> - " width " : 6 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 387 , " width " : 1 } ] , <nl> - " line_number " : 26 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 388 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 26 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 389 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 390 , " width " : 1 } ] , <nl> - " line_number " : 26 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 391 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 396 , " width " : 1 } ] , <nl> - " line_number " : 27 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " vec " , <nl> - " offset " : 397 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 400 , " width " : 1 } ] , <nl> - " line_number " : 27 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 401 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 27 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 402 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 403 , " width " : 1 } ] , <nl> - " line_number " : 27 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 404 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 409 , " width " : 1 } ] , <nl> - " line_number " : 28 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " where " , <nl> - " offset " : 410 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 415 , " width " : 1 } ] , <nl> - " line_number " : 28 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 416 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 28 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 417 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 418 , " width " : 1 } ] , <nl> - " line_number " : 28 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 419 , <nl> - " leading_width " : 1 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 419 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 423 , " width " : 1 } ] , <nl> - " line_number " : 30 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " lambda_expression " , <nl> - " lambda_attribute_spec " : { " kind " : " missing " } , <nl> - " lambda_async " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " async " , <nl> - " text " : " async " , <nl> - " offset " : 424 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 30 <nl> - } <nl> - } , <nl> - " lambda_coroutine " : { " kind " : " missing " } , <nl> - " lambda_signature " : { <nl> - " kind " : " lambda_signature " , <nl> - " lambda_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 429 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 30 <nl> - } <nl> - } , <nl> - " lambda_parameters " : { " kind " : " missing " } , <nl> - " lambda_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 430 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 30 <nl> - } <nl> - } , <nl> - " lambda_colon " : { " kind " : " missing " } , <nl> - " lambda_type " : { " kind " : " missing " } <nl> - } , <nl> - " lambda_arrow " : { " kind " : " missing " } , <nl> - " lambda_body " : { " kind " : " missing " } <nl> - } , <nl> - " constructor_call_left_paren " : { " kind " : " missing " } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { " kind " : " missing " } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 431 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 432 , " width " : 1 } ] , <nl> - " line_number " : 30 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 433 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 436 , " width " : 1 } ] , <nl> - " line_number " : 31 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " attribute " , <nl> - " offset " : 437 , <nl> - " leading_width " : 0 , <nl> - " width " : 9 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 31 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 446 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 31 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 447 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 31 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 448 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 449 , " width " : 1 } ] , <nl> - " line_number " : 31 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 450 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 453 , " width " : 1 } ] , <nl> - " line_number " : 32 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " prefix_unary_expression " , <nl> - " prefix_unary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " await " , <nl> - " text " : " await " , <nl> - " offset " : 454 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 32 <nl> - } <nl> - } , <nl> - " prefix_unary_operand " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 459 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 32 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 460 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 32 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { " kind " : " missing " } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { " kind " : " missing " } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 461 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 462 , " width " : 1 } ] , <nl> - " line_number " : 32 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 463 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 466 , " width " : 1 } ] , <nl> - " line_number " : 33 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " category " , <nl> - " offset " : 467 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 33 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 475 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 33 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 476 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 33 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 477 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 478 , " width " : 1 } ] , <nl> - " line_number " : 33 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 479 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 482 , " width " : 1 } ] , <nl> - " line_number " : 34 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " children " , <nl> - " offset " : 483 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 34 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 491 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 34 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 492 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 34 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 493 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 494 , " width " : 1 } ] , <nl> - " line_number " : 34 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 495 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 498 , " width " : 1 } ] , <nl> - " line_number " : 35 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " classname " , <nl> - " offset " : 499 , <nl> - " leading_width " : 0 , <nl> - " width " : 9 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 35 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 508 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 35 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 509 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 35 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 510 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 511 , " width " : 1 } ] , <nl> - " line_number " : 35 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 512 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 515 , " width " : 1 } ] , <nl> - " line_number " : 36 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " lambda_expression " , <nl> - " lambda_attribute_spec " : { " kind " : " missing " } , <nl> - " lambda_async " : { " kind " : " missing " } , <nl> - " lambda_coroutine " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " coroutine " , <nl> - " text " : " coroutine " , <nl> - " offset " : 516 , <nl> - " leading_width " : 0 , <nl> - " width " : 9 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 36 <nl> - } <nl> - } , <nl> - " lambda_signature " : { <nl> - " kind " : " lambda_signature " , <nl> - " lambda_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 525 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 36 <nl> - } <nl> - } , <nl> - " lambda_parameters " : { " kind " : " missing " } , <nl> - " lambda_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 526 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 36 <nl> - } <nl> - } , <nl> - " lambda_colon " : { " kind " : " missing " } , <nl> - " lambda_type " : { " kind " : " missing " } <nl> - } , <nl> - " lambda_arrow " : { " kind " : " missing " } , <nl> - " lambda_body " : { " kind " : " missing " } <nl> - } , <nl> - " constructor_call_left_paren " : { " kind " : " missing " } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { " kind " : " missing " } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 527 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 528 , " width " : 1 } ] , <nl> - " line_number " : 36 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 529 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 532 , " width " : 1 } ] , <nl> - " line_number " : 37 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " darray " , <nl> - " offset " : 533 , <nl> - " leading_width " : 0 , <nl> - " width " : 6 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 37 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 539 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 37 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 540 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 37 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 541 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 542 , " width " : 1 } ] , <nl> - " line_number " : 37 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 543 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 546 , " width " : 1 } ] , <nl> - " line_number " : 38 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " dict " , <nl> - " offset " : 547 , <nl> - " leading_width " : 0 , <nl> - " width " : 4 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 38 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 551 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 38 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 552 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 38 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 553 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 554 , " width " : 1 } ] , <nl> - " line_number " : 38 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 555 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 558 , " width " : 1 } ] , <nl> - " line_number " : 39 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " enum " , <nl> - " offset " : 559 , <nl> - " leading_width " : 0 , <nl> - " width " : 4 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 39 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 563 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 39 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 564 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 39 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 565 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 566 , " width " : 1 } ] , <nl> - " line_number " : 39 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 567 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 570 , " width " : 1 } ] , <nl> - " line_number " : 40 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " fallthrough " , <nl> - " offset " : 571 , <nl> - " leading_width " : 0 , <nl> - " width " : 11 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 40 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 582 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 40 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 583 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 40 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 584 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 585 , " width " : 1 } ] , <nl> - " line_number " : 40 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 586 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 589 , " width " : 1 } ] , <nl> - " line_number " : 41 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " inout " , <nl> - " text " : " inout " , <nl> - " offset " : 590 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 41 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 595 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 41 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 596 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 41 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 597 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 598 , " width " : 1 } ] , <nl> - " line_number " : 41 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 599 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 602 , " width " : 1 } ] , <nl> - " line_number " : 42 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " is " , <nl> - " offset " : 603 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 42 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 605 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 42 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 606 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 42 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 607 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 608 , " width " : 1 } ] , <nl> - " line_number " : 42 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 609 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 612 , " width " : 1 } ] , <nl> - " line_number " : 43 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " keyset " , <nl> - " offset " : 613 , <nl> - " leading_width " : 0 , <nl> - " width " : 6 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 43 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 619 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 43 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 620 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 43 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 621 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 622 , " width " : 1 } ] , <nl> - " line_number " : 43 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 623 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 626 , " width " : 1 } ] , <nl> - " line_number " : 44 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " simple_type_specifier " , <nl> - " simple_type_specifier " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " let " , <nl> - " offset " : 627 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 44 <nl> - } <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 630 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 44 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 631 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 44 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 632 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 633 , " width " : 1 } ] , <nl> - " line_number " : 44 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 634 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 637 , " width " : 1 } ] , <nl> - " line_number " : 45 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " newtype " , <nl> - " offset " : 638 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 45 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 645 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 45 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 646 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 45 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 647 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 648 , " width " : 1 } ] , <nl> - " line_number " : 45 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 649 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 652 , " width " : 1 } ] , <nl> - " line_number " : 46 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " num " , <nl> - " offset " : 653 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 46 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 656 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 46 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 657 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 46 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 658 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 659 , " width " : 1 } ] , <nl> - " line_number " : 46 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 660 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 663 , " width " : 1 } ] , <nl> - " line_number " : 47 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " required " , <nl> - " text " : " required " , <nl> - " offset " : 664 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 47 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 672 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 47 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 673 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 47 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 674 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 675 , " width " : 1 } ] , <nl> - " line_number " : 47 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 676 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 679 , " width " : 1 } ] , <nl> - " line_number " : 48 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " shape_expression " , <nl> - " shape_expression_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " shape " , <nl> - " text " : " shape " , <nl> - " offset " : 680 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 48 <nl> - } <nl> - } , <nl> - " shape_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 685 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 48 <nl> - } <nl> - } , <nl> - " shape_expression_fields " : { " kind " : " missing " } , <nl> - " shape_expression_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 686 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 48 <nl> - } <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { " kind " : " missing " } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { " kind " : " missing " } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 687 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 688 , " width " : 1 } ] , <nl> - " line_number " : 48 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 689 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 692 , " width " : 1 } ] , <nl> - " line_number " : 49 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " prefix_unary_expression " , <nl> - " prefix_unary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " suspend " , <nl> - " text " : " suspend " , <nl> - " offset " : 693 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 49 <nl> - } <nl> - } , <nl> - " prefix_unary_operand " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 700 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 49 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 701 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 49 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { " kind " : " missing " } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { " kind " : " missing " } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 702 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 703 , " width " : 1 } ] , <nl> - " line_number " : 49 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 704 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 707 , " width " : 1 } ] , <nl> - " line_number " : 50 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " tuple_expression " , <nl> - " tuple_expression_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " tuple " , <nl> - " text " : " tuple " , <nl> - " offset " : 708 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 50 <nl> - } <nl> - } , <nl> - " tuple_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 713 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 50 <nl> - } <nl> - } , <nl> - " tuple_expression_items " : { " kind " : " missing " } , <nl> - " tuple_expression_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 714 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 50 <nl> - } <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { " kind " : " missing " } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { " kind " : " missing " } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 715 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 716 , " width " : 1 } ] , <nl> - " line_number " : 50 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 717 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 720 , " width " : 1 } ] , <nl> - " line_number " : 51 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " type " , <nl> - " offset " : 721 , <nl> - " leading_width " : 0 , <nl> - " width " : 4 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 51 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 725 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 51 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 726 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 51 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 727 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 728 , " width " : 1 } ] , <nl> - " line_number " : 51 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 729 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 732 , " width " : 1 } ] , <nl> - " line_number " : 52 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " using " , <nl> - " text " : " using " , <nl> - " offset " : 733 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 52 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 738 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 52 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 739 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 52 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 740 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 741 , " width " : 1 } ] , <nl> - " line_number " : 52 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 742 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 745 , " width " : 1 } ] , <nl> - " line_number " : 53 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " varray " , <nl> - " offset " : 746 , <nl> - " leading_width " : 0 , <nl> - " width " : 6 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 53 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 752 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 53 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 753 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 53 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 754 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 755 , " width " : 1 } ] , <nl> - " line_number " : 53 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 756 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 759 , " width " : 1 } ] , <nl> - " line_number " : 54 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " vec " , <nl> - " offset " : 760 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 54 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 763 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 54 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 764 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 54 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 765 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 766 , " width " : 1 } ] , <nl> - " line_number " : 54 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 767 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 770 , " width " : 1 } ] , <nl> - " line_number " : 55 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " where " , <nl> - " offset " : 771 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 55 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 776 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 55 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 777 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 55 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 778 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 779 , " width " : 1 } ] , <nl> - " line_number " : 55 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 780 , <nl> - " leading_width " : 1 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 780 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 789 , " width " : 1 } ] , <nl> - " line_number " : 57 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " error " , <nl> - " error_error " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " async " , <nl> - " text " : " async " , <nl> - " offset " : 790 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 57 <nl> - } <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 795 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 57 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 796 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 797 , " width " : 1 } ] , <nl> - " line_number " : 57 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 798 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 57 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 799 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 800 , " width " : 1 } ] , <nl> - " line_number " : 57 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 801 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 809 , " width " : 1 } ] , <nl> - " line_number " : 58 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " attribute " , <nl> - " offset " : 810 , <nl> - " leading_width " : 0 , <nl> - " width " : 9 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 58 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 819 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 58 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 820 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 821 , " width " : 1 } ] , <nl> - " line_number " : 58 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 822 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 58 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 823 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 824 , " width " : 1 } ] , <nl> - " line_number " : 58 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 825 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 833 , " width " : 1 } ] , <nl> - " line_number " : 59 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " error " , <nl> - " error_error " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " await " , <nl> - " text " : " await " , <nl> - " offset " : 834 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 59 <nl> - } <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 839 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 59 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 840 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 841 , " width " : 1 } ] , <nl> - " line_number " : 59 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 842 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 59 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 843 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 844 , " width " : 1 } ] , <nl> - " line_number " : 59 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 845 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 853 , " width " : 1 } ] , <nl> - " line_number " : 60 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " category " , <nl> - " offset " : 854 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 60 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 862 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 60 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 863 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 864 , " width " : 1 } ] , <nl> - " line_number " : 60 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 865 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 60 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 866 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 867 , " width " : 1 } ] , <nl> - " line_number " : 60 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 868 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 876 , " width " : 1 } ] , <nl> - " line_number " : 61 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " children " , <nl> - " offset " : 877 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 61 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 885 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 61 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 886 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 887 , " width " : 1 } ] , <nl> - " line_number " : 61 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 888 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 61 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 889 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 890 , " width " : 1 } ] , <nl> - " line_number " : 61 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 891 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 899 , " width " : 1 } ] , <nl> - " line_number " : 62 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " classname " , <nl> - " offset " : 900 , <nl> - " leading_width " : 0 , <nl> - " width " : 9 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 62 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 909 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 62 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 910 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 911 , " width " : 1 } ] , <nl> - " line_number " : 62 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 912 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 62 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 913 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 914 , " width " : 1 } ] , <nl> - " line_number " : 62 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 915 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 923 , " width " : 1 } ] , <nl> - " line_number " : 63 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " coroutine " , <nl> - " offset " : 924 , <nl> - " leading_width " : 0 , <nl> - " width " : 9 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 63 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 933 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 63 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 934 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 935 , " width " : 1 } ] , <nl> - " line_number " : 63 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 936 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 63 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 937 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 938 , " width " : 1 } ] , <nl> - " line_number " : 63 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 939 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 947 , " width " : 1 } ] , <nl> - " line_number " : 64 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " darray " , <nl> - " offset " : 948 , <nl> - " leading_width " : 0 , <nl> - " width " : 6 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 64 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 954 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 64 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 955 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 956 , " width " : 1 } ] , <nl> - " line_number " : 64 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 957 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 64 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 958 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 959 , " width " : 1 } ] , <nl> - " line_number " : 64 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 960 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 968 , " width " : 1 } ] , <nl> - " line_number " : 65 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " dict " , <nl> - " offset " : 969 , <nl> - " leading_width " : 0 , <nl> - " width " : 4 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 65 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 973 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 65 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 974 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 975 , " width " : 1 } ] , <nl> - " line_number " : 65 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 976 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 65 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 977 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 978 , " width " : 1 } ] , <nl> - " line_number " : 65 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 979 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 987 , " width " : 1 } ] , <nl> - " line_number " : 66 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " enum " , <nl> - " offset " : 988 , <nl> - " leading_width " : 0 , <nl> - " width " : 4 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 66 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 992 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 66 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 993 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 994 , " width " : 1 } ] , <nl> - " line_number " : 66 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 995 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 66 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 996 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 997 , " width " : 1 } ] , <nl> - " line_number " : 66 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 998 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1006 , " width " : 1 } ] , <nl> - " line_number " : 67 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " fallthrough " , <nl> - " offset " : 1007 , <nl> - " leading_width " : 0 , <nl> - " width " : 11 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 67 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1018 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 67 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1019 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1020 , " width " : 1 } ] , <nl> - " line_number " : 67 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1021 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 67 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1022 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1023 , " width " : 1 } ] , <nl> - " line_number " : 67 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 1024 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1032 , " width " : 1 } ] , <nl> - " line_number " : 68 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " error " , <nl> - " error_error " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " inout " , <nl> - " text " : " inout " , <nl> - " offset " : 1033 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 68 <nl> - } <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1038 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 68 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1039 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1040 , " width " : 1 } ] , <nl> - " line_number " : 68 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1041 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 68 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1042 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1043 , " width " : 1 } ] , <nl> - " line_number " : 68 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 1044 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1052 , " width " : 1 } ] , <nl> - " line_number " : 69 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " is " , <nl> - " offset " : 1053 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 69 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1055 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 69 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1056 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1057 , " width " : 1 } ] , <nl> - " line_number " : 69 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1058 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 69 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1059 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1060 , " width " : 1 } ] , <nl> - " line_number " : 69 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 1061 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1069 , " width " : 1 } ] , <nl> - " line_number " : 70 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " keyset " , <nl> - " offset " : 1070 , <nl> - " leading_width " : 0 , <nl> - " width " : 6 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 70 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1076 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 70 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1077 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1078 , " width " : 1 } ] , <nl> - " line_number " : 70 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1079 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 70 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1080 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1081 , " width " : 1 } ] , <nl> - " line_number " : 70 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 1082 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1090 , " width " : 1 } ] , <nl> - " line_number " : 71 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " let " , <nl> - " offset " : 1091 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 71 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1094 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 71 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1095 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1096 , " width " : 1 } ] , <nl> - " line_number " : 71 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1097 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 71 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1098 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1099 , " width " : 1 } ] , <nl> - " line_number " : 71 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 1100 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1108 , " width " : 1 } ] , <nl> - " line_number " : 72 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " newtype " , <nl> - " offset " : 1109 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 72 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1116 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 72 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1117 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1118 , " width " : 1 } ] , <nl> - " line_number " : 72 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1119 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 72 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1120 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1121 , " width " : 1 } ] , <nl> - " line_number " : 72 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 1122 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1130 , " width " : 1 } ] , <nl> - " line_number " : 73 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " num " , <nl> - " offset " : 1131 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 73 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1134 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 73 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1135 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1136 , " width " : 1 } ] , <nl> - " line_number " : 73 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1137 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 73 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1138 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1139 , " width " : 1 } ] , <nl> - " line_number " : 73 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 1140 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1148 , " width " : 1 } ] , <nl> - " line_number " : 74 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " error " , <nl> - " error_error " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " required " , <nl> - " text " : " required " , <nl> - " offset " : 1149 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 74 <nl> - } <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1157 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 74 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1158 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1159 , " width " : 1 } ] , <nl> - " line_number " : 74 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1160 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 74 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1161 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1162 , " width " : 1 } ] , <nl> - " line_number " : 74 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 1163 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1171 , " width " : 1 } ] , <nl> - " line_number " : 75 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " error " , <nl> - " error_error " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " shape " , <nl> - " text " : " shape " , <nl> - " offset " : 1172 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 75 <nl> - } <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1177 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 75 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1178 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1179 , " width " : 1 } ] , <nl> - " line_number " : 75 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1180 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 75 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1181 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1182 , " width " : 1 } ] , <nl> - " line_number " : 75 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 1183 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1191 , " width " : 1 } ] , <nl> - " line_number " : 76 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " suspend " , <nl> - " offset " : 1192 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 76 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1199 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 76 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1200 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1201 , " width " : 1 } ] , <nl> - " line_number " : 76 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1202 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 76 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1203 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1204 , " width " : 1 } ] , <nl> - " line_number " : 76 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 1205 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1213 , " width " : 1 } ] , <nl> - " line_number " : 77 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " error " , <nl> - " error_error " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " tuple " , <nl> - " text " : " tuple " , <nl> - " offset " : 1214 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 77 <nl> - } <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1219 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 77 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1220 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1221 , " width " : 1 } ] , <nl> - " line_number " : 77 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1222 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 77 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1223 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1224 , " width " : 1 } ] , <nl> - " line_number " : 77 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 1225 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1233 , " width " : 1 } ] , <nl> - " line_number " : 78 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " type " , <nl> - " offset " : 1234 , <nl> - " leading_width " : 0 , <nl> - " width " : 4 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 78 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1238 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 78 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1239 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1240 , " width " : 1 } ] , <nl> - " line_number " : 78 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1241 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 78 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1242 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1243 , " width " : 1 } ] , <nl> - " line_number " : 78 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 1244 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1252 , " width " : 1 } ] , <nl> - " line_number " : 79 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " error " , <nl> - " error_error " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " using " , <nl> - " text " : " using " , <nl> - " offset " : 1253 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 79 <nl> - } <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1258 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 79 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1259 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1260 , " width " : 1 } ] , <nl> - " line_number " : 79 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1261 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 79 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1262 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1263 , " width " : 1 } ] , <nl> - " line_number " : 79 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 1264 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1272 , " width " : 1 } ] , <nl> - " line_number " : 80 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " varray " , <nl> - " offset " : 1273 , <nl> - " leading_width " : 0 , <nl> - " width " : 6 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 80 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1279 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 80 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1280 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1281 , " width " : 1 } ] , <nl> - " line_number " : 80 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1282 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 80 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1283 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1284 , " width " : 1 } ] , <nl> - " line_number " : 80 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 1285 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1293 , " width " : 1 } ] , <nl> - " line_number " : 81 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " vec " , <nl> - " offset " : 1294 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 81 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1297 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 81 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1298 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1299 , " width " : 1 } ] , <nl> - " line_number " : 81 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1300 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 81 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1301 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1302 , " width " : 1 } ] , <nl> - " line_number " : 81 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 1303 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1311 , " width " : 1 } ] , <nl> - " line_number " : 82 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " where " , <nl> - " offset " : 1312 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 82 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1317 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 82 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1318 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 1319 , " width " : 1 } ] , <nl> - " line_number " : 82 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 1320 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 82 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 1321 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1322 , " width " : 1 } ] , <nl> - " line_number " : 82 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " lambda_expression " , <nl> - " lambda_attribute_spec " : { " kind " : " missing " } , <nl> - " lambda_async " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " async " , <nl> - " text " : " async " , <nl> - " offset " : 1323 , <nl> - " leading_width " : 2 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1323 , " width " : 1 } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1324 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 85 <nl> - } <nl> - } , <nl> - " lambda_coroutine " : { " kind " : " missing " } , <nl> - " lambda_signature " : { <nl> - " kind " : " lambda_signature " , <nl> - " lambda_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1330 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 85 <nl> - } <nl> - } , <nl> - " lambda_parameters " : { " kind " : " missing " } , <nl> - " lambda_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1331 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 85 <nl> - } <nl> - } , <nl> - " lambda_colon " : { " kind " : " missing " } , <nl> - " lambda_type " : { " kind " : " missing " } <nl> - } , <nl> - " lambda_arrow " : { " kind " : " missing " } , <nl> - " lambda_body " : { " kind " : " missing " } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1332 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1333 , " width " : 1 } ] , <nl> - " line_number " : 85 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " function_call_expression " , <nl> - " function_call_receiver " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " attribute " , <nl> - " offset " : 1334 , <nl> - " leading_width " : 0 , <nl> - " width " : 9 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 86 <nl> - } <nl> - } , <nl> - " function_call_type_args " : { " kind " : " missing " } , <nl> - " function_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1343 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 86 <nl> - } <nl> - } , <nl> - " function_call_argument_list " : { " kind " : " missing " } , <nl> - " function_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1344 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 86 <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1345 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1346 , " width " : 1 } ] , <nl> - " line_number " : 86 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " prefix_unary_expression " , <nl> - " prefix_unary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " await " , <nl> - " text " : " await " , <nl> - " offset " : 1347 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 87 <nl> - } <nl> - } , <nl> - " prefix_unary_operand " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1352 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 87 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1353 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 87 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1354 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1355 , " width " : 1 } ] , <nl> - " line_number " : 87 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " function_call_expression " , <nl> - " function_call_receiver " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " category " , <nl> - " offset " : 1356 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 88 <nl> - } <nl> - } , <nl> - " function_call_type_args " : { " kind " : " missing " } , <nl> - " function_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1364 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 88 <nl> - } <nl> - } , <nl> - " function_call_argument_list " : { " kind " : " missing " } , <nl> - " function_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1365 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 88 <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1366 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1367 , " width " : 1 } ] , <nl> - " line_number " : 88 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " function_call_expression " , <nl> - " function_call_receiver " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " children " , <nl> - " offset " : 1368 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 89 <nl> - } <nl> - } , <nl> - " function_call_type_args " : { " kind " : " missing " } , <nl> - " function_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1376 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 89 <nl> - } <nl> - } , <nl> - " function_call_argument_list " : { " kind " : " missing " } , <nl> - " function_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1377 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 89 <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1378 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1379 , " width " : 1 } ] , <nl> - " line_number " : 89 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " function_call_expression " , <nl> - " function_call_receiver " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " classname " , <nl> - " offset " : 1380 , <nl> - " leading_width " : 0 , <nl> - " width " : 9 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 90 <nl> - } <nl> - } , <nl> - " function_call_type_args " : { " kind " : " missing " } , <nl> - " function_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1389 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 90 <nl> - } <nl> - } , <nl> - " function_call_argument_list " : { " kind " : " missing " } , <nl> - " function_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1390 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 90 <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1391 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1392 , " width " : 1 } ] , <nl> - " line_number " : 90 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " lambda_expression " , <nl> - " lambda_attribute_spec " : { " kind " : " missing " } , <nl> - " lambda_async " : { " kind " : " missing " } , <nl> - " lambda_coroutine " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " coroutine " , <nl> - " text " : " coroutine " , <nl> - " offset " : 1393 , <nl> - " leading_width " : 0 , <nl> - " width " : 9 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 91 <nl> - } <nl> - } , <nl> - " lambda_signature " : { <nl> - " kind " : " lambda_signature " , <nl> - " lambda_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1402 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 91 <nl> - } <nl> - } , <nl> - " lambda_parameters " : { " kind " : " missing " } , <nl> - " lambda_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1403 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 91 <nl> - } <nl> - } , <nl> - " lambda_colon " : { " kind " : " missing " } , <nl> - " lambda_type " : { " kind " : " missing " } <nl> - } , <nl> - " lambda_arrow " : { " kind " : " missing " } , <nl> - " lambda_body " : { " kind " : " missing " } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1404 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1405 , " width " : 1 } ] , <nl> - " line_number " : 91 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " function_call_expression " , <nl> - " function_call_receiver " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " darray " , <nl> - " offset " : 1406 , <nl> - " leading_width " : 0 , <nl> - " width " : 6 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 92 <nl> - } <nl> - } , <nl> - " function_call_type_args " : { " kind " : " missing " } , <nl> - " function_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1412 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 92 <nl> - } <nl> - } , <nl> - " function_call_argument_list " : { " kind " : " missing " } , <nl> - " function_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1413 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 92 <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1414 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1415 , " width " : 1 } ] , <nl> - " line_number " : 92 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " function_call_expression " , <nl> - " function_call_receiver " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " dict " , <nl> - " offset " : 1416 , <nl> - " leading_width " : 0 , <nl> - " width " : 4 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 93 <nl> - } <nl> - } , <nl> - " function_call_type_args " : { " kind " : " missing " } , <nl> - " function_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1420 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 93 <nl> - } <nl> - } , <nl> - " function_call_argument_list " : { " kind " : " missing " } , <nl> - " function_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1421 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 93 <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1422 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1423 , " width " : 1 } ] , <nl> - " line_number " : 93 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enum_declaration " , <nl> - " enum_attribute_spec " : { " kind " : " missing " } , <nl> - " enum_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " enum " , <nl> - " text " : " enum " , <nl> - " offset " : 1424 , <nl> - " leading_width " : 0 , <nl> - " width " : 4 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 94 <nl> - } <nl> - } , <nl> - " enum_name " : { " kind " : " missing " } , <nl> - " enum_colon " : { " kind " : " missing " } , <nl> - " enum_base " : { <nl> - " kind " : " tuple_type_specifier " , <nl> - " tuple_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1428 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 94 <nl> - } <nl> - } , <nl> - " tuple_types " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " list_item " , <nl> - " list_item " : { " kind " : " missing " } , <nl> - " list_separator " : { " kind " : " missing " } <nl> - } <nl> - ] <nl> - } , <nl> - " tuple_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1429 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 94 <nl> - } <nl> - } <nl> - } , <nl> - " enum_type " : { " kind " : " missing " } , <nl> - " enum_left_brace " : { " kind " : " missing " } , <nl> - " enum_enumerators " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { " kind " : " missing " } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1430 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1431 , " width " : 1 } ] , <nl> - " line_number " : 94 <nl> - } <nl> - } , <nl> - " enumerator_semicolon " : { " kind " : " missing " } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " fallthrough " , <nl> - " offset " : 1432 , <nl> - " leading_width " : 0 , <nl> - " width " : 11 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 95 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1443 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 95 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1444 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 95 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1445 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1446 , " width " : 1 } ] , <nl> - " line_number " : 95 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " inout " , <nl> - " offset " : 1447 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 96 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1452 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 96 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1453 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 96 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1454 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1455 , " width " : 1 } ] , <nl> - " line_number " : 96 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " is " , <nl> - " offset " : 1456 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 97 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1458 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 97 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1459 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 97 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1460 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1461 , " width " : 1 } ] , <nl> - " line_number " : 97 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " keyset " , <nl> - " offset " : 1462 , <nl> - " leading_width " : 0 , <nl> - " width " : 6 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 98 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1468 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 98 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1469 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 98 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1470 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1471 , " width " : 1 } ] , <nl> - " line_number " : 98 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " let " , <nl> - " offset " : 1472 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 99 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1475 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 99 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1476 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 99 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1477 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1478 , " width " : 1 } ] , <nl> - " line_number " : 99 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " newtype " , <nl> - " offset " : 1479 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 100 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1486 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 100 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1487 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 100 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1488 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1489 , " width " : 1 } ] , <nl> - " line_number " : 100 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " num " , <nl> - " offset " : 1490 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 101 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1493 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 101 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1494 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 101 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1495 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1496 , " width " : 1 } ] , <nl> - " line_number " : 101 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " required " , <nl> - " offset " : 1497 , <nl> - " leading_width " : 0 , <nl> - " width " : 8 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 102 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1505 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 102 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1506 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 102 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1507 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1508 , " width " : 1 } ] , <nl> - " line_number " : 102 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " shape " , <nl> - " offset " : 1509 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 103 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1514 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 103 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1515 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 103 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1516 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1517 , " width " : 1 } ] , <nl> - " line_number " : 103 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " suspend " , <nl> - " offset " : 1518 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 104 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1525 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 104 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1526 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 104 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1527 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1528 , " width " : 1 } ] , <nl> - " line_number " : 104 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " tuple " , <nl> - " offset " : 1529 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 105 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1534 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 105 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1535 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 105 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1536 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1537 , " width " : 1 } ] , <nl> - " line_number " : 105 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " type " , <nl> - " offset " : 1538 , <nl> - " leading_width " : 0 , <nl> - " width " : 4 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 106 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1542 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 106 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1543 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 106 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1544 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1545 , " width " : 1 } ] , <nl> - " line_number " : 106 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " using " , <nl> - " offset " : 1546 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 107 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1551 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 107 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1552 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 107 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1553 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1554 , " width " : 1 } ] , <nl> - " line_number " : 107 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " varray " , <nl> - " offset " : 1555 , <nl> - " leading_width " : 0 , <nl> - " width " : 6 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 108 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1561 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 108 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1562 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 108 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1563 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1564 , " width " : 1 } ] , <nl> - " line_number " : 108 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " vec " , <nl> - " offset " : 1565 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 109 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1568 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 109 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1569 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 109 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1570 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1571 , " width " : 1 } ] , <nl> - " line_number " : 109 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " enumerator " , <nl> - " enumerator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " where " , <nl> - " offset " : 1572 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 110 <nl> - } <nl> - } , <nl> - " enumerator_equal " : { " kind " : " missing " } , <nl> - " enumerator_value " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 1577 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 110 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 1578 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 110 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " enumerator_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 1579 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 1580 , " width " : 1 } ] , <nl> - " line_number " : 110 <nl> - } <nl> - } <nl> - } <nl> - ] <nl> - } , <nl> - " enum_right_brace " : { " kind " : " missing " } <nl> - } , <nl> - { <nl> - " kind " : " end_of_file " , <nl> - " end_of_file_token " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " end_of_file " , <nl> - " text " : " " , <nl> - " offset " : 1581 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 111 <nl> - } <nl> - } <nl> - } <nl> - ] <nl> - } <nl> - } , <nl> - " program_text " : " < ? php \ n \ nclass async { } \ nclass attribute { } \ nclass await { } \ nclass category { } \ nclass children { } \ nclass classname { } \ nclass coroutine { } \ nclass darray { } \ nclass dict { } \ nclass enum { } \ nclass fallthrough { } \ nclass inout { } \ nclass is { } \ nclass keyset { } \ nclass let { } \ nclass newtype { } \ nclass num { } \ nclass required { } \ nclass shape { } \ nclass suspend { } \ nclass tuple { } \ nclass type { } \ nclass using { } \ nclass varray { } \ nclass vec { } \ nclass where { } \ n \ nnew async ( ) ; \ nnew attribute ( ) ; \ nnew await ( ) ; \ nnew category ( ) ; \ nnew children ( ) ; \ nnew classname ( ) ; \ nnew coroutine ( ) ; \ nnew darray ( ) ; \ nnew dict ( ) ; \ nnew enum ( ) ; \ nnew fallthrough ( ) ; \ nnew inout ( ) ; \ nnew is ( ) ; \ nnew keyset ( ) ; \ nnew let ( ) ; \ nnew newtype ( ) ; \ nnew num ( ) ; \ nnew required ( ) ; \ nnew shape ( ) ; \ nnew suspend ( ) ; \ nnew tuple ( ) ; \ nnew type ( ) ; \ nnew using ( ) ; \ nnew varray ( ) ; \ nnew vec ( ) ; \ nnew where ( ) ; \ n \ nfunction async ( ) { } \ nfunction attribute ( ) { } \ nfunction await ( ) { } \ nfunction category ( ) { } \ nfunction children ( ) { } \ nfunction classname ( ) { } \ nfunction coroutine ( ) { } \ nfunction darray ( ) { } \ nfunction dict ( ) { } \ nfunction enum ( ) { } \ nfunction fallthrough ( ) { } \ nfunction inout ( ) { } \ nfunction is ( ) { } \ nfunction keyset ( ) { } \ nfunction let ( ) { } \ nfunction newtype ( ) { } \ nfunction num ( ) { } \ nfunction required ( ) { } \ nfunction shape ( ) { } \ nfunction suspend ( ) { } \ nfunction tuple ( ) { } \ nfunction type ( ) { } \ nfunction using ( ) { } \ nfunction varray ( ) { } \ nfunction vec ( ) { } \ nfunction where ( ) { } \ n \ n \ nasync ( ) ; \ nattribute ( ) ; \ nawait ( ) ; \ ncategory ( ) ; \ nchildren ( ) ; \ nclassname ( ) ; \ ncoroutine ( ) ; \ ndarray ( ) ; \ ndict ( ) ; \ nenum ( ) ; \ nfallthrough ( ) ; \ ninout ( ) ; \ nis ( ) ; \ nkeyset ( ) ; \ nlet ( ) ; \ nnewtype ( ) ; \ nnum ( ) ; \ nrequired ( ) ; \ nshape ( ) ; \ nsuspend ( ) ; \ ntuple ( ) ; \ ntype ( ) ; \ nusing ( ) ; \ nvarray ( ) ; \ nvec ( ) ; \ nwhere ( ) ; \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> - } <nl> deleted file mode 100644 <nl> index e4859af6134 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php4 . php <nl> ppp / dev / null <nl> <nl> - < ? php <nl> - <nl> - const inout = 1 ; <nl> - const using = 2 ; <nl> - <nl> - $ x = inout ; <nl> - $ y = using ; <nl> - $ z = inout + using ; <nl> - print ( inout ) ; <nl> - print ( using ) ; <nl> deleted file mode 100644 <nl> index 4e4c1c24116 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php4 . php . errors . exp <nl> ppp / dev / null <nl> <nl> - ( 6 , 11 ) - ( 6 , 11 ) An expression is expected here . <nl> - ( 7 , 11 ) - ( 7 , 11 ) An expression is expected here . <nl> - ( 8 , 12 ) - ( 8 , 12 ) An expression is expected here . <nl> - ( 8 , 19 ) - ( 8 , 19 ) An expression is expected here . <nl> - ( 9 , 12 ) - ( 9 , 12 ) An expression is expected here . <nl> - ( 10 , 12 ) - ( 10 , 12 ) An expression is expected here . <nl> deleted file mode 100644 <nl> index a3fb2cb10c3 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php4 . php . json . exp <nl> ppp / dev / null <nl> <nl> - { <nl> - " parse_tree " : { <nl> - " kind " : " script " , <nl> - " script_declarations " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " markup_section " , <nl> - " markup_text " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " markup " , <nl> - " text " : " " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix " : { <nl> - " kind " : " markup_suffix " , <nl> - " markup_suffix_less_than_question " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " < ? " , <nl> - " text " : " < ? " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " php " , <nl> - " offset " : 2 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> - " line_number " : 1 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " const_declaration " , <nl> - " const_modifiers " : { " kind " : " missing " } , <nl> - " const_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " const " , <nl> - " text " : " const " , <nl> - " offset " : 6 , <nl> - " leading_width " : 1 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 12 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " const_type_specifier " : { " kind " : " missing " } , <nl> - " const_declarators " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " list_item " , <nl> - " list_item " : { <nl> - " kind " : " constant_declarator " , <nl> - " constant_declarator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " inout " , <nl> - " offset " : 13 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 18 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " constant_declarator_initializer " : { <nl> - " kind " : " simple_initializer " , <nl> - " simple_initializer_equal " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " = " , <nl> - " text " : " = " , <nl> - " offset " : 19 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 20 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " simple_initializer_value " : { <nl> - " kind " : " literal " , <nl> - " literal_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " decimal_literal " , <nl> - " text " : " 1 " , <nl> - " offset " : 21 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 3 <nl> - } <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " list_separator " : { " kind " : " missing " } <nl> - } <nl> - ] <nl> - } , <nl> - " const_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 22 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 23 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " const_declaration " , <nl> - " const_modifiers " : { " kind " : " missing " } , <nl> - " const_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " const " , <nl> - " text " : " const " , <nl> - " offset " : 24 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 29 , " width " : 1 } ] , <nl> - " line_number " : 4 <nl> - } <nl> - } , <nl> - " const_type_specifier " : { " kind " : " missing " } , <nl> - " const_declarators " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " list_item " , <nl> - " list_item " : { <nl> - " kind " : " constant_declarator " , <nl> - " constant_declarator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " using " , <nl> - " offset " : 30 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 35 , " width " : 1 } ] , <nl> - " line_number " : 4 <nl> - } <nl> - } , <nl> - " constant_declarator_initializer " : { <nl> - " kind " : " simple_initializer " , <nl> - " simple_initializer_equal " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " = " , <nl> - " text " : " = " , <nl> - " offset " : 36 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 37 , " width " : 1 } ] , <nl> - " line_number " : 4 <nl> - } <nl> - } , <nl> - " simple_initializer_value " : { <nl> - " kind " : " literal " , <nl> - " literal_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " decimal_literal " , <nl> - " text " : " 2 " , <nl> - " offset " : 38 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 4 <nl> - } <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " list_separator " : { " kind " : " missing " } <nl> - } <nl> - ] <nl> - } , <nl> - " const_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 39 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 40 , " width " : 1 } ] , <nl> - " line_number " : 4 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " binary_expression " , <nl> - " binary_left_operand " : { <nl> - " kind " : " variable " , <nl> - " variable_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " variable " , <nl> - " text " : " $ x " , <nl> - " offset " : 41 , <nl> - " leading_width " : 1 , <nl> - " width " : 2 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 41 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 44 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } <nl> - } , <nl> - " binary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " = " , <nl> - " text " : " = " , <nl> - " offset " : 45 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 46 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " binary_right_operand " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " inout " , <nl> - " text " : " inout " , <nl> - " offset " : 47 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 6 <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 52 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 53 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " binary_expression " , <nl> - " binary_left_operand " : { <nl> - " kind " : " variable " , <nl> - " variable_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " variable " , <nl> - " text " : " $ y " , <nl> - " offset " : 54 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 56 , " width " : 1 } ] , <nl> - " line_number " : 7 <nl> - } <nl> - } <nl> - } , <nl> - " binary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " = " , <nl> - " text " : " = " , <nl> - " offset " : 57 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 58 , " width " : 1 } ] , <nl> - " line_number " : 7 <nl> - } <nl> - } , <nl> - " binary_right_operand " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " using " , <nl> - " text " : " using " , <nl> - " offset " : 59 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 7 <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 64 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 65 , " width " : 1 } ] , <nl> - " line_number " : 7 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " binary_expression " , <nl> - " binary_left_operand " : { <nl> - " kind " : " variable " , <nl> - " variable_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " variable " , <nl> - " text " : " $ z " , <nl> - " offset " : 66 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 68 , " width " : 1 } ] , <nl> - " line_number " : 8 <nl> - } <nl> - } <nl> - } , <nl> - " binary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " = " , <nl> - " text " : " = " , <nl> - " offset " : 69 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 70 , " width " : 1 } ] , <nl> - " line_number " : 8 <nl> - } <nl> - } , <nl> - " binary_right_operand " : { <nl> - " kind " : " binary_expression " , <nl> - " binary_left_operand " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " inout " , <nl> - " text " : " inout " , <nl> - " offset " : 71 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 76 , " width " : 1 } ] , <nl> - " line_number " : 8 <nl> - } <nl> - } , <nl> - " binary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " + " , <nl> - " text " : " + " , <nl> - " offset " : 77 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 78 , " width " : 1 } ] , <nl> - " line_number " : 8 <nl> - } <nl> - } , <nl> - " binary_right_operand " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " using " , <nl> - " text " : " using " , <nl> - " offset " : 79 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 8 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 84 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 85 , " width " : 1 } ] , <nl> - " line_number " : 8 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " prefix_unary_expression " , <nl> - " prefix_unary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " print " , <nl> - " text " : " print " , <nl> - " offset " : 86 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " prefix_unary_operand " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 91 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " inout " , <nl> - " text " : " inout " , <nl> - " offset " : 92 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 97 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 9 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 98 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 99 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " prefix_unary_expression " , <nl> - " prefix_unary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " print " , <nl> - " text " : " print " , <nl> - " offset " : 100 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 10 <nl> - } <nl> - } , <nl> - " prefix_unary_operand " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 105 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 10 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " using " , <nl> - " text " : " using " , <nl> - " offset " : 106 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 10 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 111 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 10 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 112 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 113 , " width " : 1 } ] , <nl> - " line_number " : 10 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " end_of_file " , <nl> - " end_of_file_token " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " end_of_file " , <nl> - " text " : " " , <nl> - " offset " : 114 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 11 <nl> - } <nl> - } <nl> - } <nl> - ] <nl> - } <nl> - } , <nl> - " program_text " : " < ? php \ n \ nconst inout = 1 ; \ nconst using = 2 ; \ n \ n $ x = inout ; \ n $ y = using ; \ n $ z = inout + using ; \ nprint ( inout ) ; \ nprint ( using ) ; \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> - } <nl> deleted file mode 100644 <nl> index ef919f43913 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php_cap1 . php <nl> ppp / dev / null <nl> <nl> - < ? php <nl> - <nl> - class InOut { } <nl> - <nl> - function foo ( ) : InOut { <nl> - return new InOut ( ) ; <nl> - } <nl> - <nl> - class bar extends InOut { } <nl> deleted file mode 100644 <nl> index aef3386c805 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php_cap1 . php . errors . exp <nl> ppp / dev / null <nl> <nl> - ( 3 , 7 ) - ( 3 , 7 ) A name is expected here . <nl> - ( 3 , 7 ) - ( 3 , 12 ) Keyword InOut must be written in lowercase <nl> - ( 5 , 17 ) - ( 5 , 22 ) Keyword InOut must be written in lowercase <nl> - ( 6 , 14 ) - ( 6 , 19 ) Keyword InOut must be written in lowercase <nl> - ( 6 , 14 ) - ( 6 , 19 ) Unexpected node on right hand side of new or instanceof : token <nl> - ( 6 , 19 ) - ( 6 , 19 ) An expression is expected here . <nl> - ( 9 , 19 ) - ( 9 , 19 ) A type specifier is expected here . <nl> - ( 9 , 19 ) - ( 9 , 24 ) Keyword InOut must be written in lowercase <nl> deleted file mode 100644 <nl> index 8698aeb9dce . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php_cap1 . php . json . exp <nl> ppp / dev / null <nl> <nl> - { <nl> - " parse_tree " : { <nl> - " kind " : " script " , <nl> - " script_declarations " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " markup_section " , <nl> - " markup_text " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " markup " , <nl> - " text " : " " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix " : { <nl> - " kind " : " markup_suffix " , <nl> - " markup_suffix_less_than_question " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " < ? " , <nl> - " text " : " < ? " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " php " , <nl> - " offset " : 2 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> - " line_number " : 1 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 6 , <nl> - " leading_width " : 1 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 12 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " classish_name " : { " kind " : " missing " } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 19 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ n \ nfu " , " offset " : 20 , " width " : 5 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 18 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 20 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 21 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 22 , <nl> - " leading_width " : 1 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 22 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 31 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " foo " , <nl> - " offset " : 32 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 35 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 36 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_colon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " : " , <nl> - " text " : " : " , <nl> - " offset " : 37 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 38 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_type " : { <nl> - " kind " : " error " , <nl> - " error_error " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " inout " , <nl> - " text " : " InOut " , <nl> - " offset " : 39 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 44 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } <nl> - } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 45 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 46 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " compound_statements " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " return_statement " , <nl> - " return_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " return " , <nl> - " text " : " return " , <nl> - " offset " : 47 , <nl> - " leading_width " : 2 , <nl> - " width " : 6 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 47 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 55 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " return_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 56 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 59 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " inout " , <nl> - " text " : " InOut " , <nl> - " offset " : 60 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 65 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 66 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 6 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " return_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 67 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 68 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } <nl> - } <nl> - ] <nl> - } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 69 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 70 , " width " : 1 } ] , <nl> - " line_number " : 7 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 71 , <nl> - " leading_width " : 1 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 71 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 77 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " bar " , <nl> - " offset " : 78 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 81 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " extends " , <nl> - " text " : " extends " , <nl> - " offset " : 82 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 89 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_extends_list " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " list_item " , <nl> - " list_item " : { " kind " : " missing " } , <nl> - " list_separator " : { " kind " : " missing " } <nl> - } <nl> - ] <nl> - } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 96 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ n " , " offset " : 97 , " width " : 5 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 95 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 97 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 98 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " end_of_file " , <nl> - " end_of_file_token " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " end_of_file " , <nl> - " text " : " " , <nl> - " offset " : 99 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 10 <nl> - } <nl> - } <nl> - } <nl> - ] <nl> - } <nl> - } , <nl> - " program_text " : " < ? php \ n \ nclass InOut { } \ n \ nfunction foo ( ) : InOut { \ n return new InOut ( ) ; \ n } \ n \ nclass bar extends InOut { } \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> - } <nl> deleted file mode 100644 <nl> index c21c5242ff8 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php_cap2 . php <nl> ppp / dev / null <nl> <nl> - < ? php <nl> - <nl> - class usiNG { } <nl> - <nl> - function foo ( ) : usiNG { <nl> - return new usiNG ( ) ; <nl> - } <nl> - <nl> - class bar extends usiNG { } <nl> deleted file mode 100644 <nl> index 585973d2fe3 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php_cap2 . php . errors . exp <nl> ppp / dev / null <nl> <nl> - ( 3 , 7 ) - ( 3 , 7 ) A name is expected here . <nl> - ( 3 , 7 ) - ( 3 , 12 ) Keyword usiNG must be written in lowercase <nl> - ( 5 , 17 ) - ( 5 , 22 ) Keyword usiNG must be written in lowercase <nl> - ( 6 , 14 ) - ( 6 , 19 ) Keyword usiNG must be written in lowercase <nl> - ( 6 , 14 ) - ( 6 , 19 ) Unexpected node on right hand side of new or instanceof : token <nl> - ( 6 , 19 ) - ( 6 , 19 ) An expression is expected here . <nl> - ( 9 , 19 ) - ( 9 , 19 ) A type specifier is expected here . <nl> - ( 9 , 19 ) - ( 9 , 24 ) Keyword usiNG must be written in lowercase <nl> deleted file mode 100644 <nl> index 17495ee74c5 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php_cap2 . php . json . exp <nl> ppp / dev / null <nl> <nl> - { <nl> - " parse_tree " : { <nl> - " kind " : " script " , <nl> - " script_declarations " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " markup_section " , <nl> - " markup_text " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " markup " , <nl> - " text " : " " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix " : { <nl> - " kind " : " markup_suffix " , <nl> - " markup_suffix_less_than_question " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " < ? " , <nl> - " text " : " < ? " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " php " , <nl> - " offset " : 2 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> - " line_number " : 1 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 6 , <nl> - " leading_width " : 1 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 12 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " classish_name " : { " kind " : " missing " } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { " kind " : " missing " } , <nl> - " classish_extends_list " : { " kind " : " missing " } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 19 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ n \ nfu " , " offset " : 20 , " width " : 5 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 18 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 20 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 21 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 22 , <nl> - " leading_width " : 1 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 22 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 31 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " foo " , <nl> - " offset " : 32 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 35 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 36 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_colon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " : " , <nl> - " text " : " : " , <nl> - " offset " : 37 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 38 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_type " : { <nl> - " kind " : " error " , <nl> - " error_error " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " using " , <nl> - " text " : " usiNG " , <nl> - " offset " : 39 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 44 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } <nl> - } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 45 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 46 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " compound_statements " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " return_statement " , <nl> - " return_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " return " , <nl> - " text " : " return " , <nl> - " offset " : 47 , <nl> - " leading_width " : 2 , <nl> - " width " : 6 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 47 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 55 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " return_expression " : { <nl> - " kind " : " object_creation_expression " , <nl> - " object_creation_new_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " new " , <nl> - " text " : " new " , <nl> - " offset " : 56 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 59 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " object_creation_object " : { <nl> - " kind " : " constructor_call " , <nl> - " constructor_call_type " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " using " , <nl> - " text " : " usiNG " , <nl> - " offset " : 60 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " constructor_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 65 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " constructor_call_argument_list " : { " kind " : " missing " } , <nl> - " constructor_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 66 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 6 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " return_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 67 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 68 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } <nl> - } <nl> - ] <nl> - } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 69 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 70 , " width " : 1 } ] , <nl> - " line_number " : 7 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " classish_declaration " , <nl> - " classish_attribute " : { " kind " : " missing " } , <nl> - " classish_modifiers " : { " kind " : " missing " } , <nl> - " classish_xhp " : { " kind " : " missing " } , <nl> - " classish_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " class " , <nl> - " text " : " class " , <nl> - " offset " : 71 , <nl> - " leading_width " : 1 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 71 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 77 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " bar " , <nl> - " offset " : 78 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 81 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_type_parameters " : { " kind " : " missing " } , <nl> - " classish_extends_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " extends " , <nl> - " text " : " extends " , <nl> - " offset " : 82 , <nl> - " leading_width " : 0 , <nl> - " width " : 7 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 89 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_extends_list " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " list_item " , <nl> - " list_item " : { " kind " : " missing " } , <nl> - " list_separator " : { " kind " : " missing " } <nl> - } <nl> - ] <nl> - } , <nl> - " classish_implements_keyword " : { " kind " : " missing " } , <nl> - " classish_implements_list " : { " kind " : " missing " } , <nl> - " classish_where_clause " : { " kind " : " missing " } , <nl> - " classish_body " : { <nl> - " kind " : " classish_body " , <nl> - " classish_body_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 96 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ <nl> - { " kind " : " extra_token_error " , " text " : " } \ n " , " offset " : 97 , " width " : 5 } , <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 95 , " width " : 1 } <nl> - ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " classish_body_elements " : { " kind " : " missing " } , <nl> - " classish_body_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 97 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 98 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " end_of_file " , <nl> - " end_of_file_token " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " end_of_file " , <nl> - " text " : " " , <nl> - " offset " : 99 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 10 <nl> - } <nl> - } <nl> - } <nl> - ] <nl> - } <nl> - } , <nl> - " program_text " : " < ? php \ n \ nclass usiNG { } \ n \ nfunction foo ( ) : usiNG { \ n return new usiNG ( ) ; \ n } \ n \ nclass bar extends usiNG { } \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> - } <nl> deleted file mode 100644 <nl> index 53146c196a0 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php_cap3 . php <nl> ppp / dev / null <nl> <nl> - < ? php <nl> - <nl> - function inOut ( ) { } <nl> - <nl> - function usIng ( ) { } <nl> - <nl> - inOut ( ) ; <nl> - usIng ( ) ; <nl> deleted file mode 100644 <nl> index e8ed20a2666 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php_cap3 . php . errors . exp <nl> ppp / dev / null <nl> <nl> - ( 3 , 10 ) - ( 3 , 15 ) Keyword inOut must be written in lowercase <nl> - ( 3 , 15 ) - ( 3 , 15 ) A name or __construct keyword is expected here . <nl> - ( 5 , 10 ) - ( 5 , 15 ) Keyword usIng must be written in lowercase <nl> - ( 5 , 15 ) - ( 5 , 15 ) A name or __construct keyword is expected here . <nl> - ( 7 , 1 ) - ( 7 , 6 ) Keyword inOut must be written in lowercase <nl> - ( 7 , 6 ) - ( 7 , 6 ) An expression is expected here . <nl> - ( 8 , 1 ) - ( 8 , 6 ) Keyword usIng must be written in lowercase <nl> - ( 8 , 1 ) - ( 8 , 9 ) Using statement in function scoped form may only be used at the top level of a function or a method <nl> - ( 8 , 8 ) - ( 8 , 8 ) An expression is expected here . <nl> deleted file mode 100644 <nl> index 9e1d2e91851 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php_cap3 . php . json . exp <nl> ppp / dev / null <nl> <nl> - { <nl> - " parse_tree " : { <nl> - " kind " : " script " , <nl> - " script_declarations " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " markup_section " , <nl> - " markup_text " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " markup " , <nl> - " text " : " " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix " : { <nl> - " kind " : " markup_suffix " , <nl> - " markup_suffix_less_than_question " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " < ? " , <nl> - " text " : " < ? " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " php " , <nl> - " offset " : 2 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> - " line_number " : 1 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 6 , <nl> - " leading_width " : 1 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 15 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " error " , <nl> - " error_error " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " inout " , <nl> - " text " : " inOut " , <nl> - " offset " : 16 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 3 <nl> - } <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 21 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 22 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 23 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 24 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 25 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 26 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " function_declaration " , <nl> - " function_attribute_spec " : { " kind " : " missing " } , <nl> - " function_declaration_header " : { <nl> - " kind " : " function_declaration_header " , <nl> - " function_modifiers " : { " kind " : " missing " } , <nl> - " function_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " function " , <nl> - " text " : " function " , <nl> - " offset " : 27 , <nl> - " leading_width " : 1 , <nl> - " width " : 8 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 27 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 36 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_name " : { <nl> - " kind " : " error " , <nl> - " error_error " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " using " , <nl> - " text " : " usIng " , <nl> - " offset " : 37 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } <nl> - } , <nl> - " function_type_parameter_list " : { " kind " : " missing " } , <nl> - " function_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 42 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_parameter_list " : { " kind " : " missing " } , <nl> - " function_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 43 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 44 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " function_colon " : { " kind " : " missing " } , <nl> - " function_type " : { " kind " : " missing " } , <nl> - " function_where_clause " : { " kind " : " missing " } <nl> - } , <nl> - " function_body " : { <nl> - " kind " : " compound_statement " , <nl> - " compound_left_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " { " , <nl> - " text " : " { " , <nl> - " offset " : 45 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 5 <nl> - } <nl> - } , <nl> - " compound_statements " : { " kind " : " missing " } , <nl> - " compound_right_brace " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " } " , <nl> - " text " : " } " , <nl> - " offset " : 46 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 47 , " width " : 1 } ] , <nl> - " line_number " : 5 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " function_call_expression " , <nl> - " function_call_receiver " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " inout " , <nl> - " text " : " inOut " , <nl> - " offset " : 48 , <nl> - " leading_width " : 1 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 48 , " width " : 1 } ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 7 <nl> - } <nl> - } , <nl> - " function_call_type_args " : { " kind " : " missing " } , <nl> - " function_call_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 54 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 7 <nl> - } <nl> - } , <nl> - " function_call_argument_list " : { " kind " : " missing " } , <nl> - " function_call_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 55 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 7 <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 56 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 57 , " width " : 1 } ] , <nl> - " line_number " : 7 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " using_statement_function_scoped " , <nl> - " using_function_await_keyword " : { " kind " : " missing " } , <nl> - " using_function_using_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " using " , <nl> - " text " : " usIng " , <nl> - " offset " : 58 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 8 <nl> - } <nl> - } , <nl> - " using_function_expression " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 63 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 8 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 64 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 8 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { " kind " : " missing " } <nl> - } , <nl> - " using_function_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 65 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 66 , " width " : 1 } ] , <nl> - " line_number " : 8 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " end_of_file " , <nl> - " end_of_file_token " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " end_of_file " , <nl> - " text " : " " , <nl> - " offset " : 67 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 9 <nl> - } <nl> - } <nl> - } <nl> - ] <nl> - } <nl> - } , <nl> - " program_text " : " < ? php \ n \ nfunction inOut ( ) { } \ n \ nfunction usIng ( ) { } \ n \ ninOut ( ) ; \ nusIng ( ) ; \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> - } <nl> deleted file mode 100644 <nl> index cd4ec005551 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php_cap4 . php <nl> ppp / dev / null <nl> <nl> - < ? php <nl> - <nl> - const inOUT = 1 ; <nl> - const usiNG = 2 ; <nl> - <nl> - $ x = inOUT ; <nl> - $ y = usiNG ; <nl> - $ z = inOUT + usiNG ; <nl> - print ( inOUT ) ; <nl> - print ( usiNG ) ; <nl> deleted file mode 100644 <nl> index 4c0bb8cd882 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php_cap4 . php . errors . exp <nl> ppp / dev / null <nl> <nl> - ( 6 , 6 ) - ( 6 , 11 ) Keyword inOUT must be written in lowercase <nl> - ( 6 , 11 ) - ( 6 , 11 ) An expression is expected here . <nl> - ( 7 , 6 ) - ( 7 , 11 ) Keyword usiNG must be written in lowercase <nl> - ( 7 , 11 ) - ( 7 , 11 ) An expression is expected here . <nl> - ( 8 , 6 ) - ( 8 , 11 ) Keyword inOUT must be written in lowercase <nl> - ( 8 , 12 ) - ( 8 , 12 ) An expression is expected here . <nl> - ( 8 , 14 ) - ( 8 , 19 ) Keyword usiNG must be written in lowercase <nl> - ( 8 , 19 ) - ( 8 , 19 ) An expression is expected here . <nl> - ( 9 , 7 ) - ( 9 , 12 ) Keyword inOUT must be written in lowercase <nl> - ( 9 , 12 ) - ( 9 , 12 ) An expression is expected here . <nl> - ( 10 , 7 ) - ( 10 , 12 ) Keyword usiNG must be written in lowercase <nl> - ( 10 , 12 ) - ( 10 , 12 ) An expression is expected here . <nl> deleted file mode 100644 <nl> index 54cd5ff9bf0 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / hack_kw_in_php_cap4 . php . json . exp <nl> ppp / dev / null <nl> <nl> - { <nl> - " parse_tree " : { <nl> - " kind " : " script " , <nl> - " script_declarations " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " markup_section " , <nl> - " markup_text " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " markup " , <nl> - " text " : " " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix " : { <nl> - " kind " : " markup_suffix " , <nl> - " markup_suffix_less_than_question " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " < ? " , <nl> - " text " : " < ? " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " php " , <nl> - " offset " : 2 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> - " line_number " : 1 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " const_declaration " , <nl> - " const_modifiers " : { " kind " : " missing " } , <nl> - " const_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " const " , <nl> - " text " : " const " , <nl> - " offset " : 6 , <nl> - " leading_width " : 1 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 12 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " const_type_specifier " : { " kind " : " missing " } , <nl> - " const_declarators " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " list_item " , <nl> - " list_item " : { <nl> - " kind " : " constant_declarator " , <nl> - " constant_declarator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " inOUT " , <nl> - " offset " : 13 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 18 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " constant_declarator_initializer " : { <nl> - " kind " : " simple_initializer " , <nl> - " simple_initializer_equal " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " = " , <nl> - " text " : " = " , <nl> - " offset " : 19 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 20 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } , <nl> - " simple_initializer_value " : { <nl> - " kind " : " literal " , <nl> - " literal_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " decimal_literal " , <nl> - " text " : " 1 " , <nl> - " offset " : 21 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 3 <nl> - } <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " list_separator " : { " kind " : " missing " } <nl> - } <nl> - ] <nl> - } , <nl> - " const_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 22 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 23 , " width " : 1 } ] , <nl> - " line_number " : 3 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " const_declaration " , <nl> - " const_modifiers " : { " kind " : " missing " } , <nl> - " const_keyword " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " const " , <nl> - " text " : " const " , <nl> - " offset " : 24 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 29 , " width " : 1 } ] , <nl> - " line_number " : 4 <nl> - } <nl> - } , <nl> - " const_type_specifier " : { " kind " : " missing " } , <nl> - " const_declarators " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " list_item " , <nl> - " list_item " : { <nl> - " kind " : " constant_declarator " , <nl> - " constant_declarator_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " usiNG " , <nl> - " offset " : 30 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 35 , " width " : 1 } ] , <nl> - " line_number " : 4 <nl> - } <nl> - } , <nl> - " constant_declarator_initializer " : { <nl> - " kind " : " simple_initializer " , <nl> - " simple_initializer_equal " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " = " , <nl> - " text " : " = " , <nl> - " offset " : 36 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 37 , " width " : 1 } ] , <nl> - " line_number " : 4 <nl> - } <nl> - } , <nl> - " simple_initializer_value " : { <nl> - " kind " : " literal " , <nl> - " literal_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " decimal_literal " , <nl> - " text " : " 2 " , <nl> - " offset " : 38 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 4 <nl> - } <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " list_separator " : { " kind " : " missing " } <nl> - } <nl> - ] <nl> - } , <nl> - " const_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 39 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 40 , " width " : 1 } ] , <nl> - " line_number " : 4 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " binary_expression " , <nl> - " binary_left_operand " : { <nl> - " kind " : " variable " , <nl> - " variable_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " variable " , <nl> - " text " : " $ x " , <nl> - " offset " : 41 , <nl> - " leading_width " : 1 , <nl> - " width " : 2 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 41 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 44 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } <nl> - } , <nl> - " binary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " = " , <nl> - " text " : " = " , <nl> - " offset " : 45 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 46 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } , <nl> - " binary_right_operand " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " inout " , <nl> - " text " : " inOUT " , <nl> - " offset " : 47 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 6 <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 52 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 53 , " width " : 1 } ] , <nl> - " line_number " : 6 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " binary_expression " , <nl> - " binary_left_operand " : { <nl> - " kind " : " variable " , <nl> - " variable_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " variable " , <nl> - " text " : " $ y " , <nl> - " offset " : 54 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 56 , " width " : 1 } ] , <nl> - " line_number " : 7 <nl> - } <nl> - } <nl> - } , <nl> - " binary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " = " , <nl> - " text " : " = " , <nl> - " offset " : 57 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 58 , " width " : 1 } ] , <nl> - " line_number " : 7 <nl> - } <nl> - } , <nl> - " binary_right_operand " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " using " , <nl> - " text " : " usiNG " , <nl> - " offset " : 59 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 7 <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 64 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 65 , " width " : 1 } ] , <nl> - " line_number " : 7 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " binary_expression " , <nl> - " binary_left_operand " : { <nl> - " kind " : " variable " , <nl> - " variable_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " variable " , <nl> - " text " : " $ z " , <nl> - " offset " : 66 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 68 , " width " : 1 } ] , <nl> - " line_number " : 8 <nl> - } <nl> - } <nl> - } , <nl> - " binary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " = " , <nl> - " text " : " = " , <nl> - " offset " : 69 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 70 , " width " : 1 } ] , <nl> - " line_number " : 8 <nl> - } <nl> - } , <nl> - " binary_right_operand " : { <nl> - " kind " : " binary_expression " , <nl> - " binary_left_operand " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " inout " , <nl> - " text " : " inOUT " , <nl> - " offset " : 71 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 76 , " width " : 1 } ] , <nl> - " line_number " : 8 <nl> - } <nl> - } , <nl> - " binary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " + " , <nl> - " text " : " + " , <nl> - " offset " : 77 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 78 , " width " : 1 } ] , <nl> - " line_number " : 8 <nl> - } <nl> - } , <nl> - " binary_right_operand " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " using " , <nl> - " text " : " usiNG " , <nl> - " offset " : 79 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 8 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 84 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 85 , " width " : 1 } ] , <nl> - " line_number " : 8 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " prefix_unary_expression " , <nl> - " prefix_unary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " print " , <nl> - " text " : " print " , <nl> - " offset " : 86 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " prefix_unary_operand " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 91 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " inout " , <nl> - " text " : " inOUT " , <nl> - " offset " : 92 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 9 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 97 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 9 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 98 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 99 , " width " : 1 } ] , <nl> - " line_number " : 9 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " expression_statement " , <nl> - " expression_statement_expression " : { <nl> - " kind " : " prefix_unary_expression " , <nl> - " prefix_unary_operator " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " print " , <nl> - " text " : " print " , <nl> - " offset " : 100 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 10 <nl> - } <nl> - } , <nl> - " prefix_unary_operand " : { <nl> - " kind " : " parenthesized_expression " , <nl> - " parenthesized_expression_left_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ( " , <nl> - " text " : " ( " , <nl> - " offset " : 105 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 10 <nl> - } <nl> - } , <nl> - " parenthesized_expression_expression " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " using " , <nl> - " text " : " usiNG " , <nl> - " offset " : 106 , <nl> - " leading_width " : 0 , <nl> - " width " : 5 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 10 <nl> - } <nl> - } , <nl> - " parenthesized_expression_right_paren " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ) " , <nl> - " text " : " ) " , <nl> - " offset " : 111 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 10 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - " expression_statement_semicolon " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " ; " , <nl> - " text " : " ; " , <nl> - " offset " : 112 , <nl> - " leading_width " : 0 , <nl> - " width " : 1 , <nl> - " trailing_width " : 1 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 113 , " width " : 1 } ] , <nl> - " line_number " : 10 <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " end_of_file " , <nl> - " end_of_file_token " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " end_of_file " , <nl> - " text " : " " , <nl> - " offset " : 114 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 11 <nl> - } <nl> - } <nl> - } <nl> - ] <nl> - } <nl> - } , <nl> - " program_text " : " < ? php \ n \ nconst inOUT = 1 ; \ nconst usiNG = 2 ; \ n \ n $ x = inOUT ; \ n $ y = usiNG ; \ n $ z = inOUT + usiNG ; \ nprint ( inOUT ) ; \ nprint ( usiNG ) ; \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> - } <nl> mmm a / hphp / hack / test / full_fidelity / cases / keyword_as_class_reserved_php . php <nl> ppp b / hphp / hack / test / full_fidelity / cases / keyword_as_class_reserved_php . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> / / make sure hack reserved keywords are allowed in php files <nl> class arraykey { } <nl> mmm a / hphp / hack / test / full_fidelity / cases / keyword_as_class_reserved_php . php . json . exp <nl> ppp b / hphp / hack / test / full_fidelity / cases / keyword_as_class_reserved_php . php . json . exp <nl> <nl> " kind " : " token " , <nl> " token " : { <nl> " kind " : " name " , <nl> - " text " : " php " , <nl> + " text " : " hh " , <nl> " offset " : 2 , <nl> " leading_width " : 0 , <nl> - " width " : 3 , <nl> + " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 4 , " width " : 1 } ] , <nl> " line_number " : 1 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 6 , <nl> + " offset " : 5 , <nl> " leading_width " : 62 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } , <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } , <nl> { <nl> " kind " : " single_line_comment " , <nl> " text " : " / / make sure hack reserved keywords are allowed in php files " , <nl> - " offset " : 7 , <nl> + " offset " : 6 , <nl> " width " : 60 <nl> } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 67 , " width " : 1 } <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 66 , " width " : 1 } <nl> ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 73 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 72 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " arraykey " , <nl> - " offset " : 74 , <nl> + " offset " : 73 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 82 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 81 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 83 , <nl> + " offset " : 82 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 84 , <nl> + " offset " : 83 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 85 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 84 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 86 , <nl> + " offset " : 85 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 91 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 90 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " bool " , <nl> - " offset " : 92 , <nl> + " offset " : 91 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 96 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 95 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 97 , <nl> + " offset " : 96 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 98 , <nl> + " offset " : 97 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 99 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 98 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 100 , <nl> + " offset " : 99 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 105 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 104 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " boolean " , <nl> - " offset " : 106 , <nl> + " offset " : 105 , <nl> " leading_width " : 0 , <nl> " width " : 7 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 113 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 112 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 114 , <nl> + " offset " : 113 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 115 , <nl> + " offset " : 114 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 116 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 115 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 117 , <nl> + " offset " : 116 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 122 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 121 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " classname " , <nl> - " offset " : 123 , <nl> + " offset " : 122 , <nl> " leading_width " : 0 , <nl> " width " : 9 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 132 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 131 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 133 , <nl> + " offset " : 132 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 134 , <nl> + " offset " : 133 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 135 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 134 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 136 , <nl> + " offset " : 135 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 141 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 140 , " width " : 1 } ] , <nl> " line_number " : 8 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " darray " , <nl> - " offset " : 142 , <nl> + " offset " : 141 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 148 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 147 , " width " : 1 } ] , <nl> " line_number " : 8 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 149 , <nl> + " offset " : 148 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 150 , <nl> + " offset " : 149 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 151 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 150 , " width " : 1 } ] , <nl> " line_number " : 8 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 152 , <nl> + " offset " : 151 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 157 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 156 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " dict " , <nl> - " offset " : 158 , <nl> + " offset " : 157 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 162 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 161 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 163 , <nl> + " offset " : 162 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 164 , <nl> + " offset " : 163 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 165 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 164 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 166 , <nl> + " offset " : 165 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 171 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 170 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " double " , <nl> - " offset " : 172 , <nl> + " offset " : 171 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 178 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 177 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 179 , <nl> + " offset " : 178 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 180 , <nl> + " offset " : 179 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 181 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 180 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 182 , <nl> + " offset " : 181 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 187 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 186 , " width " : 1 } ] , <nl> " line_number " : 11 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " false " , <nl> - " offset " : 188 , <nl> + " offset " : 187 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 193 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 192 , " width " : 1 } ] , <nl> " line_number " : 11 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 194 , <nl> + " offset " : 193 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 195 , <nl> + " offset " : 194 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 196 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 195 , " width " : 1 } ] , <nl> " line_number " : 11 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 197 , <nl> + " offset " : 196 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 202 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 201 , " width " : 1 } ] , <nl> " line_number " : 12 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " float " , <nl> - " offset " : 203 , <nl> + " offset " : 202 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 208 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 207 , " width " : 1 } ] , <nl> " line_number " : 12 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 209 , <nl> + " offset " : 208 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 210 , <nl> + " offset " : 209 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 211 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 210 , " width " : 1 } ] , <nl> " line_number " : 12 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 212 , <nl> + " offset " : 211 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 217 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 216 , " width " : 1 } ] , <nl> " line_number " : 13 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " int " , <nl> - " offset " : 218 , <nl> + " offset " : 217 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 221 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 220 , " width " : 1 } ] , <nl> " line_number " : 13 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 222 , <nl> + " offset " : 221 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 223 , <nl> + " offset " : 222 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 224 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 223 , " width " : 1 } ] , <nl> " line_number " : 13 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 225 , <nl> + " offset " : 224 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 230 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 229 , " width " : 1 } ] , <nl> " line_number " : 14 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " integer " , <nl> - " offset " : 231 , <nl> + " offset " : 230 , <nl> " leading_width " : 0 , <nl> " width " : 7 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 238 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 237 , " width " : 1 } ] , <nl> " line_number " : 14 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 239 , <nl> + " offset " : 238 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 240 , <nl> + " offset " : 239 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 241 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 240 , " width " : 1 } ] , <nl> " line_number " : 14 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 242 , <nl> + " offset " : 241 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 247 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 246 , " width " : 1 } ] , <nl> " line_number " : 15 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " keyset " , <nl> - " offset " : 248 , <nl> + " offset " : 247 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 254 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 253 , " width " : 1 } ] , <nl> " line_number " : 15 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 255 , <nl> + " offset " : 254 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 256 , <nl> + " offset " : 255 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 257 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 256 , " width " : 1 } ] , <nl> " line_number " : 15 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 258 , <nl> + " offset " : 257 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 263 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 262 , " width " : 1 } ] , <nl> " line_number " : 16 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " mixed " , <nl> - " offset " : 264 , <nl> + " offset " : 263 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 269 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 268 , " width " : 1 } ] , <nl> " line_number " : 16 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 270 , <nl> + " offset " : 269 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 271 , <nl> + " offset " : 270 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 272 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 271 , " width " : 1 } ] , <nl> " line_number " : 16 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 273 , <nl> + " offset " : 272 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 278 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 277 , " width " : 1 } ] , <nl> " line_number " : 17 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " noreturn " , <nl> - " offset " : 279 , <nl> + " offset " : 278 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 287 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 286 , " width " : 1 } ] , <nl> " line_number " : 17 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 288 , <nl> + " offset " : 287 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 289 , <nl> + " offset " : 288 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 290 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 289 , " width " : 1 } ] , <nl> " line_number " : 17 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 291 , <nl> + " offset " : 290 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 296 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 295 , " width " : 1 } ] , <nl> " line_number " : 18 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " null " , <nl> - " offset " : 297 , <nl> + " offset " : 296 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 301 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 300 , " width " : 1 } ] , <nl> " line_number " : 18 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 302 , <nl> + " offset " : 301 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 303 , <nl> + " offset " : 302 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 304 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 303 , " width " : 1 } ] , <nl> " line_number " : 18 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 305 , <nl> + " offset " : 304 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 310 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 309 , " width " : 1 } ] , <nl> " line_number " : 19 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " num " , <nl> - " offset " : 311 , <nl> + " offset " : 310 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 314 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 313 , " width " : 1 } ] , <nl> " line_number " : 19 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 315 , <nl> + " offset " : 314 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 316 , <nl> + " offset " : 315 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 317 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 316 , " width " : 1 } ] , <nl> " line_number " : 19 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 318 , <nl> + " offset " : 317 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 323 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 322 , " width " : 1 } ] , <nl> " line_number " : 20 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " parent " , <nl> - " offset " : 324 , <nl> + " offset " : 323 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 330 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 329 , " width " : 1 } ] , <nl> " line_number " : 20 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 331 , <nl> + " offset " : 330 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 332 , <nl> + " offset " : 331 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 333 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 332 , " width " : 1 } ] , <nl> " line_number " : 20 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 334 , <nl> + " offset " : 333 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 339 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 338 , " width " : 1 } ] , <nl> " line_number " : 21 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " real " , <nl> - " offset " : 340 , <nl> + " offset " : 339 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 344 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 343 , " width " : 1 } ] , <nl> " line_number " : 21 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 345 , <nl> + " offset " : 344 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 346 , <nl> + " offset " : 345 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 347 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 346 , " width " : 1 } ] , <nl> " line_number " : 21 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 348 , <nl> + " offset " : 347 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 353 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 352 , " width " : 1 } ] , <nl> " line_number " : 22 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " resource " , <nl> - " offset " : 354 , <nl> + " offset " : 353 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 362 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 361 , " width " : 1 } ] , <nl> " line_number " : 22 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 363 , <nl> + " offset " : 362 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 364 , <nl> + " offset " : 363 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 365 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 364 , " width " : 1 } ] , <nl> " line_number " : 22 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 366 , <nl> + " offset " : 365 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 371 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 370 , " width " : 1 } ] , <nl> " line_number " : 23 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " self " , <nl> - " offset " : 372 , <nl> + " offset " : 371 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 376 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 375 , " width " : 1 } ] , <nl> " line_number " : 23 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 377 , <nl> + " offset " : 376 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 378 , <nl> + " offset " : 377 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 379 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 378 , " width " : 1 } ] , <nl> " line_number " : 23 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 380 , <nl> + " offset " : 379 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 385 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 384 , " width " : 1 } ] , <nl> " line_number " : 24 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " string " , <nl> - " offset " : 386 , <nl> + " offset " : 385 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 392 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 391 , " width " : 1 } ] , <nl> " line_number " : 24 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 393 , <nl> + " offset " : 392 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 394 , <nl> + " offset " : 393 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 395 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 394 , " width " : 1 } ] , <nl> " line_number " : 24 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 396 , <nl> + " offset " : 395 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 401 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 400 , " width " : 1 } ] , <nl> " line_number " : 25 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " this " , <nl> - " offset " : 402 , <nl> + " offset " : 401 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 406 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 405 , " width " : 1 } ] , <nl> " line_number " : 25 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 407 , <nl> + " offset " : 406 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 408 , <nl> + " offset " : 407 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 409 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 408 , " width " : 1 } ] , <nl> " line_number " : 25 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 410 , <nl> + " offset " : 409 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 415 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 414 , " width " : 1 } ] , <nl> " line_number " : 26 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " true " , <nl> - " offset " : 416 , <nl> + " offset " : 415 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 420 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 419 , " width " : 1 } ] , <nl> " line_number " : 26 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 421 , <nl> + " offset " : 420 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 422 , <nl> + " offset " : 421 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 423 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 422 , " width " : 1 } ] , <nl> " line_number " : 26 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 424 , <nl> + " offset " : 423 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 429 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 428 , " width " : 1 } ] , <nl> " line_number " : 27 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " varray " , <nl> - " offset " : 430 , <nl> + " offset " : 429 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 436 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 435 , " width " : 1 } ] , <nl> " line_number " : 27 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 437 , <nl> + " offset " : 436 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 438 , <nl> + " offset " : 437 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 439 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 438 , " width " : 1 } ] , <nl> " line_number " : 27 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 440 , <nl> + " offset " : 439 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 445 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 444 , " width " : 1 } ] , <nl> " line_number " : 28 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " vec " , <nl> - " offset " : 446 , <nl> + " offset " : 445 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 449 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 448 , " width " : 1 } ] , <nl> " line_number " : 28 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 450 , <nl> + " offset " : 449 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 451 , <nl> + " offset " : 450 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 452 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 451 , " width " : 1 } ] , <nl> " line_number " : 28 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 453 , <nl> + " offset " : 452 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 458 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 457 , " width " : 1 } ] , <nl> " line_number " : 29 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " void " , <nl> - " offset " : 459 , <nl> + " offset " : 458 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 463 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 462 , " width " : 1 } ] , <nl> " line_number " : 29 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 464 , <nl> + " offset " : 463 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 465 , <nl> + " offset " : 464 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 466 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 465 , " width " : 1 } ] , <nl> " line_number " : 29 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 467 , <nl> + " offset " : 466 , <nl> " leading_width " : 1 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 467 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 471 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 466 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 470 , " width " : 1 } ] , <nl> " line_number " : 31 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " arraykey " , <nl> - " offset " : 472 , <nl> + " offset " : 471 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 480 , <nl> + " offset " : 479 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 481 , <nl> + " offset " : 480 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 482 , <nl> + " offset " : 481 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 483 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 482 , " width " : 1 } ] , <nl> " line_number " : 31 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 484 , <nl> + " offset " : 483 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 487 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 486 , " width " : 1 } ] , <nl> " line_number " : 32 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " bool " , <nl> - " offset " : 488 , <nl> + " offset " : 487 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 492 , <nl> + " offset " : 491 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 493 , <nl> + " offset " : 492 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 494 , <nl> + " offset " : 493 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 495 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 494 , " width " : 1 } ] , <nl> " line_number " : 32 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 496 , <nl> + " offset " : 495 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 499 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 498 , " width " : 1 } ] , <nl> " line_number " : 33 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " boolean " , <nl> - " offset " : 500 , <nl> + " offset " : 499 , <nl> " leading_width " : 0 , <nl> " width " : 7 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 507 , <nl> + " offset " : 506 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 508 , <nl> + " offset " : 507 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 509 , <nl> + " offset " : 508 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 510 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 509 , " width " : 1 } ] , <nl> " line_number " : 33 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 511 , <nl> + " offset " : 510 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 514 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 513 , " width " : 1 } ] , <nl> " line_number " : 34 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " classname " , <nl> - " offset " : 515 , <nl> + " offset " : 514 , <nl> " leading_width " : 0 , <nl> " width " : 9 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 524 , <nl> + " offset " : 523 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 525 , <nl> + " offset " : 524 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 526 , <nl> + " offset " : 525 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 527 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 526 , " width " : 1 } ] , <nl> " line_number " : 34 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 528 , <nl> + " offset " : 527 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 531 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 530 , " width " : 1 } ] , <nl> " line_number " : 35 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " darray " , <nl> - " offset " : 532 , <nl> + " offset " : 531 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 538 , <nl> + " offset " : 537 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 539 , <nl> + " offset " : 538 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 540 , <nl> + " offset " : 539 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 541 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 540 , " width " : 1 } ] , <nl> " line_number " : 35 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 542 , <nl> + " offset " : 541 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 545 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 544 , " width " : 1 } ] , <nl> " line_number " : 36 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " dict " , <nl> - " offset " : 546 , <nl> + " offset " : 545 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 550 , <nl> + " offset " : 549 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 551 , <nl> + " offset " : 550 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 552 , <nl> + " offset " : 551 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 553 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 552 , " width " : 1 } ] , <nl> " line_number " : 36 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 554 , <nl> + " offset " : 553 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 557 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 556 , " width " : 1 } ] , <nl> " line_number " : 37 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " double " , <nl> - " offset " : 558 , <nl> + " offset " : 557 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 564 , <nl> + " offset " : 563 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 565 , <nl> + " offset " : 564 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 566 , <nl> + " offset " : 565 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 567 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 566 , " width " : 1 } ] , <nl> " line_number " : 37 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 568 , <nl> + " offset " : 567 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 571 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 570 , " width " : 1 } ] , <nl> " line_number " : 38 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " boolean_literal " , <nl> " text " : " false " , <nl> - " offset " : 572 , <nl> + " offset " : 571 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 577 , <nl> + " offset " : 576 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 578 , <nl> + " offset " : 577 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 579 , <nl> + " offset " : 578 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 580 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 579 , " width " : 1 } ] , <nl> " line_number " : 38 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 581 , <nl> + " offset " : 580 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 584 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 583 , " width " : 1 } ] , <nl> " line_number " : 39 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " float " , <nl> - " offset " : 585 , <nl> + " offset " : 584 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 590 , <nl> + " offset " : 589 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 591 , <nl> + " offset " : 590 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 592 , <nl> + " offset " : 591 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 593 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 592 , " width " : 1 } ] , <nl> " line_number " : 39 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 594 , <nl> + " offset " : 593 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 597 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 596 , " width " : 1 } ] , <nl> " line_number " : 40 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " int " , <nl> - " offset " : 598 , <nl> + " offset " : 597 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 601 , <nl> + " offset " : 600 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 602 , <nl> + " offset " : 601 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 603 , <nl> + " offset " : 602 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 604 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 603 , " width " : 1 } ] , <nl> " line_number " : 40 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 605 , <nl> + " offset " : 604 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 608 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 607 , " width " : 1 } ] , <nl> " line_number " : 41 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " integer " , <nl> - " offset " : 609 , <nl> + " offset " : 608 , <nl> " leading_width " : 0 , <nl> " width " : 7 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 616 , <nl> + " offset " : 615 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 617 , <nl> + " offset " : 616 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 618 , <nl> + " offset " : 617 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 619 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 618 , " width " : 1 } ] , <nl> " line_number " : 41 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 620 , <nl> + " offset " : 619 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 623 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 622 , " width " : 1 } ] , <nl> " line_number " : 42 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " keyset " , <nl> - " offset " : 624 , <nl> + " offset " : 623 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 630 , <nl> + " offset " : 629 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 631 , <nl> + " offset " : 630 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 632 , <nl> + " offset " : 631 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 633 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 632 , " width " : 1 } ] , <nl> " line_number " : 42 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 634 , <nl> + " offset " : 633 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 637 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 636 , " width " : 1 } ] , <nl> " line_number " : 43 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " mixed " , <nl> - " offset " : 638 , <nl> + " offset " : 637 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 643 , <nl> + " offset " : 642 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 644 , <nl> + " offset " : 643 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 645 , <nl> + " offset " : 644 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 646 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 645 , " width " : 1 } ] , <nl> " line_number " : 43 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 647 , <nl> + " offset " : 646 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 650 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 649 , " width " : 1 } ] , <nl> " line_number " : 44 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " noreturn " , <nl> - " offset " : 651 , <nl> + " offset " : 650 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 659 , <nl> + " offset " : 658 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 660 , <nl> + " offset " : 659 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 661 , <nl> + " offset " : 660 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 662 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 661 , " width " : 1 } ] , <nl> " line_number " : 44 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 663 , <nl> + " offset " : 662 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 666 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 665 , " width " : 1 } ] , <nl> " line_number " : 45 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " null " , <nl> " text " : " null " , <nl> - " offset " : 667 , <nl> + " offset " : 666 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 671 , <nl> + " offset " : 670 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 672 , <nl> + " offset " : 671 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 673 , <nl> + " offset " : 672 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 674 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 673 , " width " : 1 } ] , <nl> " line_number " : 45 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 675 , <nl> + " offset " : 674 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 678 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 677 , " width " : 1 } ] , <nl> " line_number " : 46 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " num " , <nl> - " offset " : 679 , <nl> + " offset " : 678 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 682 , <nl> + " offset " : 681 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 683 , <nl> + " offset " : 682 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 684 , <nl> + " offset " : 683 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 685 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 684 , " width " : 1 } ] , <nl> " line_number " : 46 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 686 , <nl> + " offset " : 685 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 689 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 688 , " width " : 1 } ] , <nl> " line_number " : 47 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " parent " , <nl> " text " : " parent " , <nl> - " offset " : 690 , <nl> + " offset " : 689 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 696 , <nl> + " offset " : 695 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 697 , <nl> + " offset " : 696 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 698 , <nl> + " offset " : 697 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 699 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 698 , " width " : 1 } ] , <nl> " line_number " : 47 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 700 , <nl> + " offset " : 699 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 703 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 702 , " width " : 1 } ] , <nl> " line_number " : 48 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " real " , <nl> - " offset " : 704 , <nl> + " offset " : 703 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 708 , <nl> + " offset " : 707 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 709 , <nl> + " offset " : 708 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 710 , <nl> + " offset " : 709 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 711 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 710 , " width " : 1 } ] , <nl> " line_number " : 48 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 712 , <nl> + " offset " : 711 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 715 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 714 , " width " : 1 } ] , <nl> " line_number " : 49 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " resource " , <nl> - " offset " : 716 , <nl> + " offset " : 715 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 724 , <nl> + " offset " : 723 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 725 , <nl> + " offset " : 724 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 726 , <nl> + " offset " : 725 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 727 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 726 , " width " : 1 } ] , <nl> " line_number " : 49 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 728 , <nl> + " offset " : 727 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 731 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 730 , " width " : 1 } ] , <nl> " line_number " : 50 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " self " , <nl> " text " : " self " , <nl> - " offset " : 732 , <nl> + " offset " : 731 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 736 , <nl> + " offset " : 735 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 737 , <nl> + " offset " : 736 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 738 , <nl> + " offset " : 737 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 739 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 738 , " width " : 1 } ] , <nl> " line_number " : 50 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 740 , <nl> + " offset " : 739 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 743 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 742 , " width " : 1 } ] , <nl> " line_number " : 51 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " string " , <nl> - " offset " : 744 , <nl> + " offset " : 743 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 750 , <nl> + " offset " : 749 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 751 , <nl> + " offset " : 750 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 752 , <nl> + " offset " : 751 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 753 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 752 , " width " : 1 } ] , <nl> " line_number " : 51 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 754 , <nl> + " offset " : 753 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 757 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 756 , " width " : 1 } ] , <nl> " line_number " : 52 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " this " , <nl> - " offset " : 758 , <nl> + " offset " : 757 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 762 , <nl> + " offset " : 761 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 763 , <nl> + " offset " : 762 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 764 , <nl> + " offset " : 763 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 765 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 764 , " width " : 1 } ] , <nl> " line_number " : 52 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 766 , <nl> + " offset " : 765 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 769 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 768 , " width " : 1 } ] , <nl> " line_number " : 53 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " boolean_literal " , <nl> " text " : " true " , <nl> - " offset " : 770 , <nl> + " offset " : 769 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 774 , <nl> + " offset " : 773 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 775 , <nl> + " offset " : 774 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 776 , <nl> + " offset " : 775 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 777 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 776 , " width " : 1 } ] , <nl> " line_number " : 53 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 778 , <nl> + " offset " : 777 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 781 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 780 , " width " : 1 } ] , <nl> " line_number " : 54 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " varray " , <nl> - " offset " : 782 , <nl> + " offset " : 781 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 788 , <nl> + " offset " : 787 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 789 , <nl> + " offset " : 788 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 790 , <nl> + " offset " : 789 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 791 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 790 , " width " : 1 } ] , <nl> " line_number " : 54 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 792 , <nl> + " offset " : 791 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 795 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 794 , " width " : 1 } ] , <nl> " line_number " : 55 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " vec " , <nl> - " offset " : 796 , <nl> + " offset " : 795 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 799 , <nl> + " offset " : 798 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 800 , <nl> + " offset " : 799 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 801 , <nl> + " offset " : 800 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 802 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 801 , " width " : 1 } ] , <nl> " line_number " : 55 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 803 , <nl> + " offset " : 802 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 806 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 805 , " width " : 1 } ] , <nl> " line_number " : 56 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " void " , <nl> - " offset " : 807 , <nl> + " offset " : 806 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 811 , <nl> + " offset " : 810 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 812 , <nl> + " offset " : 811 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 813 , <nl> + " offset " : 812 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 814 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 813 , " width " : 1 } ] , <nl> " line_number " : 56 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " end_of_file " , <nl> " text " : " " , <nl> - " offset " : 815 , <nl> + " offset " : 814 , <nl> " leading_width " : 0 , <nl> " width " : 0 , <nl> " trailing_width " : 0 , <nl> <nl> ] <nl> } <nl> } , <nl> - " program_text " : " < ? php \ n \ n / / make sure hack reserved keywords are allowed in php files \ nclass arraykey { } \ nclass bool { } \ nclass boolean { } \ nclass classname { } \ nclass darray { } \ nclass dict { } \ nclass double { } \ nclass false { } \ nclass float { } \ nclass int { } \ nclass integer { } \ nclass keyset { } \ nclass mixed { } \ nclass noreturn { } \ nclass null { } \ nclass num { } \ nclass parent { } \ nclass real { } \ nclass resource { } \ nclass self { } \ nclass string { } \ nclass this { } \ nclass true { } \ nclass varray { } \ nclass vec { } \ nclass void { } \ n \ nnew arraykey ( ) ; \ nnew bool ( ) ; \ nnew boolean ( ) ; \ nnew classname ( ) ; \ nnew darray ( ) ; \ nnew dict ( ) ; \ nnew double ( ) ; \ nnew false ( ) ; \ nnew float ( ) ; \ nnew int ( ) ; \ nnew integer ( ) ; \ nnew keyset ( ) ; \ nnew mixed ( ) ; \ nnew noreturn ( ) ; \ nnew null ( ) ; \ nnew num ( ) ; \ nnew parent ( ) ; \ nnew real ( ) ; \ nnew resource ( ) ; \ nnew self ( ) ; \ nnew string ( ) ; \ nnew this ( ) ; \ nnew true ( ) ; \ nnew varray ( ) ; \ nnew vec ( ) ; \ nnew void ( ) ; \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> + " program_text " : " < ? hh \ n \ n / / make sure hack reserved keywords are allowed in php files \ nclass arraykey { } \ nclass bool { } \ nclass boolean { } \ nclass classname { } \ nclass darray { } \ nclass dict { } \ nclass double { } \ nclass false { } \ nclass float { } \ nclass int { } \ nclass integer { } \ nclass keyset { } \ nclass mixed { } \ nclass noreturn { } \ nclass null { } \ nclass num { } \ nclass parent { } \ nclass real { } \ nclass resource { } \ nclass self { } \ nclass string { } \ nclass this { } \ nclass true { } \ nclass varray { } \ nclass vec { } \ nclass void { } \ n \ nnew arraykey ( ) ; \ nnew bool ( ) ; \ nnew boolean ( ) ; \ nnew classname ( ) ; \ nnew darray ( ) ; \ nnew dict ( ) ; \ nnew double ( ) ; \ nnew false ( ) ; \ nnew float ( ) ; \ nnew int ( ) ; \ nnew integer ( ) ; \ nnew keyset ( ) ; \ nnew mixed ( ) ; \ nnew noreturn ( ) ; \ nnew null ( ) ; \ nnew num ( ) ; \ nnew parent ( ) ; \ nnew real ( ) ; \ nnew resource ( ) ; \ nnew self ( ) ; \ nnew string ( ) ; \ nnew this ( ) ; \ nnew true ( ) ; \ nnew varray ( ) ; \ nnew vec ( ) ; \ nnew void ( ) ; \ n " , <nl> + " version " : " 2020 - 06 - 30 - 0000 " <nl> } <nl> mmm a / hphp / hack / test / full_fidelity / cases / lambda_default_args / call_in_static_vec . php <nl> ppp b / hphp / hack / test / full_fidelity / cases / lambda_default_args / call_in_static_vec . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> class C { <nl> public static function f ( ) { <nl> mmm a / hphp / hack / test / full_fidelity / cases / lambda_default_args / call_in_static_vec . php . json . exp <nl> ppp b / hphp / hack / test / full_fidelity / cases / lambda_default_args / call_in_static_vec . php . json . exp <nl> <nl> " kind " : " token " , <nl> " token " : { <nl> " kind " : " name " , <nl> - " text " : " php " , <nl> + " text " : " hh " , <nl> " offset " : 2 , <nl> " leading_width " : 0 , <nl> - " width " : 3 , <nl> + " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 4 , " width " : 1 } ] , <nl> " line_number " : 1 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 6 , <nl> + " offset " : 5 , <nl> " leading_width " : 1 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 12 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 11 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " C " , <nl> - " offset " : 13 , <nl> + " offset " : 12 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 14 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 13 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 15 , <nl> + " offset " : 14 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 16 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 15 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " public " , <nl> " text " : " public " , <nl> - " offset " : 17 , <nl> + " offset " : 16 , <nl> " leading_width " : 2 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 17 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 25 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 16 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 24 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " static " , <nl> " text " : " static " , <nl> - " offset " : 26 , <nl> + " offset " : 25 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 32 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 31 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 33 , <nl> + " offset " : 32 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 41 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 40 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " f " , <nl> - " offset " : 42 , <nl> + " offset " : 41 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 43 , <nl> + " offset " : 42 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 44 , <nl> + " offset " : 43 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 45 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 44 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 46 , <nl> + " offset " : 45 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 47 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 46 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " return " , <nl> " text " : " return " , <nl> - " offset " : 48 , <nl> + " offset " : 47 , <nl> " leading_width " : 4 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 48 , " width " : 4 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 58 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 47 , " width " : 4 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 57 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " double_quoted_string_literal " , <nl> " text " : " \ " lol \ " " , <nl> - " offset " : 59 , <nl> + " offset " : 58 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 64 , <nl> + " offset " : 63 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 65 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 64 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 66 , <nl> + " offset " : 65 , <nl> " leading_width " : 2 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 66 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 69 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 65 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 68 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 70 , <nl> + " offset " : 69 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 71 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 70 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 72 , <nl> + " offset " : 71 , <nl> " leading_width " : 1 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 72 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 81 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 71 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 80 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " test " , <nl> - " offset " : 82 , <nl> + " offset " : 81 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 86 , <nl> + " offset " : 85 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 87 , <nl> + " offset " : 86 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " : " , <nl> " text " : " : " , <nl> - " offset " : 88 , <nl> + " offset " : 87 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 89 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 88 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " void " , <nl> " text " : " void " , <nl> - " offset " : 90 , <nl> + " offset " : 89 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 94 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 93 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 95 , <nl> + " offset " : 94 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 96 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 95 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ _ " , <nl> - " offset " : 97 , <nl> + " offset " : 96 , <nl> " leading_width " : 2 , <nl> " width " : 2 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 97 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 101 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 96 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 100 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 102 , <nl> + " offset " : 101 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 103 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 102 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 104 , <nl> + " offset " : 103 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ x " , <nl> - " offset " : 105 , <nl> + " offset " : 104 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 107 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 106 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 108 , <nl> + " offset " : 107 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 109 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 108 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " vec " , <nl> " text " : " vec " , <nl> - " offset " : 110 , <nl> + " offset " : 109 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " [ " , <nl> " text " : " [ " , <nl> - " offset " : 113 , <nl> + " offset " : 112 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " C " , <nl> - " offset " : 114 , <nl> + " offset " : 113 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " : : " , <nl> " text " : " : : " , <nl> - " offset " : 115 , <nl> + " offset " : 114 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " f " , <nl> - " offset " : 117 , <nl> + " offset " : 116 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 118 , <nl> + " offset " : 117 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 119 , <nl> + " offset " : 118 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ] " , <nl> " text " : " ] " , <nl> - " offset " : 120 , <nl> + " offset " : 119 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 121 , <nl> + " offset " : 120 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " : " , <nl> " text " : " : " , <nl> - " offset " : 122 , <nl> + " offset " : 121 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 123 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 122 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " void " , <nl> " text " : " void " , <nl> - " offset " : 124 , <nl> + " offset " : 123 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 128 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 127 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " = = > " , <nl> " text " : " = = > " , <nl> - " offset " : 129 , <nl> + " offset " : 128 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 132 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 131 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 133 , <nl> + " offset " : 132 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 134 , <nl> + " offset " : 133 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 135 , <nl> + " offset " : 134 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 136 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 135 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 137 , <nl> + " offset " : 136 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 138 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 137 , " width " : 1 } ] , <nl> " line_number " : 11 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " end_of_file " , <nl> " text " : " " , <nl> - " offset " : 139 , <nl> + " offset " : 138 , <nl> " leading_width " : 0 , <nl> " width " : 0 , <nl> " trailing_width " : 0 , <nl> <nl> ] <nl> } <nl> } , <nl> - " program_text " : " < ? php \ n \ nclass C { \ n public static function f ( ) { \ n return \ " lol \ " ; \ n } \ n } \ n \ nfunction test ( ) : void { \ n $ _ = ( $ x = vec [ C : : f ( ) ] ) : void = = > { } ; \ n } \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> + " program_text " : " < ? hh \ n \ nclass C { \ n public static function f ( ) { \ n return \ " lol \ " ; \ n } \ n } \ n \ nfunction test ( ) : void { \ n $ _ = ( $ x = vec [ C : : f ( ) ] ) : void = = > { } ; \ n } \ n " , <nl> + " version " : " 2020 - 06 - 30 - 0000 " <nl> } <nl> mmm a / hphp / hack / test / full_fidelity / cases / lambda_default_args / call_in_static_vec_like_array . php <nl> ppp b / hphp / hack / test / full_fidelity / cases / lambda_default_args / call_in_static_vec_like_array . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> class C { <nl> public static function f ( ) { <nl> mmm a / hphp / hack / test / full_fidelity / cases / lambda_default_args / call_in_static_vec_like_array . php . json . exp <nl> ppp b / hphp / hack / test / full_fidelity / cases / lambda_default_args / call_in_static_vec_like_array . php . json . exp <nl> <nl> " kind " : " token " , <nl> " token " : { <nl> " kind " : " name " , <nl> - " text " : " php " , <nl> + " text " : " hh " , <nl> " offset " : 2 , <nl> " leading_width " : 0 , <nl> - " width " : 3 , <nl> + " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 4 , " width " : 1 } ] , <nl> " line_number " : 1 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 6 , <nl> + " offset " : 5 , <nl> " leading_width " : 1 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 12 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 11 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " C " , <nl> - " offset " : 13 , <nl> + " offset " : 12 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 14 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 13 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 15 , <nl> + " offset " : 14 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 16 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 15 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " public " , <nl> " text " : " public " , <nl> - " offset " : 17 , <nl> + " offset " : 16 , <nl> " leading_width " : 2 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 17 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 25 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 16 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 24 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " static " , <nl> " text " : " static " , <nl> - " offset " : 26 , <nl> + " offset " : 25 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 32 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 31 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 33 , <nl> + " offset " : 32 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 41 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 40 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " f " , <nl> - " offset " : 42 , <nl> + " offset " : 41 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 43 , <nl> + " offset " : 42 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 44 , <nl> + " offset " : 43 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 45 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 44 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 46 , <nl> + " offset " : 45 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 47 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 46 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " return " , <nl> " text " : " return " , <nl> - " offset " : 48 , <nl> + " offset " : 47 , <nl> " leading_width " : 4 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 48 , " width " : 4 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 58 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 47 , " width " : 4 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 57 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " double_quoted_string_literal " , <nl> " text " : " \ " lol \ " " , <nl> - " offset " : 59 , <nl> + " offset " : 58 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 64 , <nl> + " offset " : 63 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 65 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 64 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 66 , <nl> + " offset " : 65 , <nl> " leading_width " : 2 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 66 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 69 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 65 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 68 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 70 , <nl> + " offset " : 69 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 71 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 70 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 72 , <nl> + " offset " : 71 , <nl> " leading_width " : 1 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 72 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 81 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 71 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 80 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " test " , <nl> - " offset " : 82 , <nl> + " offset " : 81 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 86 , <nl> + " offset " : 85 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 87 , <nl> + " offset " : 86 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " : " , <nl> " text " : " : " , <nl> - " offset " : 88 , <nl> + " offset " : 87 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 89 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 88 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " void " , <nl> " text " : " void " , <nl> - " offset " : 90 , <nl> + " offset " : 89 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 94 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 93 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 95 , <nl> + " offset " : 94 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 96 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 95 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ _ " , <nl> - " offset " : 97 , <nl> + " offset " : 96 , <nl> " leading_width " : 2 , <nl> " width " : 2 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 97 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 101 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 96 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 100 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 102 , <nl> + " offset " : 101 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 103 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 102 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 104 , <nl> + " offset " : 103 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ x " , <nl> - " offset " : 105 , <nl> + " offset " : 104 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 107 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 106 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 108 , <nl> + " offset " : 107 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 109 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 108 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " varray " , <nl> " text " : " varray " , <nl> - " offset " : 110 , <nl> + " offset " : 109 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " [ " , <nl> " text " : " [ " , <nl> - " offset " : 116 , <nl> + " offset " : 115 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " C " , <nl> - " offset " : 117 , <nl> + " offset " : 116 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " : : " , <nl> " text " : " : : " , <nl> - " offset " : 118 , <nl> + " offset " : 117 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " f " , <nl> - " offset " : 120 , <nl> + " offset " : 119 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 121 , <nl> + " offset " : 120 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 122 , <nl> + " offset " : 121 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ] " , <nl> " text " : " ] " , <nl> - " offset " : 123 , <nl> + " offset " : 122 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 124 , <nl> + " offset " : 123 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " : " , <nl> " text " : " : " , <nl> - " offset " : 125 , <nl> + " offset " : 124 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 126 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 125 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " void " , <nl> " text " : " void " , <nl> - " offset " : 127 , <nl> + " offset " : 126 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 131 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 130 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " = = > " , <nl> " text " : " = = > " , <nl> - " offset " : 132 , <nl> + " offset " : 131 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 135 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 134 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 136 , <nl> + " offset " : 135 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 137 , <nl> + " offset " : 136 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 138 , <nl> + " offset " : 137 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 139 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 138 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 140 , <nl> + " offset " : 139 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 141 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 140 , " width " : 1 } ] , <nl> " line_number " : 11 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " end_of_file " , <nl> " text " : " " , <nl> - " offset " : 142 , <nl> + " offset " : 141 , <nl> " leading_width " : 0 , <nl> " width " : 0 , <nl> " trailing_width " : 0 , <nl> <nl> ] <nl> } <nl> } , <nl> - " program_text " : " < ? php \ n \ nclass C { \ n public static function f ( ) { \ n return \ " lol \ " ; \ n } \ n } \ n \ nfunction test ( ) : void { \ n $ _ = ( $ x = varray [ C : : f ( ) ] ) : void = = > { } ; \ n } \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> + " program_text " : " < ? hh \ n \ nclass C { \ n public static function f ( ) { \ n return \ " lol \ " ; \ n } \ n } \ n \ nfunction test ( ) : void { \ n $ _ = ( $ x = varray [ C : : f ( ) ] ) : void = = > { } ; \ n } \ n " , <nl> + " version " : " 2020 - 06 - 30 - 0000 " <nl> } <nl> deleted file mode 100644 <nl> index c6c5c2a67a6 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / modes / test_mode_ignored_in_php . php <nl> ppp / dev / null <nl> @ @ - 1 + 0 , 0 @ @ <nl> - < ? php / / blah <nl> deleted file mode 100644 <nl> index e6a8976b6a9 . . 00000000000 <nl> mmm a / hphp / hack / test / full_fidelity / cases / modes / test_mode_ignored_in_php . php . json . exp <nl> ppp / dev / null <nl> <nl> - { <nl> - " parse_tree " : { <nl> - " kind " : " script " , <nl> - " script_declarations " : { <nl> - " kind " : " list " , <nl> - " elements " : [ <nl> - { <nl> - " kind " : " markup_section " , <nl> - " markup_text " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " markup " , <nl> - " text " : " " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix " : { <nl> - " kind " : " markup_suffix " , <nl> - " markup_suffix_less_than_question " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " < ? " , <nl> - " text " : " < ? " , <nl> - " offset " : 0 , <nl> - " leading_width " : 0 , <nl> - " width " : 2 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 1 <nl> - } <nl> - } , <nl> - " markup_suffix_name " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " name " , <nl> - " text " : " php " , <nl> - " offset " : 2 , <nl> - " leading_width " : 0 , <nl> - " width " : 3 , <nl> - " trailing_width " : 9 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 5 , " width " : 1 } , <nl> - { " kind " : " single_line_comment " , " text " : " / / blah " , " offset " : 6 , " width " : 7 } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 13 , " width " : 1 } <nl> - ] , <nl> - " line_number " : 1 <nl> - } <nl> - } <nl> - } <nl> - } , <nl> - { <nl> - " kind " : " end_of_file " , <nl> - " end_of_file_token " : { <nl> - " kind " : " token " , <nl> - " token " : { <nl> - " kind " : " end_of_file " , <nl> - " text " : " " , <nl> - " offset " : 14 , <nl> - " leading_width " : 0 , <nl> - " width " : 0 , <nl> - " trailing_width " : 0 , <nl> - " leading " : [ ] , <nl> - " trailing " : [ ] , <nl> - " line_number " : 2 <nl> - } <nl> - } <nl> - } <nl> - ] <nl> - } <nl> - } , <nl> - " program_text " : " < ? php / / blah \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> - } <nl> mmm a / hphp / hack / test / full_fidelity / cases / test_class_const_phpmode . php <nl> ppp b / hphp / hack / test / full_fidelity / cases / test_class_const_phpmode . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> class MyClassName { <nl> const WHITE = " white " ; <nl> mmm a / hphp / hack / test / full_fidelity / cases / test_class_const_phpmode . php . json . exp <nl> ppp b / hphp / hack / test / full_fidelity / cases / test_class_const_phpmode . php . json . exp <nl> <nl> " kind " : " token " , <nl> " token " : { <nl> " kind " : " name " , <nl> - " text " : " php " , <nl> + " text " : " hh " , <nl> " offset " : 2 , <nl> " leading_width " : 0 , <nl> - " width " : 3 , <nl> + " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 4 , " width " : 1 } ] , <nl> " line_number " : 1 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 6 , <nl> + " offset " : 5 , <nl> " leading_width " : 1 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 12 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 11 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " MyClassName " , <nl> - " offset " : 13 , <nl> + " offset " : 12 , <nl> " leading_width " : 0 , <nl> " width " : 11 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 24 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 23 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 25 , <nl> + " offset " : 24 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 26 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 25 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " const " , <nl> " text " : " const " , <nl> - " offset " : 27 , <nl> + " offset " : 26 , <nl> " leading_width " : 2 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 27 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 34 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 26 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 33 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " WHITE " , <nl> - " offset " : 35 , <nl> + " offset " : 34 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 40 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 39 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 41 , <nl> + " offset " : 40 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 42 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 41 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " double_quoted_string_literal " , <nl> " text " : " \ " white \ " " , <nl> - " offset " : 43 , <nl> + " offset " : 42 , <nl> " leading_width " : 0 , <nl> " width " : 7 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 50 , <nl> + " offset " : 49 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 51 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 50 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " const " , <nl> " text " : " const " , <nl> - " offset " : 52 , <nl> + " offset " : 51 , <nl> " leading_width " : 2 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 52 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 59 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 51 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 58 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " string " , <nl> " text " : " string " , <nl> - " offset " : 60 , <nl> + " offset " : 59 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 66 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 65 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " TRUE " , <nl> - " offset " : 67 , <nl> + " offset " : 66 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 71 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 70 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 72 , <nl> + " offset " : 71 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 73 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 72 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " double_quoted_string_literal " , <nl> " text " : " \ " true \ " " , <nl> - " offset " : 74 , <nl> + " offset " : 73 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 80 , <nl> + " offset " : 79 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 81 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 80 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " const " , <nl> " text " : " const " , <nl> - " offset " : 82 , <nl> + " offset " : 81 , <nl> " leading_width " : 2 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 82 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 89 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 81 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 88 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " Serializable " , <nl> - " offset " : 90 , <nl> + " offset " : 89 , <nl> " leading_width " : 0 , <nl> " width " : 12 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " < " , <nl> " text " : " < " , <nl> - " offset " : 102 , <nl> + " offset " : 101 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " string " , <nl> " text " : " string " , <nl> - " offset " : 103 , <nl> + " offset " : 102 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " > " , <nl> " text " : " > " , <nl> - " offset " : 109 , <nl> + " offset " : 108 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 110 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 109 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " BLUE " , <nl> - " offset " : 111 , <nl> + " offset " : 110 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 115 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 114 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 116 , <nl> + " offset " : 115 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 117 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 116 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " double_quoted_string_literal " , <nl> " text " : " \ " blue \ \ u { 0123 } \ " " , <nl> - " offset " : 118 , <nl> + " offset " : 117 , <nl> " leading_width " : 0 , <nl> " width " : 14 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 132 , <nl> + " offset " : 131 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 133 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 132 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " public " , <nl> " text " : " public " , <nl> - " offset " : 134 , <nl> + " offset " : 133 , <nl> " leading_width " : 2 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 134 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 142 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 133 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 141 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " const " , <nl> " text " : " const " , <nl> - " offset " : 143 , <nl> + " offset " : 142 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 148 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 147 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " string " , <nl> " text " : " string " , <nl> - " offset " : 149 , <nl> + " offset " : 148 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 155 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 154 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " PublicConst " , <nl> - " offset " : 156 , <nl> + " offset " : 155 , <nl> " leading_width " : 0 , <nl> " width " : 11 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 167 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 166 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 168 , <nl> + " offset " : 167 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 169 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 168 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " double_quoted_string_literal " , <nl> " text " : " \ " this is fine in PHP mode \ " " , <nl> - " offset " : 170 , <nl> + " offset " : 169 , <nl> " leading_width " : 0 , <nl> " width " : 26 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 196 , <nl> + " offset " : 195 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 197 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 196 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " protected " , <nl> " text " : " protected " , <nl> - " offset " : 198 , <nl> + " offset " : 197 , <nl> " leading_width " : 2 , <nl> " width " : 9 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 198 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 209 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 197 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 208 , " width " : 1 } ] , <nl> " line_number " : 8 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " const " , <nl> " text " : " const " , <nl> - " offset " : 210 , <nl> + " offset " : 209 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 215 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 214 , " width " : 1 } ] , <nl> " line_number " : 8 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " string " , <nl> " text " : " string " , <nl> - " offset " : 216 , <nl> + " offset " : 215 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 222 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 221 , " width " : 1 } ] , <nl> " line_number " : 8 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " ProtectedConst " , <nl> - " offset " : 223 , <nl> + " offset " : 222 , <nl> " leading_width " : 0 , <nl> " width " : 14 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 237 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 236 , " width " : 1 } ] , <nl> " line_number " : 8 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 238 , <nl> + " offset " : 237 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 239 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 238 , " width " : 1 } ] , <nl> " line_number " : 8 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " double_quoted_string_literal " , <nl> " text " : " \ " this is fine in PHP mode \ " " , <nl> - " offset " : 240 , <nl> + " offset " : 239 , <nl> " leading_width " : 0 , <nl> " width " : 26 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 266 , <nl> + " offset " : 265 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 267 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 266 , " width " : 1 } ] , <nl> " line_number " : 8 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " private " , <nl> " text " : " private " , <nl> - " offset " : 268 , <nl> + " offset " : 267 , <nl> " leading_width " : 2 , <nl> " width " : 7 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 268 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 277 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 267 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 276 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " const " , <nl> " text " : " const " , <nl> - " offset " : 278 , <nl> + " offset " : 277 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 283 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 282 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " string " , <nl> " text " : " string " , <nl> - " offset " : 284 , <nl> + " offset " : 283 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 290 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 289 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " PrivateConst " , <nl> - " offset " : 291 , <nl> + " offset " : 290 , <nl> " leading_width " : 0 , <nl> " width " : 12 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 303 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 302 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 304 , <nl> + " offset " : 303 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 305 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 304 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " double_quoted_string_literal " , <nl> " text " : " \ " this is fine in PHP mode \ " " , <nl> - " offset " : 306 , <nl> + " offset " : 305 , <nl> " leading_width " : 0 , <nl> " width " : 26 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 332 , <nl> + " offset " : 331 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 333 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 332 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 334 , <nl> + " offset " : 333 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 335 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 334 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " end_of_file " , <nl> " text " : " " , <nl> - " offset " : 336 , <nl> + " offset " : 335 , <nl> " leading_width " : 0 , <nl> " width " : 0 , <nl> " trailing_width " : 0 , <nl> <nl> ] <nl> } <nl> } , <nl> - " program_text " : " < ? php \ n \ nclass MyClassName { \ n const WHITE = \ " white \ " ; \ n const string TRUE = \ " true \ " ; \ n const Serializable < string > BLUE = \ " blue \ \ u { 0123 } \ " ; \ n public const string PublicConst = \ " this is fine in PHP mode \ " ; \ n protected const string ProtectedConst = \ " this is fine in PHP mode \ " ; \ n private const string PrivateConst = \ " this is fine in PHP mode \ " ; \ n } \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> + " program_text " : " < ? hh \ n \ nclass MyClassName { \ n const WHITE = \ " white \ " ; \ n const string TRUE = \ " true \ " ; \ n const Serializable < string > BLUE = \ " blue \ \ u { 0123 } \ " ; \ n public const string PublicConst = \ " this is fine in PHP mode \ " ; \ n protected const string ProtectedConst = \ " this is fine in PHP mode \ " ; \ n private const string PrivateConst = \ " this is fine in PHP mode \ " ; \ n } \ n " , <nl> + " version " : " 2020 - 06 - 30 - 0000 " <nl> } <nl> mmm a / hphp / hack / test / full_fidelity / cases / test_classish_inside_function_errors . php <nl> ppp b / hphp / hack / test / full_fidelity / cases / test_classish_inside_function_errors . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> function earlier ( ) { <nl> function later ( ) { <nl> mmm a / hphp / hack / test / full_fidelity / cases / test_classish_inside_function_errors . php . json . exp <nl> ppp b / hphp / hack / test / full_fidelity / cases / test_classish_inside_function_errors . php . json . exp <nl> <nl> " kind " : " token " , <nl> " token " : { <nl> " kind " : " name " , <nl> - " text " : " php " , <nl> + " text " : " hh " , <nl> " offset " : 2 , <nl> " leading_width " : 0 , <nl> - " width " : 3 , <nl> + " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 4 , " width " : 1 } ] , <nl> " line_number " : 1 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 6 , <nl> + " offset " : 5 , <nl> " leading_width " : 1 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 15 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 14 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " earlier " , <nl> - " offset " : 16 , <nl> + " offset " : 15 , <nl> " leading_width " : 0 , <nl> " width " : 7 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 23 , <nl> + " offset " : 22 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 24 , <nl> + " offset " : 23 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 25 , <nl> + " offset " : 24 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 26 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 25 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 27 , <nl> + " offset " : 26 , <nl> " leading_width " : 2 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 27 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 37 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 26 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 36 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " later " , <nl> - " offset " : 38 , <nl> + " offset " : 37 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 43 , <nl> + " offset " : 42 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 44 , <nl> + " offset " : 43 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 45 , <nl> + " offset " : 44 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 46 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 45 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 47 , <nl> + " offset " : 46 , <nl> " leading_width " : 6 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 47 , " width " : 6 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 58 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 46 , " width " : 6 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 57 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " BadClass " , <nl> - " offset " : 59 , <nl> + " offset " : 58 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 67 , <nl> + " offset " : 66 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 14 , <nl> " leading " : [ ] , <nl> " trailing " : [ <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 68 , " width " : 1 } , <nl> - { " kind " : " single_line_comment " , " text " : " / / error2039 " , " offset " : 69 , " width " : 12 } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 81 , " width " : 1 } <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 67 , " width " : 1 } , <nl> + { " kind " : " single_line_comment " , " text " : " / / error2039 " , " offset " : 68 , " width " : 12 } , <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 80 , " width " : 1 } <nl> ] , <nl> " line_number " : 5 <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 82 , <nl> + " offset " : 81 , <nl> " leading_width " : 6 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 82 , " width " : 6 } ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 89 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 81 , " width " : 6 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 88 , " width " : 1 } ] , <nl> " line_number " : 6 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " interface " , <nl> " text " : " interface " , <nl> - " offset " : 90 , <nl> + " offset " : 89 , <nl> " leading_width " : 6 , <nl> " width " : 9 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 90 , " width " : 6 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 105 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 89 , " width " : 6 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 104 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " BadInterface " , <nl> - " offset " : 106 , <nl> + " offset " : 105 , <nl> " leading_width " : 0 , <nl> " width " : 12 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 118 , <nl> + " offset " : 117 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 14 , <nl> " leading " : [ ] , <nl> " trailing " : [ <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 119 , " width " : 1 } , <nl> - { " kind " : " single_line_comment " , " text " : " / / error2039 " , " offset " : 120 , " width " : 12 } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 132 , " width " : 1 } <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 118 , " width " : 1 } , <nl> + { " kind " : " single_line_comment " , " text " : " / / error2039 " , " offset " : 119 , " width " : 12 } , <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 131 , " width " : 1 } <nl> ] , <nl> " line_number " : 7 <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 133 , <nl> + " offset " : 132 , <nl> " leading_width " : 6 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 133 , " width " : 6 } ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 140 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 132 , " width " : 6 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 139 , " width " : 1 } ] , <nl> " line_number " : 8 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " trait " , <nl> " text " : " trait " , <nl> - " offset " : 141 , <nl> + " offset " : 140 , <nl> " leading_width " : 6 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 141 , " width " : 6 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 152 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 140 , " width " : 6 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 151 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " BadTrait " , <nl> - " offset " : 153 , <nl> + " offset " : 152 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 161 , <nl> + " offset " : 160 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 14 , <nl> " leading " : [ ] , <nl> " trailing " : [ <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 162 , " width " : 1 } , <nl> - { " kind " : " single_line_comment " , " text " : " / / error2039 " , " offset " : 163 , " width " : 12 } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 175 , " width " : 1 } <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 161 , " width " : 1 } , <nl> + { " kind " : " single_line_comment " , " text " : " / / error2039 " , " offset " : 162 , " width " : 12 } , <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 174 , " width " : 1 } <nl> ] , <nl> " line_number " : 9 <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 176 , <nl> + " offset " : 175 , <nl> " leading_width " : 6 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 176 , " width " : 6 } ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 183 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 175 , " width " : 6 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 182 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 184 , <nl> + " offset " : 183 , <nl> " leading_width " : 4 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 184 , " width " : 4 } ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 189 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 183 , " width " : 4 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 188 , " width " : 1 } ] , <nl> " line_number " : 11 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 190 , <nl> + " offset " : 189 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 191 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 190 , " width " : 1 } ] , <nl> " line_number " : 12 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 192 , <nl> + " offset " : 191 , <nl> " leading_width " : 1 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 192 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 198 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 191 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 197 , " width " : 1 } ] , <nl> " line_number " : 14 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " ThisIsFine " , <nl> - " offset " : 199 , <nl> + " offset " : 198 , <nl> " leading_width " : 0 , <nl> " width " : 10 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 209 , <nl> + " offset " : 208 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 10 , <nl> " leading " : [ ] , <nl> " trailing " : [ <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 210 , " width " : 1 } , <nl> - { " kind " : " single_line_comment " , " text " : " / / legal " , " offset " : 211 , " width " : 8 } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 219 , " width " : 1 } <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 209 , " width " : 1 } , <nl> + { " kind " : " single_line_comment " , " text " : " / / legal " , " offset " : 210 , " width " : 8 } , <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 218 , " width " : 1 } <nl> ] , <nl> " line_number " : 14 <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 220 , <nl> + " offset " : 219 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 221 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 220 , " width " : 1 } ] , <nl> " line_number " : 15 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " interface " , <nl> " text " : " interface " , <nl> - " offset " : 222 , <nl> + " offset " : 221 , <nl> " leading_width " : 0 , <nl> " width " : 9 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 231 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 230 , " width " : 1 } ] , <nl> " line_number " : 16 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " ThisIsFine " , <nl> - " offset " : 232 , <nl> + " offset " : 231 , <nl> " leading_width " : 0 , <nl> " width " : 10 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 242 , <nl> + " offset " : 241 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 10 , <nl> " leading " : [ ] , <nl> " trailing " : [ <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 243 , " width " : 1 } , <nl> - { " kind " : " single_line_comment " , " text " : " / / legal " , " offset " : 244 , " width " : 8 } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 252 , " width " : 1 } <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 242 , " width " : 1 } , <nl> + { " kind " : " single_line_comment " , " text " : " / / legal " , " offset " : 243 , " width " : 8 } , <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 251 , " width " : 1 } <nl> ] , <nl> " line_number " : 16 <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 253 , <nl> + " offset " : 252 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 254 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 253 , " width " : 1 } ] , <nl> " line_number " : 17 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " trait " , <nl> " text " : " trait " , <nl> - " offset " : 255 , <nl> + " offset " : 254 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 260 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 259 , " width " : 1 } ] , <nl> " line_number " : 18 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " ThisIsFine " , <nl> - " offset " : 261 , <nl> + " offset " : 260 , <nl> " leading_width " : 0 , <nl> " width " : 10 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 271 , <nl> + " offset " : 270 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 10 , <nl> " leading " : [ ] , <nl> " trailing " : [ <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 272 , " width " : 1 } , <nl> - { " kind " : " single_line_comment " , " text " : " / / legal " , " offset " : 273 , " width " : 8 } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 281 , " width " : 1 } <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 271 , " width " : 1 } , <nl> + { " kind " : " single_line_comment " , " text " : " / / legal " , " offset " : 272 , " width " : 8 } , <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 280 , " width " : 1 } <nl> ] , <nl> " line_number " : 18 <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 282 , <nl> + " offset " : 281 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 283 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 282 , " width " : 1 } ] , <nl> " line_number " : 19 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 284 , <nl> + " offset " : 283 , <nl> " leading_width " : 1 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 284 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 290 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 283 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 289 , " width " : 1 } ] , <nl> " line_number " : 21 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " C " , <nl> - " offset " : 291 , <nl> + " offset " : 290 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 292 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 291 , " width " : 1 } ] , <nl> " line_number " : 21 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 293 , <nl> + " offset " : 292 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 294 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 293 , " width " : 1 } ] , <nl> " line_number " : 21 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " public " , <nl> " text " : " public " , <nl> - " offset " : 295 , <nl> + " offset " : 294 , <nl> " leading_width " : 2 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 295 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 303 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 294 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 302 , " width " : 1 } ] , <nl> " line_number " : 22 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 304 , <nl> + " offset " : 303 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 312 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 311 , " width " : 1 } ] , <nl> " line_number " : 22 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " foo " , <nl> - " offset " : 313 , <nl> + " offset " : 312 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 316 , <nl> + " offset " : 315 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 317 , <nl> + " offset " : 316 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 318 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 317 , " width " : 1 } ] , <nl> " line_number " : 22 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 319 , <nl> + " offset " : 318 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 320 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 319 , " width " : 1 } ] , <nl> " line_number " : 22 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 321 , <nl> + " offset " : 320 , <nl> " leading_width " : 4 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 321 , " width " : 4 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 330 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 320 , " width " : 4 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 329 , " width " : 1 } ] , <nl> " line_number " : 23 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " D " , <nl> - " offset " : 331 , <nl> + " offset " : 330 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 332 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 331 , " width " : 1 } ] , <nl> " line_number " : 23 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 333 , <nl> + " offset " : 332 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 334 , <nl> + " offset " : 333 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 48 , <nl> " leading " : [ ] , <nl> " trailing " : [ <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 335 , " width " : 1 } , <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 334 , " width " : 1 } , <nl> { <nl> " kind " : " single_line_comment " , <nl> " text " : " / / error2039 triggered from inside methods too " , <nl> - " offset " : 336 , <nl> + " offset " : 335 , <nl> " width " : 46 <nl> } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 382 , " width " : 1 } <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 381 , " width " : 1 } <nl> ] , <nl> " line_number " : 23 <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 383 , <nl> + " offset " : 382 , <nl> " leading_width " : 2 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 383 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 386 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 382 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 385 , " width " : 1 } ] , <nl> " line_number " : 24 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 387 , <nl> + " offset " : 386 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 388 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 387 , " width " : 1 } ] , <nl> " line_number " : 25 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " end_of_file " , <nl> " text " : " " , <nl> - " offset " : 389 , <nl> + " offset " : 388 , <nl> " leading_width " : 0 , <nl> " width " : 0 , <nl> " trailing_width " : 0 , <nl> <nl> ] <nl> } <nl> } , <nl> - " program_text " : " < ? php \ n \ nfunction earlier ( ) { \ n function later ( ) { \ n class BadClass { / / error2039 \ n } \ n interface BadInterface { / / error2039 \ n } \ n trait BadTrait { / / error2039 \ n } \ n } \ n } \ n \ nclass ThisIsFine { / / legal \ n } \ ninterface ThisIsFine { / / legal \ n } \ ntrait ThisIsFine { / / legal \ n } \ n \ nclass C { \ n public function foo ( ) { \ n class D { } / / error2039 triggered from inside methods too \ n } \ n } \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> + " program_text " : " < ? hh \ n \ nfunction earlier ( ) { \ n function later ( ) { \ n class BadClass { / / error2039 \ n } \ n interface BadInterface { / / error2039 \ n } \ n trait BadTrait { / / error2039 \ n } \ n } \ n } \ n \ nclass ThisIsFine { / / legal \ n } \ ninterface ThisIsFine { / / legal \ n } \ ntrait ThisIsFine { / / legal \ n } \ n \ nclass C { \ n public function foo ( ) { \ n class D { } / / error2039 triggered from inside methods too \ n } \ n } \ n " , <nl> + " version " : " 2020 - 06 - 30 - 0000 " <nl> } <nl> mmm a / hphp / hack / test / full_fidelity / cases / test_dynamic_property . php <nl> ppp b / hphp / hack / test / full_fidelity / cases / test_dynamic_property . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> function test ( $ x , $ a , $ s ) { <nl> $ x - > $ { foo ( ) } ; <nl> mmm a / hphp / hack / test / full_fidelity / cases / test_dynamic_property . php . json . exp <nl> ppp b / hphp / hack / test / full_fidelity / cases / test_dynamic_property . php . json . exp <nl> <nl> " kind " : " token " , <nl> " token " : { <nl> " kind " : " name " , <nl> - " text " : " php " , <nl> + " text " : " hh " , <nl> " offset " : 2 , <nl> " leading_width " : 0 , <nl> - " width " : 3 , <nl> + " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 4 , " width " : 1 } ] , <nl> " line_number " : 1 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 6 , <nl> + " offset " : 5 , <nl> " leading_width " : 1 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 15 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 14 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " test " , <nl> - " offset " : 16 , <nl> + " offset " : 15 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 20 , <nl> + " offset " : 19 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ x " , <nl> - " offset " : 21 , <nl> + " offset " : 20 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " , " , <nl> " text " : " , " , <nl> - " offset " : 23 , <nl> + " offset " : 22 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 24 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 23 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ a " , <nl> - " offset " : 25 , <nl> + " offset " : 24 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " , " , <nl> " text " : " , " , <nl> - " offset " : 27 , <nl> + " offset " : 26 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 28 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 27 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ s " , <nl> - " offset " : 29 , <nl> + " offset " : 28 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 31 , <nl> + " offset " : 30 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 32 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 31 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 33 , <nl> + " offset " : 32 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 34 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 33 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ x " , <nl> - " offset " : 35 , <nl> + " offset " : 34 , <nl> " leading_width " : 4 , <nl> " width " : 2 , <nl> " trailing_width " : 0 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 35 , " width " : 4 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 34 , " width " : 4 } ] , <nl> " trailing " : [ ] , <nl> " line_number " : 4 <nl> } <nl> <nl> " token " : { <nl> " kind " : " - > " , <nl> " text " : " - > " , <nl> - " offset " : 41 , <nl> + " offset " : 40 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " $ " , <nl> " text " : " $ " , <nl> - " offset " : 43 , <nl> + " offset " : 42 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 44 , <nl> + " offset " : 43 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " foo " , <nl> - " offset " : 45 , <nl> + " offset " : 44 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 48 , <nl> + " offset " : 47 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 49 , <nl> + " offset " : 48 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 50 , <nl> + " offset " : 49 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 51 , <nl> + " offset " : 50 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 52 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 51 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 53 , <nl> + " offset " : 52 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 54 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 53 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " end_of_file " , <nl> " text " : " " , <nl> - " offset " : 55 , <nl> + " offset " : 54 , <nl> " leading_width " : 0 , <nl> " width " : 0 , <nl> " trailing_width " : 0 , <nl> <nl> ] <nl> } <nl> } , <nl> - " program_text " : " < ? php \ n \ nfunction test ( $ x , $ a , $ s ) { \ n $ x - > $ { foo ( ) } ; \ n } \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> + " program_text " : " < ? hh \ n \ nfunction test ( $ x , $ a , $ s ) { \ n $ x - > $ { foo ( ) } ; \ n } \ n " , <nl> + " version " : " 2020 - 06 - 30 - 0000 " <nl> } <nl> mmm a / hphp / hack / test / full_fidelity / cases / test_eval_deref . php <nl> ppp b / hphp / hack / test / full_fidelity / cases / test_eval_deref . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> $ x = $ { " a " . " x " } ; <nl> mmm a / hphp / hack / test / full_fidelity / cases / test_eval_deref . php . json . exp <nl> ppp b / hphp / hack / test / full_fidelity / cases / test_eval_deref . php . json . exp <nl> <nl> " kind " : " token " , <nl> " token " : { <nl> " kind " : " name " , <nl> - " text " : " php " , <nl> + " text " : " hh " , <nl> " offset " : 2 , <nl> " leading_width " : 0 , <nl> - " width " : 3 , <nl> + " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 4 , " width " : 1 } ] , <nl> " line_number " : 1 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ x " , <nl> - " offset " : 6 , <nl> + " offset " : 5 , <nl> " leading_width " : 1 , <nl> " width " : 2 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 9 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 8 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 10 , <nl> + " offset " : 9 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 11 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 10 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " $ " , <nl> " text " : " $ " , <nl> - " offset " : 12 , <nl> + " offset " : 11 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 13 , <nl> + " offset " : 12 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " double_quoted_string_literal " , <nl> " text " : " \ " a \ " " , <nl> - " offset " : 14 , <nl> + " offset " : 13 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " . " , <nl> " text " : " . " , <nl> - " offset " : 17 , <nl> + " offset " : 16 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " double_quoted_string_literal " , <nl> " text " : " \ " x \ " " , <nl> - " offset " : 18 , <nl> + " offset " : 17 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 21 , <nl> + " offset " : 20 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 22 , <nl> + " offset " : 21 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 23 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 22 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " end_of_file " , <nl> " text " : " " , <nl> - " offset " : 24 , <nl> + " offset " : 23 , <nl> " leading_width " : 0 , <nl> " width " : 0 , <nl> " trailing_width " : 0 , <nl> <nl> ] <nl> } <nl> } , <nl> - " program_text " : " < ? php \ n \ n $ x = $ { \ " a \ " . \ " x \ " } ; \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> + " program_text " : " < ? hh \ n \ n $ x = $ { \ " a \ " . \ " x \ " } ; \ n " , <nl> + " version " : " 2020 - 06 - 30 - 0000 " <nl> } <nl> mmm a / hphp / hack / test / full_fidelity / cases / test_legal_php . php <nl> ppp b / hphp / hack / test / full_fidelity / cases / test_legal_php . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> function f ( $ foo = 1 , $ bar ) { / / missing value is illegal in hack , legal in php <nl> $ a [ ] = new E ; / / error2038 in hack , but legal in php <nl> mmm a / hphp / hack / test / full_fidelity / cases / test_legal_php . php . json . exp <nl> ppp b / hphp / hack / test / full_fidelity / cases / test_legal_php . php . json . exp <nl> <nl> " kind " : " token " , <nl> " token " : { <nl> " kind " : " name " , <nl> - " text " : " php " , <nl> + " text " : " hh " , <nl> " offset " : 2 , <nl> " leading_width " : 0 , <nl> - " width " : 3 , <nl> + " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 4 , " width " : 1 } ] , <nl> " line_number " : 1 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 6 , <nl> + " offset " : 5 , <nl> " leading_width " : 1 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 15 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 14 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " f " , <nl> - " offset " : 16 , <nl> + " offset " : 15 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 17 , <nl> + " offset " : 16 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ foo " , <nl> - " offset " : 18 , <nl> + " offset " : 17 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 22 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 21 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 23 , <nl> + " offset " : 22 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 24 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 23 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " decimal_literal " , <nl> " text " : " 1 " , <nl> - " offset " : 25 , <nl> + " offset " : 24 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " , " , <nl> " text " : " , " , <nl> - " offset " : 26 , <nl> + " offset " : 25 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 27 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 26 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ bar " , <nl> - " offset " : 28 , <nl> + " offset " : 27 , <nl> " leading_width " : 0 , <nl> " width " : 4 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 32 , <nl> + " offset " : 31 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 33 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 32 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 34 , <nl> + " offset " : 33 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 51 , <nl> " leading " : [ ] , <nl> " trailing " : [ <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 35 , " width " : 1 } , <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 34 , " width " : 1 } , <nl> { <nl> " kind " : " single_line_comment " , <nl> " text " : " / / missing value is illegal in hack , legal in php " , <nl> - " offset " : 36 , <nl> + " offset " : 35 , <nl> " width " : 49 <nl> } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 85 , " width " : 1 } <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 84 , " width " : 1 } <nl> ] , <nl> " line_number " : 3 <nl> } <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ a " , <nl> - " offset " : 86 , <nl> + " offset " : 85 , <nl> " leading_width " : 4 , <nl> " width " : 2 , <nl> " trailing_width " : 0 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 86 , " width " : 4 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 85 , " width " : 4 } ] , <nl> " trailing " : [ ] , <nl> " line_number " : 4 <nl> } <nl> <nl> " token " : { <nl> " kind " : " [ " , <nl> " text " : " [ " , <nl> - " offset " : 92 , <nl> + " offset " : 91 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ] " , <nl> " text " : " ] " , <nl> - " offset " : 93 , <nl> + " offset " : 92 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 94 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 93 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 95 , <nl> + " offset " : 94 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 96 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 95 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " new " , <nl> " text " : " new " , <nl> - " offset " : 97 , <nl> + " offset " : 96 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 100 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 99 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " E " , <nl> - " offset " : 101 , <nl> + " offset " : 100 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 102 , <nl> + " offset " : 101 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 40 , <nl> " leading " : [ ] , <nl> " trailing " : [ <nl> - { " kind " : " whitespace " , " text " : " " , " offset " : 103 , " width " : 1 } , <nl> + { " kind " : " whitespace " , " text " : " " , " offset " : 102 , " width " : 1 } , <nl> { <nl> " kind " : " single_line_comment " , <nl> " text " : " / / error2038 in hack , but legal in php " , <nl> - " offset " : 104 , <nl> + " offset " : 103 , <nl> " width " : 38 <nl> } , <nl> - { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 142 , " width " : 1 } <nl> + { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 141 , " width " : 1 } <nl> ] , <nl> " line_number " : 4 <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 143 , <nl> + " offset " : 142 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 144 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 143 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " end_of_file " , <nl> " text " : " " , <nl> - " offset " : 145 , <nl> + " offset " : 144 , <nl> " leading_width " : 0 , <nl> " width " : 0 , <nl> " trailing_width " : 0 , <nl> <nl> ] <nl> } <nl> } , <nl> - " program_text " : " < ? php \ n \ nfunction f ( $ foo = 1 , $ bar ) { / / missing value is illegal in hack , legal in php \ n $ a [ ] = new E ; / / error2038 in hack , but legal in php \ n } \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> + " program_text " : " < ? hh \ n \ nfunction f ( $ foo = 1 , $ bar ) { / / missing value is illegal in hack , legal in php \ n $ a [ ] = new E ; / / error2038 in hack , but legal in php \ n } \ n " , <nl> + " version " : " 2020 - 06 - 30 - 0000 " <nl> } <nl> mmm a / hphp / hack / test / full_fidelity / cases / test_php_blocks_errors . php <nl> ppp b / hphp / hack / test / full_fidelity / cases / test_php_blocks_errors . php <nl> <nl> - < ? php <nl> + < ? hh <nl> function foo ( ) { <nl> $ a = 1 ; <nl> } <nl> mmm a / hphp / hack / test / full_fidelity / cases / test_php_blocks_errors . php . json . exp <nl> ppp b / hphp / hack / test / full_fidelity / cases / test_php_blocks_errors . php . json . exp <nl> <nl> " kind " : " token " , <nl> " token " : { <nl> " kind " : " name " , <nl> - " text " : " php " , <nl> + " text " : " hh " , <nl> " offset " : 2 , <nl> " leading_width " : 0 , <nl> - " width " : 3 , <nl> + " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 4 , " width " : 1 } ] , <nl> " line_number " : 1 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 6 , <nl> + " offset " : 5 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 14 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 13 , " width " : 1 } ] , <nl> " line_number " : 2 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " foo " , <nl> - " offset " : 15 , <nl> + " offset " : 14 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 18 , <nl> + " offset " : 17 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 19 , <nl> + " offset " : 18 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 20 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 19 , " width " : 1 } ] , <nl> " line_number " : 2 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 21 , <nl> + " offset " : 20 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 22 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 21 , " width " : 1 } ] , <nl> " line_number " : 2 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ a " , <nl> - " offset " : 23 , <nl> + " offset " : 22 , <nl> " leading_width " : 2 , <nl> " width " : 2 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 23 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 27 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 22 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 26 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 28 , <nl> + " offset " : 27 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 29 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 28 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " decimal_literal " , <nl> " text " : " 1 " , <nl> - " offset " : 30 , <nl> + " offset " : 29 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 31 , <nl> + " offset " : 30 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 32 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 31 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 33 , <nl> + " offset " : 32 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 34 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 33 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " ? " , <nl> " text " : " ? " , <nl> - " offset " : 35 , <nl> + " offset " : 34 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " > " , <nl> " text " : " > " , <nl> - " offset " : 36 , <nl> + " offset " : 35 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 37 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 36 , " width " : 1 } ] , <nl> " line_number " : 5 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " < " , <nl> " text " : " < " , <nl> - " offset " : 38 , <nl> + " offset " : 37 , <nl> " leading_width " : 1 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 38 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 37 , " width " : 1 } ] , <nl> " trailing " : [ ] , <nl> " line_number " : 7 <nl> } <nl> <nl> " token " : { <nl> " kind " : " ? " , <nl> " text " : " ? " , <nl> - " offset " : 40 , <nl> + " offset " : 39 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " hh " , <nl> - " offset " : 41 , <nl> + " offset " : 40 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 43 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 42 , " width " : 1 } ] , <nl> " line_number " : 7 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " class " , <nl> " text " : " class " , <nl> - " offset " : 44 , <nl> + " offset " : 43 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 49 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 48 , " width " : 1 } ] , <nl> " line_number " : 8 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " foo " , <nl> - " offset " : 50 , <nl> + " offset " : 49 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 53 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 52 , " width " : 1 } ] , <nl> " line_number " : 8 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 54 , <nl> + " offset " : 53 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 55 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 54 , " width " : 1 } ] , <nl> " line_number " : 8 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " public " , <nl> " text " : " public " , <nl> - " offset " : 56 , <nl> + " offset " : 55 , <nl> " leading_width " : 2 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 56 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 64 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 55 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 63 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " function " , <nl> " text " : " function " , <nl> - " offset " : 65 , <nl> + " offset " : 64 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 73 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 72 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " bar " , <nl> - " offset " : 74 , <nl> + " offset " : 73 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 77 , <nl> + " offset " : 76 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 78 , <nl> + " offset " : 77 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " : " , <nl> " text " : " : " , <nl> - " offset " : 79 , <nl> + " offset " : 78 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 80 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 79 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " int " , <nl> " text " : " int " , <nl> - " offset " : 81 , <nl> + " offset " : 80 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 84 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 83 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 85 , <nl> + " offset " : 84 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 86 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 85 , " width " : 1 } ] , <nl> " line_number " : 9 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " return " , <nl> " text " : " return " , <nl> - " offset " : 87 , <nl> + " offset " : 86 , <nl> " leading_width " : 4 , <nl> " width " : 6 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 87 , " width " : 4 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 97 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 86 , " width " : 4 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 96 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " decimal_literal " , <nl> " text " : " 5 " , <nl> - " offset " : 98 , <nl> + " offset " : 97 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 99 , <nl> + " offset " : 98 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 100 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 99 , " width " : 1 } ] , <nl> " line_number " : 10 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 101 , <nl> + " offset " : 100 , <nl> " leading_width " : 2 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 101 , " width " : 2 } ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 104 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 100 , " width " : 2 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 103 , " width " : 1 } ] , <nl> " line_number " : 11 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 105 , <nl> + " offset " : 104 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 106 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 105 , " width " : 1 } ] , <nl> " line_number " : 12 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " end_of_file " , <nl> " text " : " " , <nl> - " offset " : 107 , <nl> + " offset " : 106 , <nl> " leading_width " : 0 , <nl> " width " : 0 , <nl> " trailing_width " : 0 , <nl> <nl> ] <nl> } <nl> } , <nl> - " program_text " : " < ? php \ nfunction foo ( ) { \ n $ a = 1 ; \ n } \ n ? > \ n \ n < ? hh \ nclass foo { \ n public function bar ( ) : int { \ n return 5 ; \ n } \ n } \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> + " program_text " : " < ? hh \ nfunction foo ( ) { \ n $ a = 1 ; \ n } \ n ? > \ n \ n < ? hh \ nclass foo { \ n public function bar ( ) : int { \ n return 5 ; \ n } \ n } \ n " , <nl> + " version " : " 2020 - 06 - 30 - 0000 " <nl> } <nl> mmm a / hphp / hack / test / full_fidelity / cases / test_string_interpolation . php <nl> ppp b / hphp / hack / test / full_fidelity / cases / test_string_interpolation . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> $ a = darray [ ' x ' = > ' foo ' ] ; <nl> var_dump ( " AAA $ { a [ ' x ' ] } $ a [ x ] { $ a [ ' x ' ] } BBB " ) ; <nl> mmm a / hphp / hack / test / full_fidelity / cases / test_string_interpolation . php . json . exp <nl> ppp b / hphp / hack / test / full_fidelity / cases / test_string_interpolation . php . json . exp <nl> <nl> " kind " : " token " , <nl> " token " : { <nl> " kind " : " name " , <nl> - " text " : " php " , <nl> + " text " : " hh " , <nl> " offset " : 2 , <nl> " leading_width " : 0 , <nl> - " width " : 3 , <nl> + " width " : 2 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 4 , " width " : 1 } ] , <nl> " line_number " : 1 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ a " , <nl> - " offset " : 6 , <nl> + " offset " : 5 , <nl> " leading_width " : 1 , <nl> " width " : 2 , <nl> " trailing_width " : 1 , <nl> - " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 6 , " width " : 1 } ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 9 , " width " : 1 } ] , <nl> + " leading " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 5 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 8 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " = " , <nl> " text " : " = " , <nl> - " offset " : 10 , <nl> + " offset " : 9 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 11 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " whitespace " , " text " : " " , " offset " : 10 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } , <nl> <nl> " token " : { <nl> " kind " : " darray " , <nl> " text " : " darray " , <nl> - " offset " : 12 , <nl> + " offset " : 11 , <nl> " leading_width " : 0 , <nl> " width " : 6 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " [ " , <nl> " text " : " [ " , <nl> - " offset " : 18 , <nl> + " offset " : 17 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " single_quoted_string_literal " , <nl> " text " : " ' x ' " , <nl> - " offset " : 19 , <nl> + " offset " : 18 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " = > " , <nl> " text " : " = > " , <nl> - " offset " : 22 , <nl> + " offset " : 21 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " single_quoted_string_literal " , <nl> " text " : " ' foo ' " , <nl> - " offset " : 24 , <nl> + " offset " : 23 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ] " , <nl> " text " : " ] " , <nl> - " offset " : 29 , <nl> + " offset " : 28 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 30 , <nl> + " offset " : 29 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 31 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 30 , " width " : 1 } ] , <nl> " line_number " : 3 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " var_dump " , <nl> - " offset " : 32 , <nl> + " offset " : 31 , <nl> " leading_width " : 0 , <nl> " width " : 8 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ( " , <nl> " text " : " ( " , <nl> - " offset " : 40 , <nl> + " offset " : 39 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " double_quoted_string_literal_head " , <nl> " text " : " \ " AAA " , <nl> - " offset " : 41 , <nl> + " offset " : 40 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " $ " , <nl> " text " : " $ " , <nl> - " offset " : 46 , <nl> + " offset " : 45 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 47 , <nl> + " offset " : 46 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " a " , <nl> - " offset " : 48 , <nl> + " offset " : 47 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " [ " , <nl> " text " : " [ " , <nl> - " offset " : 49 , <nl> + " offset " : 48 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " single_quoted_string_literal " , <nl> " text " : " ' x ' " , <nl> - " offset " : 50 , <nl> + " offset " : 49 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ] " , <nl> " text " : " ] " , <nl> - " offset " : 53 , <nl> + " offset " : 52 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 54 , <nl> + " offset " : 53 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " string_literal_body " , <nl> " text " : " " , <nl> - " offset " : 55 , <nl> + " offset " : 54 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ a " , <nl> - " offset " : 56 , <nl> + " offset " : 55 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " [ " , <nl> " text " : " [ " , <nl> - " offset " : 58 , <nl> + " offset " : 57 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " name " , <nl> " text " : " x " , <nl> - " offset " : 59 , <nl> + " offset " : 58 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ] " , <nl> " text " : " ] " , <nl> - " offset " : 60 , <nl> + " offset " : 59 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " string_literal_body " , <nl> " text " : " " , <nl> - " offset " : 61 , <nl> + " offset " : 60 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " { " , <nl> " text " : " { " , <nl> - " offset " : 62 , <nl> + " offset " : 61 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " variable " , <nl> " text " : " $ a " , <nl> - " offset " : 63 , <nl> + " offset " : 62 , <nl> " leading_width " : 0 , <nl> " width " : 2 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " [ " , <nl> " text " : " [ " , <nl> - " offset " : 65 , <nl> + " offset " : 64 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " single_quoted_string_literal " , <nl> " text " : " ' x ' " , <nl> - " offset " : 66 , <nl> + " offset " : 65 , <nl> " leading_width " : 0 , <nl> " width " : 3 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ] " , <nl> " text " : " ] " , <nl> - " offset " : 69 , <nl> + " offset " : 68 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " } " , <nl> " text " : " } " , <nl> - " offset " : 70 , <nl> + " offset " : 69 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " double_quoted_string_literal_tail " , <nl> " text " : " BBB \ " " , <nl> - " offset " : 71 , <nl> + " offset " : 70 , <nl> " leading_width " : 0 , <nl> " width " : 5 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ) " , <nl> " text " : " ) " , <nl> - " offset " : 76 , <nl> + " offset " : 75 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 0 , <nl> <nl> " token " : { <nl> " kind " : " ; " , <nl> " text " : " ; " , <nl> - " offset " : 77 , <nl> + " offset " : 76 , <nl> " leading_width " : 0 , <nl> " width " : 1 , <nl> " trailing_width " : 1 , <nl> " leading " : [ ] , <nl> - " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 78 , " width " : 1 } ] , <nl> + " trailing " : [ { " kind " : " end_of_line " , " text " : " \ n " , " offset " : 77 , " width " : 1 } ] , <nl> " line_number " : 4 <nl> } <nl> } <nl> <nl> " token " : { <nl> " kind " : " end_of_file " , <nl> " text " : " " , <nl> - " offset " : 79 , <nl> + " offset " : 78 , <nl> " leading_width " : 0 , <nl> " width " : 0 , <nl> " trailing_width " : 0 , <nl> <nl> ] <nl> } <nl> } , <nl> - " program_text " : " < ? php \ n \ n $ a = darray [ ' x ' = > ' foo ' ] ; \ nvar_dump ( \ " AAA $ { a [ ' x ' ] } $ a [ x ] { $ a [ ' x ' ] } BBB \ " ) ; \ n " , <nl> - " version " : " 2020 - 06 - 23 - 0001 " <nl> + " program_text " : " < ? hh \ n \ n $ a = darray [ ' x ' = > ' foo ' ] ; \ nvar_dump ( \ " AAA $ { a [ ' x ' ] } $ a [ x ] { $ a [ ' x ' ] } BBB \ " ) ; \ n " , <nl> + " version " : " 2020 - 06 - 30 - 0000 " <nl> } <nl> deleted file mode 100644 <nl> index 70ccc868d7e . . 00000000000 <nl> mmm a / hphp / hack / test / hackfmt / tests / php_trailing_commas . php <nl> ppp / dev / null <nl> <nl> - < ? php <nl> - <nl> - class Foo { <nl> - / / PHP ' s parser doesn ' t allow trailing commas in function definitions <nl> - public static function fooFunctionWithLongName ( <nl> - $ barArgumentWithLongName , <nl> - $ bazArgumentWithLongName <nl> - ) { <nl> - / / PHP ' s parser doesn ' t allow trailing commas in function invocations <nl> - return Foo : : fooFunctionWithLongName ( <nl> - $ barArgumentWithLongName , <nl> - $ bazArgumentWithLongName <nl> - ) ; <nl> - } <nl> - } <nl> deleted file mode 100644 <nl> index 70ccc868d7e . . 00000000000 <nl> mmm a / hphp / hack / test / hackfmt / tests / php_trailing_commas . php . exp <nl> ppp / dev / null <nl> <nl> - < ? php <nl> - <nl> - class Foo { <nl> - / / PHP ' s parser doesn ' t allow trailing commas in function definitions <nl> - public static function fooFunctionWithLongName ( <nl> - $ barArgumentWithLongName , <nl> - $ bazArgumentWithLongName <nl> - ) { <nl> - / / PHP ' s parser doesn ' t allow trailing commas in function invocations <nl> - return Foo : : fooFunctionWithLongName ( <nl> - $ barArgumentWithLongName , <nl> - $ bazArgumentWithLongName <nl> - ) ; <nl> - } <nl> - } <nl> mmm a / hphp / hack / test / typecheck / call_in_static_dict . php <nl> ppp b / hphp / hack / test / typecheck / call_in_static_dict . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> class C { <nl> public static function f ( ) { <nl> mmm a / hphp / hack / test / typecheck / call_in_static_dict_like_array . php <nl> ppp b / hphp / hack / test / typecheck / call_in_static_dict_like_array . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> class C { <nl> public static function f ( ) { <nl> mmm a / hphp / hack / test / typecheck / call_in_static_vec . php <nl> ppp b / hphp / hack / test / typecheck / call_in_static_vec . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> class C { <nl> public static function f ( ) { <nl> mmm a / hphp / hack / test / typecheck / call_in_static_vec_like_array . php <nl> ppp b / hphp / hack / test / typecheck / call_in_static_vec_like_array . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> class C { <nl> public static function f ( ) { <nl> mmm a / hphp / hack / test / typecheck / case / test_case_collision_constant . php <nl> ppp b / hphp / hack / test / typecheck / case / test_case_collision_constant . php <nl> <nl> - < ? php / / strict <nl> + < ? hh / / strict <nl> <nl> / / constants are case sensitive . <nl> - const FOO = 4 ; <nl> + const int FOO = 4 ; <nl> <nl> - const foo = 7 ; <nl> + const int foo = 7 ; <nl> deleted file mode 100644 <nl> index 26d36ea2203 . . 00000000000 <nl> mmm a / hphp / hack / test / typecheck / decl_php . php <nl> ppp / dev / null <nl> <nl> - / / / / phpdecl . php <nl> - < ? php / / decl <nl> - <nl> - class C { } <nl> - <nl> - / / / / partial . php <nl> - < ? hh / / partial <nl> - <nl> - class D extends C { <nl> - public function f ( ) { <nl> - return $ this - > g ( ) ; <nl> - } <nl> - } <nl> deleted file mode 100644 <nl> index 85e936498b4 . . 00000000000 <nl> mmm a / hphp / hack / test / typecheck / decl_php . php . exp <nl> ppp / dev / null <nl> <nl> - File " decl_php . php - - partial . php " , line 5 , characters 19 - 19 : <nl> - No method ' g ' in D ( did you mean ' f ' ? ) ( Typing [ 4053 ] ) <nl> - File " decl_php . php - - partial . php " , line 5 , characters 12 - 16 : <nl> - This is why I think it is an object of type D <nl> - File " decl_php . php - - partial . php " , line 3 , characters 7 - 7 : <nl> - Declaration of D is here <nl> deleted file mode 100644 <nl> index 30f40913bf4 . . 00000000000 <nl> mmm a / hphp / hack / test / typecheck / phptest . php <nl> ppp / dev / null <nl> <nl> - < ? php <nl> - <nl> - / / We need to accept toplevel require_once in php mode for open source repos <nl> - <nl> - require_once __DIR__ . ' / autoload . php ' ; <nl> - <nl> - return Foo : : getLoader ( ) ; <nl> deleted file mode 100644 <nl> index 4269126fceb . . 00000000000 <nl> mmm a / hphp / hack / test / typecheck / phptest . php . exp <nl> ppp / dev / null <nl> @ @ - 1 + 0 , 0 @ @ <nl> - No errors <nl> mmm a / hphp / hack / test / typecheck / variablevariable . php <nl> ppp b / hphp / hack / test / typecheck / variablevariable . php <nl> <nl> - < ? php <nl> + < ? hh <nl> <nl> function foo ( ) : array < int > { <nl> $ n = 10 ; <nl> mmm a / hphp / hack / test / typecheck / variablevariable . php . exp <nl> ppp b / hphp / hack / test / typecheck / variablevariable . php . exp <nl> @ @ - 1 + 1 , 2 @ @ <nl> - No errors <nl> + File " variablevariable . php " , line 7 , characters 10 - 10 : <nl> + Variable Variables are not legal ( Parsing [ 1002 ] ) <nl> deleted file mode 100644 <nl> index b3d9bbc7f37 . . 00000000000 <nl> mmm a / hphp / test / slow / nophp . php <nl> ppp / dev / null <nl> @ @ - 1 + 0 , 0 @ @ <nl> - < ? php <nl> deleted file mode 100644 <nl> index 5ab444bb3f1 . . 00000000000 <nl> mmm a / hphp / test / slow / nophp . php . expectf <nl> ppp / dev / null <nl> <nl> - <nl> - Fatal error : HHVM 4 + does not support PHP : % s <nl>
|
Remove PHP file mode
|
facebook/hhvm
|
ab408bdbbaebbd8aaf1c0dcdd8208341db505a5d
|
2020-08-07T04:05:05Z
|
mmm a / include / LightGBM / utils / array_args . h <nl> ppp b / include / LightGBM / utils / array_args . h <nl> class ArrayArgs { <nl> int l = start ; <nl> int r = end - 1 ; <nl> Partition ( arr , start , end , & l , & r ) ; <nl> - if ( ( k > l & & k < r ) | | l = = 0 | | r = = end - 1 ) { <nl> + / / if find or all elements are the same . <nl> + if ( ( k > l & & k < r ) | | ( l = = start - 1 & & r = = end - 1 ) ) { <nl> return k ; <nl> } else if ( k < = l ) { <nl> return ArgMaxAtK ( arr , start , l + 1 , k ) ; <nl>
|
fix a bug in ` ArgMaxAtK ` ( )
|
microsoft/LightGBM
|
3a665f62e1c59d5ef80276fe533a0656ee9f8bf3
|
2018-01-12T03:28:42Z
|
mmm a / src / wasm / compilation - environment . h <nl> ppp b / src / wasm / compilation - environment . h <nl> class V8_EXPORT_PRIVATE CompilationState { <nl> <nl> void AddCallback ( callback_t ) ; <nl> <nl> + void InitializeAfterDeserialization ( ) ; <nl> + <nl> / / Wait until baseline compilation finished , or compilation failed . <nl> void WaitForBaselineFinished ( ) ; <nl> <nl> mmm a / src / wasm / module - compiler . cc <nl> ppp b / src / wasm / module - compiler . cc <nl> class CompilationStateImpl { <nl> / / is invoked which triggers background compilation . <nl> void InitializeCompilationProgress ( bool lazy_module , int num_wrappers ) ; <nl> <nl> + / / Initialize the compilation progress after deserialization . This is needed <nl> + / / for recompilation ( e . g . for tier down ) to work later . <nl> + void InitializeCompilationProgressAfterDeserialization ( ) ; <nl> + <nl> / / Initialize recompilation of the whole module : Setup compilation progress <nl> / / for recompilation and add the respective compilation units . The callback is <nl> / / called immediately if no recompilation is needed , or called later <nl> void CompilationState : : WaitForTopTierFinished ( ) { <nl> top_tier_finished_semaphore - > Wait ( ) ; <nl> } <nl> <nl> + void CompilationState : : InitializeAfterDeserialization ( ) { <nl> + Impl ( this ) - > InitializeCompilationProgressAfterDeserialization ( ) ; <nl> + } <nl> + <nl> bool CompilationState : : failed ( ) const { return Impl ( this ) - > failed ( ) ; } <nl> <nl> bool CompilationState : : baseline_compilation_finished ( ) const { <nl> void CompilationStateImpl : : InitializeCompilationProgress ( bool lazy_module , <nl> TriggerCallbacks ( ) ; <nl> } <nl> <nl> + void CompilationStateImpl : : InitializeCompilationProgressAfterDeserialization ( ) { <nl> + auto * module = native_module_ - > module ( ) ; <nl> + base : : MutexGuard guard ( & callbacks_mutex_ ) ; <nl> + DCHECK ( compilation_progress_ . empty ( ) ) ; <nl> + constexpr uint8_t kProgressAfterDeserialization = <nl> + RequiredBaselineTierField : : encode ( ExecutionTier : : kTurbofan ) | <nl> + RequiredTopTierField : : encode ( ExecutionTier : : kTurbofan ) | <nl> + ReachedTierField : : encode ( ExecutionTier : : kTurbofan ) ; <nl> + compilation_progress_ . assign ( module - > num_declared_functions , <nl> + kProgressAfterDeserialization ) ; <nl> + } <nl> + <nl> void CompilationStateImpl : : InitializeRecompilation ( <nl> TieringState new_tiering_state , <nl> CompilationState : : callback_t recompilation_finished_callback ) { <nl> mmm a / src / wasm / wasm - serialization . cc <nl> ppp b / src / wasm / wasm - serialization . cc <nl> MaybeHandle < WasmModuleObject > DeserializeNativeModule ( <nl> isolate - > GetOrRegisterRecorderContextId ( isolate - > native_context ( ) ) , <nl> DecodingMethod : : kDeserialize , wasm_engine - > allocator ( ) ) ; <nl> if ( decode_result . failed ( ) ) return { } ; <nl> - std : : shared_ptr < WasmModule > module = std : : move ( decode_result . value ( ) ) ; <nl> + std : : shared_ptr < WasmModule > module = std : : move ( decode_result ) . value ( ) ; <nl> CHECK_NOT_NULL ( module ) ; <nl> <nl> auto shared_native_module = wasm_engine - > MaybeGetNativeModule ( <nl> MaybeHandle < WasmModuleObject > DeserializeNativeModule ( <nl> NativeModuleDeserializer deserializer ( shared_native_module . get ( ) ) ; <nl> Reader reader ( data + WasmSerializer : : kHeaderSize ) ; <nl> bool error = ! deserializer . Read ( & reader ) ; <nl> + shared_native_module - > compilation_state ( ) - > InitializeAfterDeserialization ( ) ; <nl> wasm_engine - > UpdateNativeModuleCache ( error , & shared_native_module , isolate ) ; <nl> if ( error ) return { } ; <nl> } <nl> mmm a / test / cctest / wasm / test - wasm - serialization . cc <nl> ppp b / test / cctest / wasm / test - wasm - serialization . cc <nl> UNINITIALIZED_TEST ( CompiledWasmModulesTransfer ) { <nl> from_isolate - > Dispose ( ) ; <nl> } <nl> <nl> + TEST ( TierDownAfterDeserialization ) { <nl> + WasmSerializationTest test ; <nl> + <nl> + Isolate * isolate = CcTest : : i_isolate ( ) ; <nl> + HandleScope scope ( isolate ) ; <nl> + Handle < WasmModuleObject > module_object ; <nl> + CHECK ( test . Deserialize ( ) . ToHandle ( & module_object ) ) ; <nl> + <nl> + auto * native_module = module_object - > native_module ( ) ; <nl> + CHECK_EQ ( 1 , native_module - > module ( ) - > functions . size ( ) ) ; <nl> + WasmCodeRefScope code_ref_scope ; <nl> + auto * turbofan_code = native_module - > GetCode ( 0 ) ; <nl> + CHECK_EQ ( ExecutionTier : : kTurbofan , turbofan_code - > tier ( ) ) ; <nl> + <nl> + isolate - > wasm_engine ( ) - > TierDownAllModulesPerIsolate ( isolate ) ; <nl> + <nl> + auto * liftoff_code = native_module - > GetCode ( 0 ) ; <nl> + CHECK_EQ ( ExecutionTier : : kLiftoff , liftoff_code - > tier ( ) ) ; <nl> + } <nl> + <nl> } / / namespace test_wasm_serialization <nl> } / / namespace wasm <nl> } / / namespace internal <nl>
|
[ wasm ] Fix tier down after deserialization
|
v8/v8
|
2547e1cece692617e8bafe0623f15e0c918db76e
|
2020-08-18T15:15:53Z
|
mmm a / src / compiler / objective_c_plugin . cc <nl> ppp b / src / compiler / objective_c_plugin . cc <nl> class ObjectiveCGrpcGenerator : public grpc : : protobuf : : compiler : : CodeGenerator { <nl> declarations + = grpc_objective_c_generator : : GetHeader ( service ) ; <nl> } <nl> <nl> - : : grpc : : string nonNullBegin = " \ nNS_ASSUME_NONNULL_BEGIN \ n \ n " ; <nl> - : : grpc : : string nonNullEnd = " \ nNS_ASSUME_NONNULL_END \ n " ; <nl> + static const : : grpc : : string kNonNullBegin = " \ nNS_ASSUME_NONNULL_BEGIN \ n \ n " ; <nl> + static const : : grpc : : string kNonNullEnd = " \ nNS_ASSUME_NONNULL_END \ n " ; <nl> <nl> Write ( context , file_name + " . pbrpc . h " , <nl> - imports + ' \ n ' + proto_imports + ' \ n ' + nonNullBegin + <nl> - declarations + nonNullEnd ) ; <nl> + imports + ' \ n ' + proto_imports + ' \ n ' + kNonNullBegin + <nl> + declarations + kNonNullEnd ) ; <nl> } <nl> <nl> { <nl>
|
Use static const strings
|
grpc/grpc
|
1843ccb226c477798ed7dd25287cb9ef3a87c754
|
2016-04-27T15:39:26Z
|
mmm a / docs / en / getting_started / example_datasets / star_schema . md <nl> ppp b / docs / en / getting_started / example_datasets / star_schema . md <nl> $ make <nl> <nl> Generating data : <nl> <nl> + ! ! ! warning " Attention " <nl> + - s 100 - - dbgen generates 600 million rows ( 67 GB ) <nl> + - s 1000 - - dbgen generates 6 billion rows ( takes a lot of time ) <nl> + <nl> ` ` ` bash <nl> $ . / dbgen - s 1000 - T c <nl> $ . / dbgen - s 1000 - T l <nl> CREATE TABLE lineorder_flat <nl> ENGINE = MergeTree <nl> PARTITION BY toYear ( LO_ORDERDATE ) <nl> ORDER BY ( LO_ORDERDATE , LO_ORDERKEY ) AS <nl> - SELECT l . * , c . * , s . * , p . * <nl> - FROM lineorder l <nl> - ANY INNER JOIN customer c ON ( c . C_CUSTKEY = l . LO_CUSTKEY ) <nl> - ANY INNER JOIN supplier s ON ( s . S_SUPPKEY = l . LO_SUPPKEY ) <nl> - ANY INNER JOIN part p ON ( p . P_PARTKEY = l . LO_PARTKEY ) ; <nl> + SELECT <nl> + l . LO_ORDERKEY AS LO_ORDERKEY , <nl> + l . LO_LINENUMBER AS LO_LINENUMBER , <nl> + l . LO_CUSTKEY AS LO_CUSTKEY , <nl> + l . LO_PARTKEY AS LO_PARTKEY , <nl> + l . LO_SUPPKEY AS LO_SUPPKEY , <nl> + l . LO_ORDERDATE AS LO_ORDERDATE , <nl> + l . LO_ORDERPRIORITY AS LO_ORDERPRIORITY , <nl> + l . LO_SHIPPRIORITY AS LO_SHIPPRIORITY , <nl> + l . LO_QUANTITY AS LO_QUANTITY , <nl> + l . LO_EXTENDEDPRICE AS LO_EXTENDEDPRICE , <nl> + l . LO_ORDTOTALPRICE AS LO_ORDTOTALPRICE , <nl> + l . LO_DISCOUNT AS LO_DISCOUNT , <nl> + l . LO_REVENUE AS LO_REVENUE , <nl> + l . LO_SUPPLYCOST AS LO_SUPPLYCOST , <nl> + l . LO_TAX AS LO_TAX , <nl> + l . LO_COMMITDATE AS LO_COMMITDATE , <nl> + l . LO_SHIPMODE AS LO_SHIPMODE , <nl> + c . C_NAME AS C_NAME , <nl> + c . C_ADDRESS AS C_ADDRESS , <nl> + c . C_CITY AS C_CITY , <nl> + c . C_NATION AS C_NATION , <nl> + c . C_REGION AS C_REGION , <nl> + c . C_PHONE AS C_PHONE , <nl> + c . C_MKTSEGMENT AS C_MKTSEGMENT , <nl> + s . S_NAME AS S_NAME , <nl> + s . S_ADDRESS AS S_ADDRESS , <nl> + s . S_CITY AS S_CITY , <nl> + s . S_NATION AS S_NATION , <nl> + s . S_REGION AS S_REGION , <nl> + s . S_PHONE AS S_PHONE , <nl> + p . P_NAME AS P_NAME , <nl> + p . P_MFGR AS P_MFGR , <nl> + p . P_CATEGORY AS P_CATEGORY , <nl> + p . P_BRAND AS P_BRAND , <nl> + p . P_COLOR AS P_COLOR , <nl> + p . P_TYPE AS P_TYPE , <nl> + p . P_SIZE AS P_SIZE , <nl> + p . P_CONTAINER AS P_CONTAINER <nl> + FROM lineorder AS l <nl> + INNER JOIN customer AS c ON c . C_CUSTKEY = l . LO_CUSTKEY <nl> + INNER JOIN supplier AS s ON s . S_SUPPKEY = l . LO_SUPPKEY <nl> + INNER JOIN part AS p ON p . P_PARTKEY = l . LO_PARTKEY <nl> <nl> - ALTER TABLE lineorder_flat DROP COLUMN C_CUSTKEY , DROP COLUMN S_SUPPKEY , DROP COLUMN P_PARTKEY ; <nl> ` ` ` <nl> <nl> Running the queries : <nl> <nl> Q1 . 1 <nl> ` ` ` sql <nl> - SELECT sum ( LO_EXTENDEDPRICE * LO_DISCOUNT ) AS revenue FROM lineorder_flat WHERE toYear ( LO_ORDERDATE ) = 1993 AND LO_DISCOUNT BETWEEN 1 AND 3 AND LO_QUANTITY < 25 ; <nl> + SELECT sum ( LO_EXTENDEDPRICE * LO_DISCOUNT ) AS revenue <nl> + FROM lineorder_flat <nl> + WHERE ( toYear ( LO_ORDERDATE ) = 1993 ) AND ( ( LO_DISCOUNT > = 1 ) AND ( LO_DISCOUNT < = 3 ) ) AND ( LO_QUANTITY < 25 ) ; <nl> ` ` ` <nl> Q1 . 2 <nl> ` ` ` sql <nl> - SELECT sum ( LO_EXTENDEDPRICE * LO_DISCOUNT ) AS revenue FROM lineorder_flat WHERE toYYYYMM ( LO_ORDERDATE ) = 199401 AND LO_DISCOUNT BETWEEN 4 AND 6 AND LO_QUANTITY BETWEEN 26 AND 35 ; <nl> + SELECT sum ( LO_EXTENDEDPRICE * LO_DISCOUNT ) AS revenue <nl> + FROM lineorder_flat <nl> + WHERE ( toYYYYMM ( LO_ORDERDATE ) = 199401 ) AND ( ( LO_DISCOUNT > = 4 ) AND ( LO_DISCOUNT < = 6 ) ) AND ( ( LO_QUANTITY > = 26 ) AND ( LO_QUANTITY < = 35 ) ) ; <nl> ` ` ` <nl> Q1 . 3 <nl> ` ` ` sql <nl> - SELECT sum ( LO_EXTENDEDPRICE * LO_DISCOUNT ) AS revenue FROM lineorder_flat WHERE toISOWeek ( LO_ORDERDATE ) = 6 AND toYear ( LO_ORDERDATE ) = 1994 AND LO_DISCOUNT BETWEEN 5 AND 7 AND LO_QUANTITY BETWEEN 26 AND 35 ; <nl> + SELECT sum ( LO_EXTENDEDPRICE * LO_DISCOUNT ) AS revenue <nl> + FROM lineorder_flat <nl> + WHERE ( toISOWeek ( LO_ORDERDATE ) = 6 ) AND ( toYear ( LO_ORDERDATE ) = 1994 ) AND ( ( LO_DISCOUNT > = 5 ) AND ( LO_DISCOUNT < = 7 ) ) AND ( ( LO_QUANTITY > = 26 ) AND ( LO_QUANTITY < = 35 ) ) ; <nl> ` ` ` <nl> Q2 . 1 <nl> ` ` ` sql <nl> - SELECT sum ( LO_REVENUE ) , toYear ( LO_ORDERDATE ) AS year , P_BRAND FROM lineorder_flat WHERE P_CATEGORY = ' MFGR # 12 ' AND S_REGION = ' AMERICA ' GROUP BY year , P_BRAND ORDER BY year , P_BRAND ; <nl> + SELECT <nl> + sum ( LO_REVENUE ) , <nl> + toYear ( LO_ORDERDATE ) AS year , <nl> + P_BRAND <nl> + FROM lineorder_flat <nl> + WHERE ( P_CATEGORY = ' MFGR # 12 ' ) AND ( S_REGION = ' AMERICA ' ) <nl> + GROUP BY <nl> + year , <nl> + P_BRAND <nl> + ORDER BY <nl> + year ASC , <nl> + P_BRAND ASC <nl> ` ` ` <nl> Q2 . 2 <nl> ` ` ` sql <nl> - SELECT sum ( LO_REVENUE ) , toYear ( LO_ORDERDATE ) AS year , P_BRAND FROM lineorder_flat WHERE P_BRAND BETWEEN ' MFGR # 2221 ' AND ' MFGR # 2228 ' AND S_REGION = ' ASIA ' GROUP BY year , P_BRAND ORDER BY year , P_BRAND ; <nl> + SELECT <nl> + sum ( LO_REVENUE ) , <nl> + toYear ( LO_ORDERDATE ) AS year , <nl> + P_BRAND <nl> + FROM lineorder_flat <nl> + WHERE ( ( P_BRAND > = ' MFGR # 2221 ' ) AND ( P_BRAND < = ' MFGR # 2228 ' ) ) AND ( S_REGION = ' ASIA ' ) <nl> + GROUP BY <nl> + year , <nl> + P_BRAND <nl> + ORDER BY <nl> + year ASC , <nl> + P_BRAND ASC <nl> ` ` ` <nl> Q2 . 3 <nl> ` ` ` sql <nl> - SELECT sum ( LO_REVENUE ) , toYear ( LO_ORDERDATE ) AS year , P_BRAND FROM lineorder_flat WHERE P_BRAND = ' MFGR # 2239 ' AND S_REGION = ' EUROPE ' GROUP BY year , P_BRAND ORDER BY year , P_BRAND ; <nl> + SELECT <nl> + sum ( LO_REVENUE ) , <nl> + toYear ( LO_ORDERDATE ) AS year , <nl> + P_BRAND <nl> + FROM lineorder_flat <nl> + WHERE ( P_BRAND = ' MFGR # 2239 ' ) AND ( S_REGION = ' EUROPE ' ) <nl> + GROUP BY <nl> + year , <nl> + P_BRAND <nl> + ORDER BY <nl> + year ASC , <nl> + P_BRAND ASC <nl> ` ` ` <nl> Q3 . 1 <nl> ` ` ` sql <nl> - SELECT C_NATION , S_NATION , toYear ( LO_ORDERDATE ) AS year , sum ( LO_REVENUE ) AS revenue FROM lineorder_flat WHERE C_REGION = ' ASIA ' AND S_REGION = ' ASIA ' AND year > = 1992 AND year < = 1997 GROUP BY C_NATION , S_NATION , year ORDER BY year asc , revenue desc ; <nl> + SELECT <nl> + C_NATION , <nl> + S_NATION , <nl> + toYear ( LO_ORDERDATE ) AS year , <nl> + sum ( LO_REVENUE ) AS revenue <nl> + FROM lineorder_flat <nl> + WHERE ( C_REGION = ' ASIA ' ) AND ( S_REGION = ' ASIA ' ) AND ( year > = 1992 ) AND ( year < = 1997 ) <nl> + GROUP BY <nl> + C_NATION , <nl> + S_NATION , <nl> + year <nl> + ORDER BY <nl> + year ASC , <nl> + revenue DESC <nl> ` ` ` <nl> Q3 . 2 <nl> ` ` ` sql <nl> - SELECT C_CITY , S_CITY , toYear ( LO_ORDERDATE ) AS year , sum ( LO_REVENUE ) AS revenue FROM lineorder_flat WHERE C_NATION = ' UNITED STATES ' AND S_NATION = ' UNITED STATES ' AND year > = 1992 AND year < = 1997 GROUP BY C_CITY , S_CITY , year ORDER BY year asc , revenue desc ; <nl> + SELECT <nl> + C_CITY , <nl> + S_CITY , <nl> + toYear ( LO_ORDERDATE ) AS year , <nl> + sum ( LO_REVENUE ) AS revenue <nl> + FROM lineorder_flat <nl> + WHERE ( C_NATION = ' UNITED STATES ' ) AND ( S_NATION = ' UNITED STATES ' ) AND ( year > = 1992 ) AND ( year < = 1997 ) <nl> + GROUP BY <nl> + C_CITY , <nl> + S_CITY , <nl> + year <nl> + ORDER BY <nl> + year ASC , <nl> + revenue DESC <nl> ` ` ` <nl> Q3 . 3 <nl> ` ` ` sql <nl> - SELECT C_CITY , S_CITY , toYear ( LO_ORDERDATE ) AS year , sum ( LO_REVENUE ) AS revenue FROM lineorder_flat WHERE ( C_CITY = ' UNITED KI1 ' OR C_CITY = ' UNITED KI5 ' ) AND ( S_CITY = ' UNITED KI1 ' OR S_CITY = ' UNITED KI5 ' ) AND year > = 1992 AND year < = 1997 GROUP BY C_CITY , S_CITY , year ORDER BY year asc , revenue desc ; <nl> + SELECT <nl> + C_CITY , <nl> + S_CITY , <nl> + toYear ( LO_ORDERDATE ) AS year , <nl> + sum ( LO_REVENUE ) AS revenue <nl> + FROM lineorder_flat <nl> + WHERE ( ( C_CITY = ' UNITED KI1 ' ) OR ( C_CITY = ' UNITED KI5 ' ) ) AND ( ( S_CITY = ' UNITED KI1 ' ) OR ( S_CITY = ' UNITED KI5 ' ) ) AND ( year > = 1992 ) AND ( year < = 1997 ) <nl> + GROUP BY <nl> + C_CITY , <nl> + S_CITY , <nl> + year <nl> + ORDER BY <nl> + year ASC , <nl> + revenue DESC ; <nl> ` ` ` <nl> Q3 . 4 <nl> ` ` ` sql <nl> - SELECT C_CITY , S_CITY , toYear ( LO_ORDERDATE ) AS year , sum ( LO_REVENUE ) AS revenue FROM lineorder_flat WHERE ( C_CITY = ' UNITED KI1 ' OR C_CITY = ' UNITED KI5 ' ) AND ( S_CITY = ' UNITED KI1 ' OR S_CITY = ' UNITED KI5 ' ) AND toYYYYMM ( LO_ORDERDATE ) = ' 199712 ' GROUP BY C_CITY , S_CITY , year ORDER BY year asc , revenue desc ; <nl> + SELECT <nl> + C_CITY , <nl> + S_CITY , <nl> + toYear ( LO_ORDERDATE ) AS year , <nl> + sum ( LO_REVENUE ) AS revenue <nl> + FROM lineorder_flat <nl> + WHERE ( ( C_CITY = ' UNITED KI1 ' ) OR ( C_CITY = ' UNITED KI5 ' ) ) AND ( ( S_CITY = ' UNITED KI1 ' ) OR ( S_CITY = ' UNITED KI5 ' ) ) AND ( toYYYYMM ( LO_ORDERDATE ) = 199712 ) <nl> + GROUP BY <nl> + C_CITY , <nl> + S_CITY , <nl> + year <nl> + ORDER BY <nl> + year ASC , <nl> + revenue DESC ; <nl> ` ` ` <nl> Q4 . 1 <nl> ` ` ` sql <nl> - SELECT toYear ( LO_ORDERDATE ) AS year , C_NATION , sum ( LO_REVENUE - LO_SUPPLYCOST ) AS profit FROM lineorder_flat WHERE C_REGION = ' AMERICA ' AND S_REGION = ' AMERICA ' AND ( P_MFGR = ' MFGR # 1 ' OR P_MFGR = ' MFGR # 2 ' ) GROUP BY year , C_NATION ORDER BY year , C_NATION ; <nl> + SELECT <nl> + toYear ( LO_ORDERDATE ) AS year , <nl> + C_NATION , <nl> + sum ( LO_REVENUE - LO_SUPPLYCOST ) AS profit <nl> + FROM lineorder_flat <nl> + WHERE ( C_REGION = ' AMERICA ' ) AND ( S_REGION = ' AMERICA ' ) AND ( ( P_MFGR = ' MFGR # 1 ' ) OR ( P_MFGR = ' MFGR # 2 ' ) ) <nl> + GROUP BY <nl> + year , <nl> + C_NATION <nl> + ORDER BY <nl> + year ASC , <nl> + C_NATION ASC ; <nl> ` ` ` <nl> Q4 . 2 <nl> ` ` ` sql <nl> - SELECT toYear ( LO_ORDERDATE ) AS year , S_NATION , P_CATEGORY , sum ( LO_REVENUE - LO_SUPPLYCOST ) AS profit FROM lineorder_flat WHERE C_REGION = ' AMERICA ' AND S_REGION = ' AMERICA ' AND ( year = 1997 OR year = 1998 ) AND ( P_MFGR = ' MFGR # 1 ' OR P_MFGR = ' MFGR # 2 ' ) GROUP BY year , S_NATION , P_CATEGORY ORDER BY year , S_NATION , P_CATEGORY ; <nl> + SELECT <nl> + toYear ( LO_ORDERDATE ) AS year , <nl> + S_NATION , <nl> + P_CATEGORY , <nl> + sum ( LO_REVENUE - LO_SUPPLYCOST ) AS profit <nl> + FROM lineorder_flat <nl> + WHERE ( C_REGION = ' AMERICA ' ) AND ( S_REGION = ' AMERICA ' ) AND ( ( year = 1997 ) OR ( year = 1998 ) ) AND ( ( P_MFGR = ' MFGR # 1 ' ) OR ( P_MFGR = ' MFGR # 2 ' ) ) <nl> + GROUP BY <nl> + year , <nl> + S_NATION , <nl> + P_CATEGORY <nl> + ORDER BY <nl> + year ASC , <nl> + S_NATION ASC , <nl> + P_CATEGORY ASC ; <nl> ` ` ` <nl> Q4 . 3 <nl> ` ` ` sql <nl> - SELECT toYear ( LO_ORDERDATE ) AS year , S_CITY , P_BRAND , sum ( LO_REVENUE - LO_SUPPLYCOST ) AS profit FROM lineorder_flat WHERE S_NATION = ' UNITED STATES ' AND ( year = 1997 OR year = 1998 ) AND P_CATEGORY = ' MFGR # 14 ' GROUP BY year , S_CITY , P_BRAND ORDER BY year , S_CITY , P_BRAND ; <nl> + SELECT <nl> + toYear ( LO_ORDERDATE ) AS year , <nl> + S_CITY , <nl> + P_BRAND , <nl> + sum ( LO_REVENUE - LO_SUPPLYCOST ) AS profit <nl> + FROM lineorder_flat <nl> + WHERE ( S_NATION = ' UNITED STATES ' ) AND ( ( year = 1997 ) OR ( year = 1998 ) ) AND ( P_CATEGORY = ' MFGR # 14 ' ) <nl> + GROUP BY <nl> + year , <nl> + S_CITY , <nl> + P_BRAND <nl> + ORDER BY <nl> + year ASC , <nl> + S_CITY ASC , <nl> + P_BRAND ASC ; <nl> ` ` ` <nl> <nl> [ Original article ] ( https : / / clickhouse . yandex / docs / en / getting_started / example_datasets / star_schema / ) < ! - - hide - - > <nl>
|
Update star_schema . md
|
ClickHouse/ClickHouse
|
173b7a05257b318d60af23abcd4e02cc859e2617
|
2020-01-04T00:22:24Z
|
mmm a / fdbbackup / backup . actor . cpp <nl> ppp b / fdbbackup / backup . actor . cpp <nl> ACTOR Future < Void > runRestore ( Database db , std : : string originalClusterFile , std : <nl> / / Fast restore agent that kicks off the restore : send restore requests to restore workers . <nl> ACTOR Future < Void > runFastRestoreAgent ( Database db , std : : string tagName , std : : string container , <nl> Standalone < VectorRef < KeyRangeRef > > ranges , Version dbVersion , <nl> - bool performRestore , bool verbose , bool waitForDone , std : : string addPrefix , <nl> - std : : string removePrefix ) { <nl> + bool performRestore , bool verbose , bool waitForDone ) { <nl> try { <nl> state FileBackupAgent backupAgent ; <nl> state Version restoreVersion = invalidVersion ; <nl> ACTOR Future < Void > runFastRestoreAgent ( Database db , std : : string tagName , std : : st <nl> dbVersion = desc . maxRestorableVersion . get ( ) ; <nl> TraceEvent ( " FastRestoreAgent " ) . detail ( " TargetRestoreVersion " , dbVersion ) ; <nl> } <nl> - Version _restoreVersion = wait ( fastRestore ( db , KeyRef ( tagName ) , KeyRef ( container ) , waitForDone , dbVersion , <nl> - verbose , range , KeyRef ( addPrefix ) , KeyRef ( removePrefix ) ) ) ; <nl> - restoreVersion = _restoreVersion ; <nl> + state UID randomUID = deterministicRandom ( ) - > randomUniqueID ( ) ; <nl> + TraceEvent ( " FastRestoreAgent " ) <nl> + . detail ( " SubmitRestoreRequests " , ranges . size ( ) ) <nl> + . detail ( " RestoreUID " , randomUID ) ; <nl> + wait ( backupAgent . submitParallelRestore ( db , KeyRef ( tagName ) , ranges , KeyRef ( container ) , dbVersion , true , <nl> + randomUID ) ) ; <nl> + if ( waitForDone ) { <nl> + / / Wait for parallel restore to finish and unlock DB after that <nl> + TraceEvent ( " FastRestoreAgent " ) . detail ( " BackupAndParallelRestore " , " WaitForRestoreToFinish " ) ; <nl> + wait ( backupAgent . parallelRestoreFinish ( db , randomUID ) ) ; <nl> + TraceEvent ( " FastRestoreAgent " ) . detail ( " BackupAndParallelRestore " , " RestoreFinished " ) ; <nl> + } else { <nl> + TraceEvent ( " FastRestoreAgent " ) <nl> + . detail ( " RestoreUID " , randomUID ) <nl> + . detail ( " OperationGuide " , " Manually unlock DB when restore finishes " ) ; <nl> + printf ( " WARNING : DB will be in locked state after restore . Need UID : % s to unlock DB \ n " , <nl> + randomUID . toString ( ) . c_str ( ) ) ; <nl> + } <nl> + <nl> + restoreVersion = dbVersion ; <nl> } else { <nl> state Reference < IBackupContainer > bc = IBackupContainer : : openContainer ( container ) ; <nl> state BackupDescription description = wait ( bc - > describeBackup ( ) ) ; <nl> int main ( int argc , char * argv [ ] ) { <nl> switch ( restoreType ) { <nl> case RESTORE_START : <nl> f = stopAfter ( runFastRestoreAgent ( db , tagName , restoreContainer , backupKeys , restoreVersion , ! dryRun , <nl> - ! quietDisplay , waitForDone , addPrefix , removePrefix ) ) ; <nl> + ! quietDisplay , waitForDone ) ) ; <nl> break ; <nl> case RESTORE_WAIT : <nl> printf ( " [ TODO ] [ ERROR ] FastRestore does not support RESTORE_WAIT yet ! \ n " ) ; <nl> int main ( int argc , char * argv [ ] ) { <nl> <nl> flushAndExit ( status ) ; <nl> } <nl> - <nl> - / / mmmmmmRestore Agent : Kick off the restore by sending the restore requests <nl> - ACTOR static Future < FileBackupAgent : : ERestoreState > waitFastRestore ( Database cx , Key tagName , bool verbose ) { <nl> - / / We should wait on all restore to finish before proceeds <nl> - TraceEvent ( " FastRestore " ) . detail ( " Progress " , " WaitForRestoreToFinish " ) ; <nl> - state ReadYourWritesTransaction tr ( cx ) ; <nl> - state Future < Void > fRestoreRequestDone ; <nl> - state bool restoreRequestDone = false ; <nl> - <nl> - loop { <nl> - try { <nl> - tr . reset ( ) ; <nl> - tr . setOption ( FDBTransactionOptions : : ACCESS_SYSTEM_KEYS ) ; <nl> - tr . setOption ( FDBTransactionOptions : : LOCK_AWARE ) ; <nl> - tr . setOption ( FDBTransactionOptions : : PRIORITY_SYSTEM_IMMEDIATE ) ; <nl> - / / In case restoreRequestDoneKey is already set before we set watch on it <nl> - Optional < Value > restoreRequestDoneKeyValue = wait ( tr . get ( restoreRequestDoneKey ) ) ; <nl> - if ( restoreRequestDoneKeyValue . present ( ) ) { <nl> - restoreRequestDone = true ; <nl> - tr . clear ( restoreRequestDoneKey ) ; <nl> - wait ( tr . commit ( ) ) ; <nl> - break ; <nl> - } else if ( ! restoreRequestDone ) { <nl> - fRestoreRequestDone = tr . watch ( restoreRequestDoneKey ) ; <nl> - wait ( tr . commit ( ) ) ; <nl> - wait ( fRestoreRequestDone ) ; <nl> - } else { <nl> - break ; <nl> - } <nl> - } catch ( Error & e ) { <nl> - wait ( tr . onError ( e ) ) ; <nl> - } <nl> - } <nl> - <nl> - TraceEvent ( " FastRestore " ) . detail ( " Progress " , " RestoreFinished " ) ; <nl> - <nl> - return FileBackupAgent : : ERestoreState : : COMPLETED ; <nl> - } <nl> - <nl> - ACTOR static Future < Version > _fastRestore ( Database cx , Key tagName , Key url , bool waitForComplete , <nl> - Version targetVersion , bool verbose , KeyRange range , Key addPrefix , <nl> - Key removePrefix ) { <nl> - state Reference < IBackupContainer > bc = IBackupContainer : : openContainer ( url . toString ( ) ) ; <nl> - state BackupDescription desc = wait ( bc - > describeBackup ( ) ) ; <nl> - wait ( desc . resolveVersionTimes ( cx ) ) ; <nl> - <nl> - if ( targetVersion = = invalidVersion & & desc . maxRestorableVersion . present ( ) ) <nl> - targetVersion = desc . maxRestorableVersion . get ( ) ; <nl> - <nl> - Optional < RestorableFileSet > restoreSet = wait ( bc - > getRestoreSet ( targetVersion ) ) ; <nl> - TraceEvent ( " FastRestore " ) . detail ( " BackupDesc " , desc . toString ( ) ) . detail ( " TargetVersion " , targetVersion ) ; <nl> - <nl> - if ( ! restoreSet . present ( ) ) { <nl> - TraceEvent ( SevWarn , " FileBackupAgentRestoreNotPossible " ) <nl> - . detail ( " BackupContainer " , bc - > getURL ( ) ) <nl> - . detail ( " TargetVersion " , targetVersion ) ; <nl> - throw restore_invalid_version ( ) ; <nl> - } <nl> - <nl> - / / NOTE : The restore agent makes sure we only support 1 restore range for each restore request for now ! <nl> - / / The simulation test did test restoring multiple restore ranges in one restore request though . <nl> - state Reference < ReadYourWritesTransaction > tr ( new ReadYourWritesTransaction ( cx ) ) ; <nl> - state int restoreIndex = 0 ; <nl> - loop { <nl> - try { <nl> - tr - > setOption ( FDBTransactionOptions : : ACCESS_SYSTEM_KEYS ) ; <nl> - tr - > setOption ( FDBTransactionOptions : : LOCK_AWARE ) ; <nl> - Standalone < StringRef > restoreTag ( tagName . toString ( ) + " _ " + std : : to_string ( restoreIndex ) ) ; <nl> - bool locked = true ; <nl> - struct RestoreRequest restoreRequest ( restoreIndex , restoreTag , KeyRef ( bc - > getURL ( ) ) , true , targetVersion , <nl> - true , range , Key ( ) , Key ( ) , locked , <nl> - deterministicRandom ( ) - > randomUniqueID ( ) ) ; <nl> - tr - > set ( restoreRequestKeyFor ( restoreRequest . index ) , restoreRequestValue ( restoreRequest ) ) ; <nl> - / / backupRanges . size = 1 because we only support restoring 1 range in real mode for now <nl> - tr - > set ( restoreRequestTriggerKey , restoreRequestTriggerValue ( deterministicRandom ( ) - > randomUniqueID ( ) , 1 ) ) ; <nl> - wait ( tr - > commit ( ) ) ; / / Trigger fast restore <nl> - break ; <nl> - } catch ( Error & e ) { <nl> - if ( e . code ( ) ! = error_code_restore_duplicate_tag ) { <nl> - wait ( tr - > onError ( e ) ) ; <nl> - } <nl> - } <nl> - } <nl> - <nl> - if ( waitForComplete ) { <nl> - FileBackupAgent : : ERestoreState finalState = wait ( waitFastRestore ( cx , tagName , verbose ) ) ; <nl> - if ( finalState ! = FileBackupAgent : : ERestoreState : : COMPLETED ) throw restore_error ( ) ; <nl> - } <nl> - <nl> - return targetVersion ; <nl> - } <nl> - <nl> - ACTOR Future < Version > fastRestore ( Database cx , Standalone < StringRef > tagName , Standalone < StringRef > url , <nl> - bool waitForComplete , long targetVersion , bool verbose , Standalone < KeyRangeRef > range , <nl> - Standalone < StringRef > addPrefix , Standalone < StringRef > removePrefix ) { <nl> - Version result = <nl> - wait ( _fastRestore ( cx , tagName , url , waitForComplete , targetVersion , verbose , range , addPrefix , removePrefix ) ) ; <nl> - return result ; <nl> - } <nl> mmm a / fdbclient / BackupAgent . actor . h <nl> ppp b / fdbclient / BackupAgent . actor . h <nl> class BackupConfig : public KeyBackedConfig { <nl> } <nl> } ; <nl> <nl> - ACTOR Future < Version > fastRestore ( Database cx , Standalone < StringRef > tagName , Standalone < StringRef > url , <nl> - bool waitForComplete , long targetVersion , bool verbose , Standalone < KeyRangeRef > range , <nl> - Standalone < StringRef > addPrefix , Standalone < StringRef > removePrefix ) ; <nl> - <nl> / / Helper class for reading restore data from a buffer and throwing the right errors . <nl> struct StringRefReader { <nl> StringRefReader ( StringRef s = StringRef ( ) , Error e = Error ( ) ) : rptr ( s . begin ( ) ) , end ( s . end ( ) ) , failure_error ( e ) { } <nl> mmm a / fdbclient / FileBackupAgent . actor . cpp <nl> ppp b / fdbclient / FileBackupAgent . actor . cpp <nl> class FileBackupAgentImpl { <nl> ACTOR static Future < Void > submitParallelRestore ( Database cx , Key backupTag , <nl> Standalone < VectorRef < KeyRangeRef > > backupRanges , KeyRef bcUrl , <nl> Version targetVersion , bool lockDB , UID randomUID ) { <nl> + / / Sanity check backup is valid <nl> + state Reference < IBackupContainer > bc = IBackupContainer : : openContainer ( bcUrl . toString ( ) ) ; <nl> + state BackupDescription desc = wait ( bc - > describeBackup ( ) ) ; <nl> + wait ( desc . resolveVersionTimes ( cx ) ) ; <nl> + <nl> + Optional < RestorableFileSet > restoreSet = wait ( bc - > getRestoreSet ( targetVersion ) ) ; <nl> + <nl> + if ( ! restoreSet . present ( ) ) { <nl> + TraceEvent ( SevWarn , " FileBackupAgentRestoreNotPossible " ) <nl> + . detail ( " BackupContainer " , bc - > getURL ( ) ) <nl> + . detail ( " TargetVersion " , targetVersion ) ; <nl> + throw restore_invalid_version ( ) ; <nl> + } <nl> + <nl> + if ( targetVersion = = invalidVersion & & desc . maxRestorableVersion . present ( ) ) { <nl> + targetVersion = desc . maxRestorableVersion . get ( ) ; <nl> + TraceEvent ( SevWarn , " FastRestoreSubmitRestoreRequestWithInvalidTargetVersion " ) <nl> + . detail ( " OverrideTargetVersion " , targetVersion ) ; <nl> + } <nl> + TraceEvent ( " FastRestoreSubmitRestoreRequest " ) <nl> + . detail ( " BackupDesc " , desc . toString ( ) ) <nl> + . detail ( " TargetVersion " , targetVersion ) ; <nl> + <nl> state Reference < ReadYourWritesTransaction > tr ( new ReadYourWritesTransaction ( cx ) ) ; <nl> state int restoreIndex = 0 ; <nl> state int numTries = 0 ; <nl> mmm a / fdbserver / Knobs . cpp <nl> ppp b / fdbserver / Knobs . cpp <nl> void ServerKnobs : : initialize ( bool randomize , ClientKnobs * clientKnobs , bool isSi <nl> / / Fast Restore <nl> init ( FASTRESTORE_FAILURE_TIMEOUT , 3600 ) ; <nl> init ( FASTRESTORE_HEARTBEAT_INTERVAL , 60 ) ; <nl> - init ( FASTRESTORE_SAMPLING_PERCENT , 1 ) ; if ( randomize ) { FASTRESTORE_SAMPLING_PERCENT = deterministicRandom ( ) - > random01 ( ) * 100 ; } <nl> - init ( FASTRESTORE_NUM_LOADERS , 3 ) ; if ( randomize ) { FASTRESTORE_NUM_LOADERS = deterministicRandom ( ) - > random01 ( ) * 10 + 1 ; } <nl> - init ( FASTRESTORE_NUM_APPLIERS , 3 ) ; if ( randomize ) { FASTRESTORE_NUM_APPLIERS = deterministicRandom ( ) - > random01 ( ) * 10 + 1 ; } <nl> - init ( FASTRESTORE_TXN_BATCH_MAX_BYTES , 512 . 0 ) ; if ( randomize ) { FASTRESTORE_TXN_BATCH_MAX_BYTES = deterministicRandom ( ) - > random01 ( ) * 1024 . 0 * 1024 . 0 + 1 . 0 ; } <nl> - init ( FASTRESTORE_VERSIONBATCH_MAX_BYTES , 10 . 0 * 1024 . 0 * 1024 . 0 ) ; if ( randomize ) { FASTRESTORE_VERSIONBATCH_MAX_BYTES = deterministicRandom ( ) - > random01 ( ) * 10 . 0 * 1024 . 0 * 1024 . 0 * 1024 . 0 ; } <nl> - init ( FASTRESTORE_VB_PARALLELISM , 3 ) ; if ( randomize ) { FASTRESTORE_VB_PARALLELISM = deterministicRandom ( ) - > random01 ( ) * 20 + 1 ; } <nl> - init ( FASTRESTORE_VB_MONITOR_DELAY , 5 ) ; if ( randomize ) { FASTRESTORE_VB_MONITOR_DELAY = deterministicRandom ( ) - > random01 ( ) * 20 + 1 ; } <nl> - init ( FASTRESTORE_VB_LAUNCH_DELAY , 5 ) ; if ( randomize ) { FASTRESTORE_VB_LAUNCH_DELAY = deterministicRandom ( ) - > random01 ( ) * 60 + 1 ; } <nl> - init ( FASTRESTORE_ROLE_LOGGING_DELAY , 5 ) ; if ( randomize ) { FASTRESTORE_ROLE_LOGGING_DELAY = deterministicRandom ( ) - > random01 ( ) * 60 + 1 ; } <nl> - init ( FASTRESTORE_UPDATE_PROCESS_STATS_INTERVAL , 5 ) ; if ( randomize ) { FASTRESTORE_UPDATE_PROCESS_STATS_INTERVAL = deterministicRandom ( ) - > random01 ( ) * 60 + 1 ; } <nl> - init ( FASTRESTORE_ATOMICOP_WEIGHT , 100 ) ; if ( randomize ) { FASTRESTORE_ATOMICOP_WEIGHT = deterministicRandom ( ) - > random01 ( ) * 200 + 1 ; } <nl> - init ( FASTRESTORE_APPLYING_PARALLELISM , 100 ) ; if ( randomize ) { FASTRESTORE_APPLYING_PARALLELISM = deterministicRandom ( ) - > random01 ( ) * 10 + 1 ; } <nl> - init ( FASTRESTORE_MONITOR_LEADER_DELAY , 5 ) ; if ( randomize ) { FASTRESTORE_MONITOR_LEADER_DELAY = deterministicRandom ( ) - > random01 ( ) * 100 ; } <nl> + init ( FASTRESTORE_SAMPLING_PERCENT , 1 ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_SAMPLING_PERCENT = deterministicRandom ( ) - > random01 ( ) * 100 ; } <nl> + init ( FASTRESTORE_NUM_LOADERS , 3 ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_NUM_LOADERS = deterministicRandom ( ) - > random01 ( ) * 10 + 1 ; } <nl> + init ( FASTRESTORE_NUM_APPLIERS , 3 ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_NUM_APPLIERS = deterministicRandom ( ) - > random01 ( ) * 10 + 1 ; } <nl> + init ( FASTRESTORE_TXN_BATCH_MAX_BYTES , 512 . 0 ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_TXN_BATCH_MAX_BYTES = deterministicRandom ( ) - > random01 ( ) * 1024 . 0 * 1024 . 0 + 1 . 0 ; } <nl> + init ( FASTRESTORE_VERSIONBATCH_MAX_BYTES , 10 . 0 * 1024 . 0 * 1024 . 0 ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_VERSIONBATCH_MAX_BYTES = deterministicRandom ( ) - > random01 ( ) * 10 . 0 * 1024 . 0 * 1024 . 0 * 1024 . 0 ; } <nl> + init ( FASTRESTORE_VB_PARALLELISM , 3 ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_VB_PARALLELISM = deterministicRandom ( ) - > random01 ( ) * 20 + 1 ; } <nl> + init ( FASTRESTORE_VB_MONITOR_DELAY , 5 ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_VB_MONITOR_DELAY = deterministicRandom ( ) - > random01 ( ) * 20 + 1 ; } <nl> + init ( FASTRESTORE_VB_LAUNCH_DELAY , 5 ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_VB_LAUNCH_DELAY = deterministicRandom ( ) - > random01 ( ) * 60 + 1 ; } <nl> + init ( FASTRESTORE_ROLE_LOGGING_DELAY , 5 ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_ROLE_LOGGING_DELAY = deterministicRandom ( ) - > random01 ( ) * 60 + 1 ; } <nl> + init ( FASTRESTORE_UPDATE_PROCESS_STATS_INTERVAL , 5 ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_UPDATE_PROCESS_STATS_INTERVAL = deterministicRandom ( ) - > random01 ( ) * 60 + 1 ; } <nl> + init ( FASTRESTORE_ATOMICOP_WEIGHT , 100 ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_ATOMICOP_WEIGHT = deterministicRandom ( ) - > random01 ( ) * 200 + 1 ; } <nl> + init ( FASTRESTORE_APPLYING_PARALLELISM , 100 ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_APPLYING_PARALLELISM = deterministicRandom ( ) - > random01 ( ) * 10 + 1 ; } <nl> + init ( FASTRESTORE_MONITOR_LEADER_DELAY , 5 ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_MONITOR_LEADER_DELAY = deterministicRandom ( ) - > random01 ( ) * 100 ; } <nl> init ( FASTRESTORE_STRAGGLER_THRESHOLD_SECONDS , 60 ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_STRAGGLER_THRESHOLD_SECONDS = deterministicRandom ( ) - > random01 ( ) * 240 + 10 ; } <nl> init ( FASTRESTORE_TRACK_REQUEST_LATENCY , true ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_TRACK_REQUEST_LATENCY = false ; } <nl> init ( FASTRESTORE_TRACK_LOADER_SEND_REQUESTS , false ) ; if ( randomize & & BUGGIFY ) { FASTRESTORE_TRACK_LOADER_SEND_REQUESTS = true ; } <nl> mmm a / fdbserver / RestoreWorker . actor . cpp <nl> ppp b / fdbserver / RestoreWorker . actor . cpp <nl> ACTOR Future < Void > collectRestoreWorkerInterface ( Reference < RestoreWorkerData > se <nl> } <nl> break ; <nl> } <nl> - TraceEvent ( " FastRestore " ) . suppressFor ( 10 . 0 ) . detail ( " NotEnoughWorkers " , agentValues . size ( ) ) ; <nl> + TraceEvent ( " FastRestore " ) <nl> + . suppressFor ( 10 . 0 ) <nl> + . detail ( " NotEnoughWorkers " , agentValues . size ( ) ) <nl> + . detail ( " MinWorkers " , min_num_workers ) ; <nl> wait ( delay ( 5 . 0 ) ) ; <nl> } catch ( Error & e ) { <nl> wait ( tr . onError ( e ) ) ; <nl>
|
Merge pull request from xumengpanda / mengxu / sim - restore - agent
|
apple/foundationdb
|
f4010c632a9feeb9821a886a3cf5de77953ad9d6
|
2020-04-29T03:28:18Z
|
mmm a / lib / SILGen / SILGenGlobalVariable . cpp <nl> ppp b / lib / SILGen / SILGenGlobalVariable . cpp <nl> void SILGenModule : : emitGlobalInitialization ( PatternBindingDecl * pd , <nl> <nl> void SILGenFunction : : emitLazyGlobalInitializer ( PatternBindingDecl * binding , <nl> unsigned pbdEntry ) { <nl> + MagicFunctionName = SILGenModule : : getMagicFunctionName ( binding - > getDeclContext ( ) ) ; <nl> + <nl> { <nl> Scope scope ( Cleanups , binding ) ; <nl> <nl> mmm a / test / SILGen / default_arguments . swift <nl> ppp b / test / SILGen / default_arguments . swift <nl> class Foo { <nl> <nl> / / CHECK - LABEL : sil hidden @ _T017default_arguments3FooCACSi3int_SS6stringtcfc : $ @ convention ( method ) ( Int , @ owned String , @ owned Foo ) - > @ owned Foo <nl> / / CHECK : string_literal utf16 " init ( int : string : ) " <nl> - init ( int : Int , string : String ) { <nl> + init ( int : Int , string : String = # function ) { <nl> testMagicLiterals ( ) <nl> closure { testMagicLiterals ( ) } <nl> autoclosure ( testMagicLiterals ( ) ) <nl> class Foo { <nl> autoclosure ( testMagicLiterals ( ) ) <nl> return x <nl> } <nl> + <nl> + / / CHECK - LABEL : sil private @ globalinit_33_E52D764B1F2009F2390B2B8DF62DAEB8_func0 <nl> + / / CHECK : string_literal utf16 " Foo " <nl> + static let x = Foo ( int : 0 ) <nl> + <nl> } <nl> <nl> / / Test at top level . <nl> testMagicLiterals ( ) <nl> closure { testMagicLiterals ( ) } <nl> autoclosure ( testMagicLiterals ( ) ) <nl> <nl> + / / CHECK : string_literal utf16 " default_arguments " <nl> + let y : String = # function <nl> + <nl> / / CHECK - LABEL : sil hidden @ _T017default_arguments16testSelectorCallySi_Si17withMagicLiteralstF <nl> / / CHECK : string_literal utf16 " testSelectorCall ( _ : withMagicLiterals : ) " <nl> func testSelectorCall ( _ x : Int , withMagicLiterals y : Int ) { <nl>
|
Merge remote - tracking branch ' origin / master ' into master - next
|
apple/swift
|
5382eaba6e3176c983ece1e276d31d731ac31a18
|
2017-10-24T16:29:28Z
|
mmm a / stdlib / runtime / Metadata . cpp <nl> ppp b / stdlib / runtime / Metadata . cpp <nl> swift : : swift_getExistentialTypeMetadata ( size_t numProtocols , <nl> ProtocolClassConstraint classConstraint = ProtocolClassConstraint : : Any ; <nl> for ( auto p : make_range ( protocols , protocols + numProtocols ) ) { <nl> if ( p - > Flags . needsWitnessTable ( ) ) { <nl> - printf ( " % s \ n " , p - > Name ) ; <nl> + + numWitnessTables ; <nl> } <nl> if ( p - > Flags . getClassConstraint ( ) = = ProtocolClassConstraint : : Class ) <nl>
|
Runtime : Remove debug noise from swift_getExistentialMetadata .
|
apple/swift
|
3c192269d0079e7c989008649948587950cceaec
|
2013-12-20T23:06:14Z
|
mmm a / tensorflow / lite / micro / all_ops_resolver . h <nl> ppp b / tensorflow / lite / micro / all_ops_resolver . h <nl> class AllOpsResolver : public MicroMutableOpResolver < 128 > { <nl> public : <nl> AllOpsResolver ( ) ; <nl> <nl> + private : <nl> TF_LITE_REMOVE_VIRTUAL_DELETE <nl> } ; <nl> <nl> mmm a / tensorflow / lite / micro / micro_mutable_op_resolver . h <nl> ppp b / tensorflow / lite / micro / micro_mutable_op_resolver . h <nl> class MicroMutableOpResolver : public MicroOpResolver { <nl> explicit MicroMutableOpResolver ( ErrorReporter * error_reporter = nullptr ) <nl> : error_reporter_ ( error_reporter ) { } <nl> <nl> - TF_LITE_REMOVE_VIRTUAL_DELETE <nl> <nl> const TfLiteRegistration * FindOp ( tflite : : BuiltinOperator op ) const override { <nl> if ( op = = BuiltinOperator_CUSTOM ) return nullptr ; <nl> class MicroMutableOpResolver : public MicroOpResolver { <nl> unsigned int GetRegistrationLength ( ) { return registrations_len_ ; } <nl> <nl> private : <nl> + TF_LITE_REMOVE_VIRTUAL_DELETE <nl> + <nl> TfLiteStatus AddBuiltin ( tflite : : BuiltinOperator op , <nl> const TfLiteRegistration & registration , <nl> MicroOpResolver : : BuiltinParseFunction parser ) { <nl> mmm a / tensorflow / lite / micro / tools / ci_build / test_x86 . sh <nl> ppp b / tensorflow / lite / micro / tools / ci_build / test_x86 . sh <nl> readable_run make - j8 - f tensorflow / lite / micro / tools / make / Makefile BUILD_TYPE = no <nl> readable_run make - f tensorflow / lite / micro / tools / make / Makefile clean <nl> readable_run make - j8 - f tensorflow / lite / micro / tools / make / Makefile BUILD_TYPE = release build <nl> <nl> + # Next , build with TAGS = posix . See b / 170223867 for more details . <nl> + # TODO ( b / 168123200 ) : Since the benchmarks can not currently be run as a test , we <nl> + # only build with TAGS = posix . Once benchmarks can be run ( and are added to make <nl> + # test ) we should switch to running all the tests with TAGS = posix . <nl> + readable_run make - f tensorflow / lite / micro / tools / make / Makefile clean <nl> + readable_run make - s - j8 - f tensorflow / lite / micro / tools / make / Makefile build TAGS = posix <nl> + <nl> # Next , build w / o release so that we can run the tests and get additional <nl> # debugging info on failures . <nl> readable_run make - f tensorflow / lite / micro / tools / make / Makefile clean <nl>
|
Add TAGS = posix to the CI build .
|
tensorflow/tensorflow
|
c41b1f7e72687368479a4deadee2652091c10941
|
2020-10-06T19:42:41Z
|
mmm a / SConstruct <nl> ppp b / SConstruct <nl> if selected_platform in platform_list : <nl> CCFLAGS = env . get ( ' CCFLAGS ' , ' ' ) <nl> env [ ' CCFLAGS ' ] = ' ' <nl> <nl> - env . Append ( CCFLAGS = string . split ( str ( CCFLAGS ) ) ) <nl> + env . Append ( CCFLAGS = str ( CCFLAGS ) . split ( ) ) <nl> <nl> CFLAGS = env . get ( ' CFLAGS ' , ' ' ) <nl> env [ ' CFLAGS ' ] = ' ' <nl> <nl> - env . Append ( CFLAGS = string . split ( str ( CFLAGS ) ) ) <nl> + env . Append ( CFLAGS = str ( CFLAGS ) . split ( ) ) <nl> <nl> LINKFLAGS = env . get ( ' LINKFLAGS ' , ' ' ) <nl> env [ ' LINKFLAGS ' ] = ' ' <nl> <nl> - env . Append ( LINKFLAGS = string . split ( str ( LINKFLAGS ) ) ) <nl> + env . Append ( LINKFLAGS = str ( LINKFLAGS ) . split ( ) ) <nl> <nl> flag_list = platform_flags [ selected_platform ] <nl> for f in flag_list : <nl> new file mode 100644 <nl> index 00000000000 . . 7338c479fbc <nl> mmm / dev / null <nl> ppp b / compat . py <nl> <nl> + import sys <nl> + <nl> + if sys . version_info < ( 3 , ) : <nl> + def isbasestring ( s ) : <nl> + return isinstance ( s , basestring ) <nl> + def open_utf8 ( filename , mode ) : <nl> + return open ( filename , mode ) <nl> + def byte_to_str ( x ) : <nl> + return str ( ord ( x ) ) <nl> + import cStringIO <nl> + def StringIO ( ) : <nl> + return cStringIO . StringIO ( ) <nl> + def encode_utf8 ( x ) : <nl> + return x <nl> + def iteritems ( d ) : <nl> + return d . iteritems ( ) <nl> + else : <nl> + def isbasestring ( s ) : <nl> + return isinstance ( s , ( str , bytes ) ) <nl> + def open_utf8 ( filename , mode ) : <nl> + return open ( filename , mode , encoding = " utf - 8 " ) <nl> + def byte_to_str ( x ) : <nl> + return str ( x ) <nl> + import io <nl> + def StringIO ( ) : <nl> + return io . StringIO ( ) <nl> + import codecs <nl> + def encode_utf8 ( x ) : <nl> + return codecs . utf_8_encode ( x ) [ 0 ] <nl> + def iteritems ( d ) : <nl> + return iter ( d . items ( ) ) <nl> mmm a / core / SCsub <nl> ppp b / core / SCsub <nl> gd_cpp = ' # include " project_settings . h " \ n ' <nl> gd_cpp + = gd_inc <nl> gd_cpp + = " void ProjectSettings : : register_global_defaults ( ) { \ n " + gd_call + " \ n } \ n " <nl> <nl> - f = open ( " global_defaults . gen . cpp " , " wb " ) <nl> + f = open ( " global_defaults . gen . cpp " , " w " ) <nl> f . write ( gd_cpp ) <nl> f . close ( ) <nl> <nl> if ( " SCRIPT_AES256_ENCRYPTION_KEY " in os . environ ) : <nl> txt = " 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 " <nl> print ( " Invalid AES256 encryption key , not 64 bits hex : " + e ) <nl> <nl> - f = open ( " script_encryption_key . gen . cpp " , " wb " ) <nl> + f = open ( " script_encryption_key . gen . cpp " , " w " ) <nl> f . write ( " # include \ " project_settings . h \ " \ nuint8_t script_encryption_key [ 32 ] = { " + txt + " } ; \ n " ) <nl> f . close ( ) <nl> <nl> mmm a / drivers / gles3 / shaders / SCsub <nl> ppp b / drivers / gles3 / shaders / SCsub <nl> <nl> <nl> Import ( ' env ' ) <nl> <nl> - if env [ ' BUILDERS ' ] . has_key ( ' GLES3_GLSL ' ) : <nl> + if ' GLES3_GLSL ' in env [ ' BUILDERS ' ] : <nl> env . GLES3_GLSL ( ' copy . glsl ' ) ; <nl> env . GLES3_GLSL ( ' resolve . glsl ' ) ; <nl> env . GLES3_GLSL ( ' canvas . glsl ' ) ; <nl> mmm a / drivers / unix / SCsub <nl> ppp b / drivers / unix / SCsub <nl> g_set_p + = ' String OS_Unix : : get_global_settings_path ( ) const { \ n ' <nl> g_set_p + = ' \ treturn " ' + env [ " unix_global_settings_path " ] + ' " ; \ n ' <nl> g_set_p + = ' } \ n ' <nl> g_set_p + = ' # endif ' <nl> - f = open ( " os_unix_global_settings_path . gen . cpp " , " wb " ) <nl> + f = open ( " os_unix_global_settings_path . gen . cpp " , " w " ) <nl> f . write ( g_set_p ) <nl> f . close ( ) <nl> <nl> mmm a / editor / SCsub <nl> ppp b / editor / SCsub <nl> Import ( ' env ' ) <nl> env . editor_sources = [ ] <nl> <nl> import os <nl> + from compat import encode_utf8 , byte_to_str , open_utf8 <nl> <nl> <nl> def make_certs_header ( target , source , env ) : <nl> def make_certs_header ( target , source , env ) : <nl> src = source [ 0 ] . srcnode ( ) . abspath <nl> dst = target [ 0 ] . srcnode ( ) . abspath <nl> f = open ( src , " rb " ) <nl> - g = open ( dst , " wb " ) <nl> + g = open_utf8 ( dst , " w " ) <nl> buf = f . read ( ) <nl> decomp_size = len ( buf ) <nl> import zlib <nl> def make_certs_header ( target , source , env ) : <nl> g . write ( " static const int _certs_uncompressed_size = " + str ( decomp_size ) + " ; \ n " ) <nl> g . write ( " static const unsigned char _certs_compressed [ ] = { \ n " ) <nl> for i in range ( len ( buf ) ) : <nl> - g . write ( str ( ord ( buf [ i ] ) ) + " , \ n " ) <nl> + g . write ( byte_to_str ( buf [ i ] ) + " , \ n " ) <nl> g . write ( " } ; \ n " ) <nl> g . write ( " # endif " ) <nl> <nl> def make_certs_header ( target , source , env ) : <nl> def make_doc_header ( target , source , env ) : <nl> <nl> dst = target [ 0 ] . srcnode ( ) . abspath <nl> - g = open ( dst , " wb " ) <nl> + g = open_utf8 ( dst , " w " ) <nl> buf = " " <nl> docbegin = " " <nl> docend = " " <nl> for s in source : <nl> src = s . srcnode ( ) . abspath <nl> - f = open ( src , " rb " ) <nl> + f = open_utf8 ( src , " r " ) <nl> content = f . read ( ) <nl> buf + = content [ content . find ( " < class " ) : content . rfind ( " < / doc > " ) ] <nl> if len ( docbegin ) = = 0 : <nl> docbegin = content [ 0 : content . find ( " < class " ) ] <nl> if len ( docend ) = = 0 : <nl> docend = content [ content . rfind ( " < / doc > " ) : len ( buf ) ] <nl> - buf = docbegin + buf + docend <nl> + buf = encode_utf8 ( docbegin + buf + docend ) <nl> decomp_size = len ( buf ) <nl> import zlib <nl> buf = zlib . compress ( buf ) <nl> def make_doc_header ( target , source , env ) : <nl> g . write ( " static const int _doc_data_uncompressed_size = " + str ( decomp_size ) + " ; \ n " ) <nl> g . write ( " static const unsigned char _doc_data_compressed [ ] = { \ n " ) <nl> for i in range ( len ( buf ) ) : <nl> - g . write ( str ( ord ( buf [ i ] ) ) + " , \ n " ) <nl> + g . write ( byte_to_str ( buf [ i ] ) + " , \ n " ) <nl> g . write ( " } ; \ n " ) <nl> g . write ( " # endif " ) <nl> <nl> def make_fonts_header ( target , source , env ) : <nl> <nl> dst = target [ 0 ] . srcnode ( ) . abspath <nl> <nl> - g = open ( dst , " wb " ) <nl> + g = open_utf8 ( dst , " w " ) <nl> <nl> g . write ( " / * THIS FILE IS GENERATED DO NOT EDIT * / \ n " ) <nl> g . write ( " # ifndef _EDITOR_FONTS_H \ n " ) <nl> def make_fonts_header ( target , source , env ) : <nl> g . write ( " static const int _font_ " + name + " _size = " + str ( len ( buf ) ) + " ; \ n " ) <nl> g . write ( " static const unsigned char _font_ " + name + " [ ] = { \ n " ) <nl> for i in range ( len ( buf ) ) : <nl> - g . write ( str ( ord ( buf [ i ] ) ) + " , \ n " ) <nl> + g . write ( byte_to_str ( buf [ i ] ) + " , \ n " ) <nl> <nl> g . write ( " } ; \ n " ) <nl> <nl> def make_translations_header ( target , source , env ) : <nl> <nl> dst = target [ 0 ] . srcnode ( ) . abspath <nl> <nl> - g = open ( dst , " wb " ) <nl> + g = open_utf8 ( dst , " w " ) <nl> <nl> g . write ( " / * THIS FILE IS GENERATED DO NOT EDIT * / \ n " ) <nl> g . write ( " # ifndef _EDITOR_TRANSLATIONS_H \ n " ) <nl> def make_translations_header ( target , source , env ) : <nl> # g . write ( " static const int _translation_ " + name + " _uncompressed_size = " + str ( decomp_size ) + " ; \ n " ) <nl> g . write ( " static const unsigned char _translation_ " + name + " _compressed [ ] = { \ n " ) <nl> for i in range ( len ( buf ) ) : <nl> - g . write ( str ( ord ( buf [ i ] ) ) + " , \ n " ) <nl> + g . write ( byte_to_str ( buf [ i ] ) + " , \ n " ) <nl> <nl> g . write ( " } ; \ n " ) <nl> <nl> def make_authors_header ( target , source , env ) : <nl> <nl> src = source [ 0 ] . srcnode ( ) . abspath <nl> dst = target [ 0 ] . srcnode ( ) . abspath <nl> - f = open ( src , " rb " ) <nl> - g = open ( dst , " wb " ) <nl> + f = open_utf8 ( src , " r " ) <nl> + g = open_utf8 ( dst , " w " ) <nl> <nl> g . write ( " / * THIS FILE IS GENERATED DO NOT EDIT * / \ n " ) <nl> g . write ( " # ifndef _EDITOR_AUTHORS_H \ n " ) <nl> def make_license_header ( target , source , env ) : <nl> src_copyright = source [ 0 ] . srcnode ( ) . abspath <nl> src_license = source [ 1 ] . srcnode ( ) . abspath <nl> dst = target [ 0 ] . srcnode ( ) . abspath <nl> - f = open ( src_license , " rb " ) <nl> - fc = open ( src_copyright , " rb " ) <nl> - g = open ( dst , " wb " ) <nl> + f = open_utf8 ( src_license , " r " ) <nl> + fc = open_utf8 ( src_copyright , " r " ) <nl> + g = open_utf8 ( dst , " w " ) <nl> <nl> g . write ( " / * THIS FILE IS GENERATED DO NOT EDIT * / \ n " ) <nl> g . write ( " # ifndef _EDITOR_LICENSE_H \ n " ) <nl> if ( env [ " tools " ] = = " yes " ) : <nl> reg_exporters = ' void register_exporters ( ) { \ n ' <nl> for e in env . platform_exporters : <nl> env . editor_sources . append ( " # platform / " + e + " / export / export . cpp " ) <nl> - reg_exporters + = ' \ tregister_ ' + e + ' _exporter ( ) ; \ n ' <nl> + reg_exporters + = ' \ tregister_ ' + e + ' _exporter ( ) ; \ n ' <nl> reg_exporters_inc + = ' # include " platform / ' + e + ' / export / export . h " \ n ' <nl> reg_exporters + = ' } \ n ' <nl> - f = open ( " register_exporters . gen . cpp " , " wb " ) <nl> + f = open_utf8 ( " register_exporters . gen . cpp " , " w " ) <nl> f . write ( reg_exporters_inc ) <nl> f . write ( reg_exporters ) <nl> f . close ( ) <nl> mmm a / editor / icons / SCsub <nl> ppp b / editor / icons / SCsub <nl> <nl> # ! / usr / bin / env python <nl> <nl> Import ( ' env ' ) <nl> - <nl> + from compat import StringIO <nl> <nl> def make_editor_icons_action ( target , source , env ) : <nl> <nl> import os <nl> - import cStringIO <nl> <nl> dst = target [ 0 ] . srcnode ( ) . abspath <nl> svg_icons = source <nl> <nl> - whites = cStringIO . StringIO ( ) <nl> - darks = cStringIO . StringIO ( ) <nl> + whites = StringIO ( ) <nl> + darks = StringIO ( ) <nl> <nl> for f in svg_icons : <nl> <nl> def make_editor_icons_action ( target , source , env ) : <nl> whites . write ( ' \ n ' ) <nl> darks . write ( ' \ n ' ) <nl> <nl> - s = cStringIO . StringIO ( ) <nl> + s = StringIO ( ) <nl> s . write ( " / * THIS FILE IS GENERATED DO NOT EDIT * / \ n " ) <nl> s . write ( " # ifndef _EDITOR_ICONS_H \ n " ) <nl> s . write ( " # define _EDITOR_ICONS_H \ n " ) <nl> def make_editor_icons_action ( target , source , env ) : <nl> s . write ( " # endif \ n " ) <nl> <nl> <nl> - f = open ( dst , " wb " ) <nl> + f = open ( dst , " w " ) <nl> f . write ( s . getvalue ( ) ) <nl> f . close ( ) <nl> s . close ( ) <nl> mmm a / main / SCsub <nl> ppp b / main / SCsub <nl> <nl> # ! / usr / bin / env python <nl> <nl> Import ( ' env ' ) <nl> + from compat import byte_to_str <nl> <nl> <nl> def make_splash ( target , source , env ) : <nl> def make_splash ( target , source , env ) : <nl> src = source [ 0 ] . srcnode ( ) . abspath <nl> dst = target [ 0 ] . srcnode ( ) . abspath <nl> f = open ( src , " rb " ) <nl> - g = open ( dst , " wb " ) <nl> + g = open ( dst , " w " ) <nl> <nl> buf = f . read ( ) <nl> <nl> g . write ( " / * THIS FILE IS GENERATED DO NOT EDIT * / \ n " ) <nl> g . write ( " # ifndef BOOT_SPLASH_H \ n " ) <nl> g . write ( " # define BOOT_SPLASH_H \ n " ) <nl> - g . write ( " static const Color boot_splash_bg_color = Color ( 1 , 1 , 1 , 1 ) ; \ n " ) ; <nl> + g . write ( " static const Color boot_splash_bg_color = Color ( 1 , 1 , 1 , 1 ) ; \ n " ) <nl> g . write ( " static const unsigned char boot_splash_png [ ] = { \ n " ) <nl> for i in range ( len ( buf ) ) : <nl> - g . write ( str ( ord ( buf [ i ] ) ) + " , \ n " ) <nl> + g . write ( byte_to_str ( buf [ i ] ) + " , \ n " ) <nl> g . write ( " } ; \ n " ) <nl> g . write ( " # endif " ) <nl> <nl> def make_app_icon ( target , source , env ) : <nl> src = source [ 0 ] . srcnode ( ) . abspath <nl> dst = target [ 0 ] . srcnode ( ) . abspath <nl> f = open ( src , " rb " ) <nl> - g = open ( dst , " wb " ) <nl> + g = open ( dst , " w " ) <nl> <nl> buf = f . read ( ) <nl> <nl> def make_app_icon ( target , source , env ) : <nl> g . write ( " # define APP_ICON_H \ n " ) <nl> g . write ( " static const unsigned char app_icon_png [ ] = { \ n " ) <nl> for i in range ( len ( buf ) ) : <nl> - g . write ( str ( ord ( buf [ i ] ) ) + " , \ n " ) <nl> + g . write ( byte_to_str ( buf [ i ] ) + " , \ n " ) <nl> g . write ( " } ; \ n " ) <nl> g . write ( " # endif " ) <nl> <nl> mmm a / methods . py <nl> ppp b / methods . py <nl> <nl> import os <nl> + from compat import iteritems <nl> <nl> <nl> def add_source_files ( self , sources , filetype , lib_env = None , shared = False ) : <nl> def add_source_files ( self , sources , filetype , lib_env = None , shared = False ) : <nl> def build_shader_header ( target , source , env ) : <nl> <nl> for x in source : <nl> - print x <nl> + print ( x ) <nl> <nl> name = str ( x ) <nl> name = name [ name . rfind ( " / " ) + 1 : ] <nl> def include_file_in_legacygl_header ( filename , header_data , depth ) : <nl> if ( not included_file in header_data . vertex_included_files and header_data . reading = = " vertex " ) : <nl> header_data . vertex_included_files + = [ included_file ] <nl> if ( include_file_in_legacygl_header ( included_file , header_data , depth + 1 ) = = None ) : <nl> - print " Error in file ' " + filename + " ' : # include " + includeline + " could not be found ! " <nl> + print ( " Error in file ' " + filename + " ' : # include " + includeline + " could not be found ! " ) <nl> elif ( not included_file in header_data . fragment_included_files and header_data . reading = = " fragment " ) : <nl> header_data . fragment_included_files + = [ included_file ] <nl> if ( include_file_in_legacygl_header ( included_file , header_data , depth + 1 ) = = None ) : <nl> - print " Error in file ' " + filename + " ' : # include " + includeline + " could not be found ! " <nl> + print ( " Error in file ' " + filename + " ' : # include " + includeline + " could not be found ! " ) <nl> <nl> line = fs . readline ( ) <nl> <nl> def update_version ( ) : <nl> print ( " Using custom revision : " + rev ) <nl> import version <nl> <nl> - f = open ( " core / version_generated . gen . h " , " wb " ) <nl> + f = open ( " core / version_generated . gen . h " , " w " ) <nl> f . write ( " # define VERSION_SHORT_NAME " + str ( version . short_name ) + " \ n " ) <nl> f . write ( " # define VERSION_NAME " + str ( version . name ) + " \ n " ) <nl> f . write ( " # define VERSION_MAJOR " + str ( version . major ) + " \ n " ) <nl> def update_version ( ) : <nl> f . write ( " # define VERSION_YEAR " + str ( datetime . datetime . now ( ) . year ) + " \ n " ) <nl> f . close ( ) <nl> <nl> - fhash = open ( " core / version_hash . gen . h " , " wb " ) <nl> + fhash = open ( " core / version_hash . gen . h " , " w " ) <nl> githash = " " <nl> if os . path . isfile ( " . git / HEAD " ) : <nl> - head = open ( " . git / HEAD " , " rb " ) . readline ( ) . strip ( ) <nl> + head = open ( " . git / HEAD " , " r " ) . readline ( ) . strip ( ) <nl> if head . startswith ( " ref : " ) : <nl> head = " . git / " + head [ 5 : ] <nl> if os . path . isfile ( head ) : <nl> - githash = open ( head , " rb " ) . readline ( ) . strip ( ) <nl> + githash = open ( head , " r " ) . readline ( ) . strip ( ) <nl> else : <nl> githash = head <nl> fhash . write ( " # define VERSION_HASH \ " " + githash + " \ " " ) <nl> def detect_modules ( ) : <nl> <nl> " " " <nl> <nl> - f = open ( " modules / register_module_types . gen . cpp " , " wb " ) <nl> + f = open ( " modules / register_module_types . gen . cpp " , " w " ) <nl> f . write ( modules_cpp ) <nl> <nl> return module_list <nl> def win32_spawn ( sh , escape , cmd , args , env ) : <nl> data , err = proc . communicate ( ) <nl> rv = proc . wait ( ) <nl> if rv : <nl> - print " = = = = = " <nl> - print err <nl> - print " = = = = = " <nl> + print ( " = = = = = " ) <nl> + print ( err ) <nl> + print ( " = = = = = " ) <nl> return rv <nl> <nl> " " " <nl> def android_add_default_config ( self , config ) : <nl> <nl> def android_add_to_manifest ( self , file ) : <nl> base_path = self . Dir ( " . " ) . abspath + " / modules / " + self . current_module + " / " + file <nl> - f = open ( base_path , " rb " ) <nl> + f = open ( base_path , " r " ) <nl> self . android_manifest_chunk + = f . read ( ) <nl> <nl> def android_add_to_permissions ( self , file ) : <nl> base_path = self . Dir ( " . " ) . abspath + " / modules / " + self . current_module + " / " + file <nl> - f = open ( base_path , " rb " ) <nl> + f = open ( base_path , " r " ) <nl> self . android_permission_chunk + = f . read ( ) <nl> <nl> def android_add_to_attributes ( self , file ) : <nl> base_path = self . Dir ( " . " ) . abspath + " / modules / " + self . current_module + " / " + file <nl> - f = open ( base_path , " rb " ) <nl> + f = open ( base_path , " r " ) <nl> self . android_appattributes_chunk + = f . read ( ) <nl> <nl> def disable_module ( self ) : <nl> def mySubProcess ( cmdline , env ) : <nl> data , err = proc . communicate ( ) <nl> rv = proc . wait ( ) <nl> if rv : <nl> - print " = = = = = " <nl> - print err <nl> - print " = = = = = " <nl> + print ( " = = = = = " ) <nl> + print ( err ) <nl> + print ( " = = = = = " ) <nl> return rv <nl> <nl> def mySpawn ( sh , escape , cmd , args , env ) : <nl> def mySpawn ( sh , escape , cmd , args , env ) : <nl> cmdline = cmd + " " + newargs <nl> <nl> rv = 0 <nl> - env = { str ( key ) : str ( value ) for key , value in env . iteritems ( ) } <nl> + env = { str ( key ) : str ( value ) for key , value in iteritems ( env ) } <nl> if len ( cmdline ) > 32000 and cmd . endswith ( " ar " ) : <nl> cmdline = cmd + " " + args [ 1 ] + " " + args [ 2 ] + " " <nl> for i in range ( 3 , len ( args ) ) : <nl> def save_active_platforms ( apnames , ap ) : <nl> str + = " } ; \ n " <nl> <nl> wf = x + " / " + name + " . gen . h " <nl> - pngw = open ( wf , " wb " ) <nl> + pngw = open ( wf , " w " ) <nl> pngw . write ( str ) <nl> <nl> <nl> def detect_visual_c_compiler_version ( tools_env ) : <nl> <nl> # Start with Pre VS 2017 checks which uses VCINSTALLDIR : <nl> if ' VCINSTALLDIR ' in tools_env : <nl> - # print " Checking VCINSTALLDIR " <nl> + # print ( " Checking VCINSTALLDIR " ) <nl> <nl> # find ( ) works with - 1 so big ifs bellow are needed . . . the simplest solution , in fact <nl> # First test if amd64 and amd64_x86 compilers are present in the path <nl> def detect_visual_c_compiler_version ( tools_env ) : <nl> <nl> # and for VS 2017 and newer we check VCTOOLSINSTALLDIR : <nl> if ' VCTOOLSINSTALLDIR ' in tools_env : <nl> - # print " Checking VCTOOLSINSTALLDIR " <nl> + # print ( " Checking VCTOOLSINSTALLDIR " ) <nl> <nl> # Newer versions have a different path available <nl> vc_amd64_compiler_detection_index = tools_env [ " PATH " ] . upper ( ) . find ( tools_env [ ' VCTOOLSINSTALLDIR ' ] . upper ( ) + " BIN \ \ HOSTX64 \ \ X64 ; " ) <nl> def detect_visual_c_compiler_version ( tools_env ) : <nl> vc_chosen_compiler_str = " x86_amd64 " <nl> <nl> # debug help <nl> - # print vc_amd64_compiler_detection_index <nl> - # print vc_amd64_x86_compiler_detection_index <nl> - # print vc_x86_compiler_detection_index <nl> - # print vc_x86_amd64_compiler_detection_index <nl> - # print " chosen " + str ( vc_chosen_compiler_index ) + " | " + str ( vc_chosen_compiler_str ) <nl> + # print ( vc_amd64_compiler_detection_index ) <nl> + # print ( vc_amd64_x86_compiler_detection_index ) <nl> + # print ( vc_x86_compiler_detection_index ) <nl> + # print ( vc_x86_amd64_compiler_detection_index ) <nl> + # print ( " chosen " + str ( vc_chosen_compiler_index ) + " | " + str ( vc_chosen_compiler_str ) ) <nl> <nl> return vc_chosen_compiler_str <nl> <nl> mmm a / modules / freetype / SCsub <nl> ppp b / modules / freetype / SCsub <nl> <nl> # ! / usr / bin / env python <nl> <nl> Import ( ' env ' ) <nl> + from compat import isbasestring <nl> <nl> # Not building in a separate env as scene needs it <nl> <nl> if ( env [ ' builtin_freetype ' ] ! = ' no ' ) : <nl> # and then plain strings for system library . We insert between the two . <nl> inserted = False <nl> for idx , linklib in enumerate ( env [ " LIBS " ] ) : <nl> - if isinstance ( linklib , basestring ) : # first system lib such as " X11 " , otherwise SCons lib object <nl> + if isbasestring ( linklib ) : # first system lib such as " X11 " , otherwise SCons lib object <nl> env [ " LIBS " ] . insert ( idx , lib ) <nl> inserted = True <nl> break <nl> mmm a / modules / svg / SCsub <nl> ppp b / modules / svg / SCsub <nl> <nl> # ! / usr / bin / env python <nl> <nl> Import ( ' env ' ) <nl> + from compat import isbasestring <nl> <nl> # Thirdparty source files <nl> thirdparty_dir = " # thirdparty / nanosvg / " <nl> lib = env . Library ( " svg_builtin " , thirdparty_sources ) <nl> # and then plain strings for system library . We insert between the two . <nl> inserted = False <nl> for idx , linklib in enumerate ( env [ " LIBS " ] ) : <nl> - if isinstance ( linklib , basestring ) : # first system lib such as " X11 " , otherwise SCons lib object <nl> + if isbasestring ( linklib ) : # first system lib such as " X11 " , otherwise SCons lib object <nl> env [ " LIBS " ] . insert ( idx , lib ) <nl> inserted = True <nl> break <nl> mmm a / platform / android / SCsub <nl> ppp b / platform / android / SCsub <nl> <nl> # ! / usr / bin / env python <nl> <nl> import shutil <nl> + from compat import open_utf8 <nl> <nl> Import ( ' env ' ) <nl> <nl> prog = None <nl> abspath = env . Dir ( " . " ) . abspath <nl> <nl> <nl> - gradle_basein = open ( abspath + " / build . gradle . template " , " rb " ) <nl> - gradle_baseout = open ( abspath + " / java / build . gradle " , " wb " ) <nl> + gradle_basein = open_utf8 ( abspath + " / build . gradle . template " , " r " ) <nl> + gradle_baseout = open_utf8 ( abspath + " / java / build . gradle " , " w " ) <nl> <nl> gradle_text = gradle_basein . read ( ) <nl> <nl> gradle_baseout . write ( gradle_text ) <nl> gradle_baseout . close ( ) <nl> <nl> <nl> - pp_basein = open ( abspath + " / AndroidManifest . xml . template " , " rb " ) <nl> - pp_baseout = open ( abspath + " / java / AndroidManifest . xml " , " wb " ) <nl> + pp_basein = open_utf8 ( abspath + " / AndroidManifest . xml . template " , " r " ) <nl> + pp_baseout = open_utf8 ( abspath + " / java / AndroidManifest . xml " , " w " ) <nl> manifest = pp_basein . read ( ) <nl> manifest = manifest . replace ( " $ $ ADD_APPLICATION_CHUNKS $ $ " , env . android_manifest_chunk ) <nl> manifest = manifest . replace ( " $ $ ADD_PERMISSION_CHUNKS $ $ " , env . android_permission_chunk ) <nl> elif env [ ' android_arch ' ] = = ' arm64v8 ' : <nl> elif env [ ' android_arch ' ] = = ' x86 ' : <nl> lib_arch_dir = ' x86 ' <nl> else : <nl> - print ' WARN : Architecture not suitable for embedding into APK ; keeping . so at \ \ bin ' <nl> + print ( ' WARN : Architecture not suitable for embedding into APK ; keeping . so at \ \ bin ' ) <nl> <nl> if lib_arch_dir ! = ' ' : <nl> if env [ ' target ' ] = = ' release ' : <nl> mmm a / platform / android / detect . py <nl> ppp b / platform / android / detect . py <nl> def get_name ( ) : <nl> <nl> def can_build ( ) : <nl> <nl> - return ( os . environ . has_key ( " ANDROID_NDK_ROOT " ) ) <nl> + return ( " ANDROID_NDK_ROOT " in os . environ ) <nl> <nl> <nl> def get_opts ( ) : <nl> def configure ( env ) : <nl> import subprocess <nl> <nl> def mySubProcess ( cmdline , env ) : <nl> - # print " SPAWNED : " + cmdline <nl> + # print ( " SPAWNED : " + cmdline ) <nl> startupinfo = subprocess . STARTUPINFO ( ) <nl> startupinfo . dwFlags | = subprocess . STARTF_USESHOWWINDOW <nl> proc = subprocess . Popen ( cmdline , stdin = subprocess . PIPE , stdout = subprocess . PIPE , <nl> def mySubProcess ( cmdline , env ) : <nl> data , err = proc . communicate ( ) <nl> rv = proc . wait ( ) <nl> if rv : <nl> - print " = = = = = " <nl> - print err <nl> - print " = = = = = " <nl> + print ( " = = = = = " ) <nl> + print ( err ) <nl> + print ( " = = = = = " ) <nl> return rv <nl> <nl> def mySpawn ( sh , escape , cmd , args , env ) : <nl> def mySpawn ( sh , escape , cmd , args , env ) : <nl> # # Compile flags <nl> <nl> env . Append ( CPPFLAGS = [ " - isystem " , sysroot + " / usr / include " ] ) <nl> - env . Append ( CPPFLAGS = string . split ( ' - fpic - ffunction - sections - funwind - tables - fstack - protector - strong - fvisibility = hidden - fno - strict - aliasing ' ) ) <nl> - env . Append ( CPPFLAGS = string . split ( ' - DNO_STATVFS - DGLES2_ENABLED ' ) ) <nl> + env . Append ( CPPFLAGS = ' - fpic - ffunction - sections - funwind - tables - fstack - protector - strong - fvisibility = hidden - fno - strict - aliasing ' . split ( ) ) <nl> + env . Append ( CPPFLAGS = ' - DNO_STATVFS - DGLES2_ENABLED ' . split ( ) ) <nl> <nl> env [ ' neon_enabled ' ] = False <nl> if env [ ' android_arch ' ] = = ' x86 ' : <nl> def mySpawn ( sh , escape , cmd , args , env ) : <nl> <nl> elif env [ " android_arch " ] = = " armv6 " : <nl> target_opts = [ ' - target ' , ' armv6 - none - linux - androideabi ' ] <nl> - env . Append ( CPPFLAGS = string . split ( ' - D__ARM_ARCH_6__ - march = armv6 - mfpu = vfp - mfloat - abi = softfp ' ) ) <nl> + env . Append ( CPPFLAGS = ' - D__ARM_ARCH_6__ - march = armv6 - mfpu = vfp - mfloat - abi = softfp ' . split ( ) ) <nl> <nl> elif env [ " android_arch " ] = = " armv7 " : <nl> target_opts = [ ' - target ' , ' armv7 - none - linux - androideabi ' ] <nl> - env . Append ( CPPFLAGS = string . split ( ' - D__ARM_ARCH_7__ - D__ARM_ARCH_7A__ - march = armv7 - a - mfloat - abi = softfp ' ) ) <nl> + env . Append ( CPPFLAGS = ' - D__ARM_ARCH_7__ - D__ARM_ARCH_7A__ - march = armv7 - a - mfloat - abi = softfp ' . split ( ) ) <nl> if env [ ' android_neon ' ] = = ' yes ' : <nl> env [ ' neon_enabled ' ] = True <nl> env . Append ( CPPFLAGS = [ ' - mfpu = neon ' , ' - D__ARM_NEON__ ' ] ) <nl> def mySpawn ( sh , escape , cmd , args , env ) : <nl> <nl> env [ ' LINKFLAGS ' ] = [ ' - shared ' , ' - - sysroot = ' + sysroot , ' - Wl , - - warn - shared - textrel ' ] <nl> if env [ " android_arch " ] = = " armv7 " : <nl> - env . Append ( LINKFLAGS = string . split ( ' - Wl , - - fix - cortex - a8 ' ) ) <nl> - env . Append ( LINKFLAGS = string . split ( ' - Wl , - - no - undefined - Wl , - z , noexecstack - Wl , - z , relro - Wl , - z , now ' ) ) <nl> - env . Append ( LINKFLAGS = string . split ( ' - Wl , - soname , libgodot_android . so - Wl , - - gc - sections ' ) ) <nl> + env . Append ( LINKFLAGS = ' - Wl , - - fix - cortex - a8 ' . split ( ) ) <nl> + env . Append ( LINKFLAGS = ' - Wl , - - no - undefined - Wl , - z , noexecstack - Wl , - z , relro - Wl , - z , now ' . split ( ) ) <nl> + env . Append ( LINKFLAGS = ' - Wl , - soname , libgodot_android . so - Wl , - - gc - sections ' . split ( ) ) <nl> if mt_link : <nl> env . Append ( LINKFLAGS = [ ' - Wl , - - threads ' ] ) <nl> env . Append ( LINKFLAGS = target_opts ) <nl> mmm a / platform / iphone / detect . py <nl> ppp b / platform / iphone / detect . py <nl> def get_name ( ) : <nl> <nl> def can_build ( ) : <nl> <nl> - if sys . platform = = ' darwin ' or os . environ . has_key ( " OSXCROSS_IOS " ) : <nl> + if sys . platform = = ' darwin ' or ( " OSXCROSS_IOS " in os . environ ) : <nl> return True <nl> <nl> return False <nl> def configure ( env ) : <nl> if ( env [ " arch " ] = = " x86 " ) : <nl> env [ ' IPHONEPLATFORM ' ] = ' iPhoneSimulator ' <nl> env [ ' ENV ' ] [ ' MACOSX_DEPLOYMENT_TARGET ' ] = ' 10 . 6 ' <nl> - env . Append ( CCFLAGS = string . split ( ' - arch i386 - fobjc - abi - version = 2 - fobjc - legacy - dispatch - fmessage - length = 0 - fpascal - strings - fblocks - fasm - blocks - D__IPHONE_OS_VERSION_MIN_REQUIRED = 40100 - isysroot $ IPHONESDK - mios - simulator - version - min = 4 . 3 - DCUSTOM_MATRIX_TRANSFORM_H = \ \ \ " build / iphone / matrix4_iphone . h \ \ \ " - DCUSTOM_VECTOR3_TRANSFORM_H = \ \ \ " build / iphone / vector3_iphone . h \ \ \ " ' ) ) <nl> + env . Append ( CCFLAGS = ' - arch i386 - fobjc - abi - version = 2 - fobjc - legacy - dispatch - fmessage - length = 0 - fpascal - strings - fblocks - fasm - blocks - D__IPHONE_OS_VERSION_MIN_REQUIRED = 40100 - isysroot $ IPHONESDK - mios - simulator - version - min = 4 . 3 - DCUSTOM_MATRIX_TRANSFORM_H = \ \ \ " build / iphone / matrix4_iphone . h \ \ \ " - DCUSTOM_VECTOR3_TRANSFORM_H = \ \ \ " build / iphone / vector3_iphone . h \ \ \ " ' . split ( ) ) <nl> elif ( env [ " arch " ] = = " arm " ) : <nl> - env . Append ( CCFLAGS = string . split ( ' - fno - objc - arc - arch armv7 - fmessage - length = 0 - fno - strict - aliasing - fdiagnostics - print - source - range - info - fdiagnostics - show - category = id - fdiagnostics - parseable - fixits - fpascal - strings - fblocks - isysroot $ IPHONESDK - fvisibility = hidden - mthumb " - DIBOutlet = __attribute__ ( ( iboutlet ) ) " " - DIBOutletCollection ( ClassName ) = __attribute__ ( ( iboutletcollection ( ClassName ) ) ) " " - DIBAction = void ) __attribute__ ( ( ibaction ) " - miphoneos - version - min = 9 . 0 - MMD - MT dependencies ' ) ) <nl> + env . Append ( CCFLAGS = ' - fno - objc - arc - arch armv7 - fmessage - length = 0 - fno - strict - aliasing - fdiagnostics - print - source - range - info - fdiagnostics - show - category = id - fdiagnostics - parseable - fixits - fpascal - strings - fblocks - isysroot $ IPHONESDK - fvisibility = hidden - mthumb " - DIBOutlet = __attribute__ ( ( iboutlet ) ) " " - DIBOutletCollection ( ClassName ) = __attribute__ ( ( iboutletcollection ( ClassName ) ) ) " " - DIBAction = void ) __attribute__ ( ( ibaction ) " - miphoneos - version - min = 9 . 0 - MMD - MT dependencies ' . split ( ) ) <nl> elif ( env [ " arch " ] = = " arm64 " ) : <nl> - env . Append ( CCFLAGS = string . split ( ' - fno - objc - arc - arch arm64 - fmessage - length = 0 - fno - strict - aliasing - fdiagnostics - print - source - range - info - fdiagnostics - show - category = id - fdiagnostics - parseable - fixits - fpascal - strings - fblocks - fvisibility = hidden - MMD - MT dependencies - miphoneos - version - min = 9 . 0 - isysroot $ IPHONESDK ' ) ) <nl> + env . Append ( CCFLAGS = ' - fno - objc - arc - arch arm64 - fmessage - length = 0 - fno - strict - aliasing - fdiagnostics - print - source - range - info - fdiagnostics - show - category = id - fdiagnostics - parseable - fixits - fpascal - strings - fblocks - fvisibility = hidden - MMD - MT dependencies - miphoneos - version - min = 9 . 0 - isysroot $ IPHONESDK ' . split ( ) ) <nl> env . Append ( CPPFLAGS = [ ' - DNEED_LONG_INT ' ] ) <nl> env . Append ( CPPFLAGS = [ ' - DLIBYUV_DISABLE_NEON ' ] ) <nl> <nl> mmm a / platform / javascript / detect . py <nl> ppp b / platform / javascript / detect . py <nl> def get_name ( ) : <nl> <nl> def can_build ( ) : <nl> <nl> - return ( os . environ . has_key ( " EMSCRIPTEN_ROOT " ) ) <nl> + return ( " EMSCRIPTEN_ROOT " in os . environ ) <nl> <nl> <nl> def get_opts ( ) : <nl> mmm a / platform / osx / detect . py <nl> ppp b / platform / osx / detect . py <nl> def get_name ( ) : <nl> <nl> def can_build ( ) : <nl> <nl> - if ( sys . platform = = " darwin " or os . environ . has_key ( " OSXCROSS_ROOT " ) ) : <nl> + if ( sys . platform = = " darwin " or ( " OSXCROSS_ROOT " in os . environ ) ) : <nl> return True <nl> <nl> return False <nl> mmm a / platform / uwp / detect . py <nl> ppp b / platform / uwp / detect . py <nl> def configure ( env ) : <nl> env . Append ( CPPFLAGS = [ ' / AI ' , vc_base_path + ' lib / store / references ' ] ) <nl> env . Append ( CPPFLAGS = [ ' / AI ' , vc_base_path + ' lib / x86 / store / references ' ] ) <nl> <nl> - env . Append ( CCFLAGS = string . split ( ' / FS / MP / GS / wd " 4453 " / wd " 28204 " / wd " 4291 " / Zc : wchar_t / Gm - / fp : precise / D " _UNICODE " / D " UNICODE " / D " WINAPI_FAMILY = WINAPI_FAMILY_APP " / errorReport : prompt / WX - / Zc : forScope / Gd / EHsc / nologo ' ) ) <nl> - env . Append ( CXXFLAGS = string . split ( ' / ZW / FS ' ) ) <nl> + env . Append ( CCFLAGS = ' / FS / MP / GS / wd " 4453 " / wd " 28204 " / wd " 4291 " / Zc : wchar_t / Gm - / fp : precise / D " _UNICODE " / D " UNICODE " / D " WINAPI_FAMILY = WINAPI_FAMILY_APP " / errorReport : prompt / WX - / Zc : forScope / Gd / EHsc / nologo ' . split ( ) ) <nl> + env . Append ( CXXFLAGS = ' / ZW / FS ' . split ( ) ) <nl> env . Append ( CCFLAGS = [ ' / AI ' , vc_base_path + ' \ \ vcpackages ' , ' / AI ' , os . environ [ ' WINDOWSSDKDIR ' ] + ' \ \ References \ \ CommonConfiguration \ \ Neutral ' ] ) <nl> <nl> # # Link flags <nl>
|
Merge pull request from hoelzl / python3 - v3
|
godotengine/godot
|
6ef7783abb4ea31e6c59b4c30a05c7249b361020
|
2017-08-27T22:05:15Z
|
mmm a / doc / modules / globalevent . md <nl> ppp b / doc / modules / globalevent . md <nl> API development is complete , when the event needs to be sent , the need through t <nl> * / <nl> instance . fireGlobalEventCallback ( eventName , params ) ; <nl> ` ` ` <nl> + # # # Example <nl> + <nl> + # # # # Android <nl> + ` ` ` java <nl> + Map < String , Object > params = new HashMap < > ( ) ; <nl> + params . put ( " key " , " value " ) ; <nl> + mWXSDKInstance . fireGlobalEventCallback ( " geolocation " , params ) ; <nl> + ` ` ` <nl> + # # # # iOS <nl> + ` ` ` Objective - C <nl> + [ weexInstance fireGlobalEvent : @ " geolocation " params : @ { @ " key " : @ " value " } ] ; <nl> + ` ` ` <nl> <nl> # # API <nl> <nl>
|
* [ doc ] update global event . md
|
apache/incubator-weex
|
6dbbe49299bb66462d8afb7ee27fd89fdcf02d9c
|
2016-10-17T13:55:23Z
|
mmm a / bindings / c / foundationdb / fdb_c . h <nl> ppp b / bindings / c / foundationdb / fdb_c . h <nl> extern " C " { <nl> fdb_future_get_error ( FDBFuture * f ) ; <nl> # endif <nl> <nl> - # if FDB_API_VERSION < = 610 <nl> + # if FDB_API_VERSION < 620 <nl> DLLEXPORT WARN_UNUSED_RESULT fdb_error_t <nl> fdb_future_get_version ( FDBFuture * f , int64_t * out_version ) ; <nl> # endif <nl>
|
Update bindings / c / foundationdb / fdb_c . h
|
apple/foundationdb
|
94563464cbb63a45c183a248774cdde9458099e1
|
2019-07-16T17:15:47Z
|
mmm a / tests / cpp - tests / Classes / UITest / CocoStudioGUITest / UIRichTextTest / UIRichTextTest . cpp <nl> ppp b / tests / cpp - tests / Classes / UITest / CocoStudioGUITest / UIRichTextTest / UIRichTextTest . cpp <nl> bool UIRichTextXMLUrl : : init ( ) <nl> _widget - > addChild ( button3 ) ; <nl> <nl> / / RichText <nl> - _richText = RichText : : createWithXML ( " And this link will redirect you to google : < a href = ' http : / / www . google . com ' > click me < / a > " ) ; <nl> + _richText = RichText : : createWithXML ( " And this link will redirect you togoogle : < a href = ' http : / / www . google . com ' > click me < / a > " ) ; <nl> _richText - > ignoreContentAdaptWithSize ( false ) ; <nl> _richText - > setContentSize ( Size ( 100 , 100 ) ) ; <nl> <nl> mmm a / tests / js - tests / src / GUITest / UIFocusTest / UIFocusTest . js <nl> ppp b / tests / js - tests / src / GUITest / UIFocusTest / UIFocusTest . js <nl> var UIFocusTestBase = UIMainLayer . extend ( { <nl> _dpadMenu : null , <nl> _firstFocusedWidget : null , <nl> _eventListener : null , <nl> + _btn : null , <nl> <nl> init : function ( ) { <nl> if ( this . _super ( ) ) { <nl> var UIFocusTestBase = UIMainLayer . extend ( { <nl> this . _dpadMenu . setPosition ( 0 , 0 ) ; <nl> this . addChild ( this . _dpadMenu ) ; <nl> <nl> + this . _btn = new ccui . Button ( " ccs - res / cocosui / switch - mask . png " ) ; <nl> + this . _btn . setTitleText ( " Toggle Loop " ) ; <nl> + this . _btn . setPosition ( 60 , winSize . height - 50 ) ; <nl> + this . _btn . setTitleColor ( cc . color . RED ) ; <nl> + this . _btn . addTouchEventListener ( this . toggleFocusLoop , this ) ; <nl> + this . _btn . setFocusEnabled ( false ) ; <nl> + this . addChild ( this . _btn ) ; <nl> + <nl> / / call this method to enable Dpad focus navigation <nl> ccui . Widget . enableDpadNavigation ( true ) ; <nl> <nl> var UIFocusTestHorizontal = UIFocusTestBase . extend ( { <nl> this . _loopText . setColor ( cc . color . GREEN ) ; <nl> this . addChild ( this . _loopText ) ; <nl> <nl> - var btn = new ccui . Button ( " ccs - res / cocosui / switch - mask . png " ) ; <nl> - btn . setTitleText ( " Toggle Loop " ) ; <nl> - btn . setPosition ( 60 , winSize . height - 50 ) ; <nl> - btn . setTitleColor ( cc . color . RED ) ; <nl> - btn . addTouchEventListener ( this . toggleFocusLoop , this ) ; <nl> - this . addChild ( btn ) ; <nl> + this . _btn . addTouchEventListener ( this . toggleFocusLoop , this ) ; <nl> return true ; <nl> } <nl> return false ; <nl> var UIFocusTestVertical = UIFocusTestBase . extend ( { <nl> this . _loopText . setColor ( cc . color . GREEN ) ; <nl> this . addChild ( this . _loopText ) ; <nl> <nl> - var btn = new ccui . Button ( " ccs - res / cocosui / switch - mask . png " ) ; <nl> - btn . setTitleText ( " Toggle Loop " ) ; <nl> - btn . setPosition ( 60 , winSize . height - 50 ) ; <nl> - btn . setTitleColor ( cc . color . RED ) ; <nl> - btn . addTouchEventListener ( this . toggleFocusLoop , this ) ; <nl> - this . addChild ( btn ) ; <nl> + this . _btn . addTouchEventListener ( this . toggleFocusLoop , this ) ; <nl> return true ; <nl> } <nl> return false ; <nl> var UIFocusTestNestedLayout1 = UIFocusTestBase . extend ( { <nl> this . _loopText . setColor ( cc . color . GREEN ) ; <nl> this . addChild ( this . _loopText ) ; <nl> <nl> - var btn = new ccui . Button ( " ccs - res / cocosui / switch - mask . png " ) ; <nl> - btn . setTitleText ( " Toggle Loop " ) ; <nl> - btn . setPosition ( 60 , winSize . height - 50 ) ; <nl> - btn . setTitleColor ( cc . color . RED ) ; <nl> - btn . addTouchEventListener ( this . toggleFocusLoop , this ) ; <nl> - this . addChild ( btn ) ; <nl> + this . _btn . addTouchEventListener ( this . toggleFocusLoop , this ) ; <nl> return true ; <nl> } <nl> return false ; <nl> var UIFocusTestNestedLayout2 = UIFocusTestBase . extend ( { <nl> this . _loopText . setColor ( cc . color . GREEN ) ; <nl> this . addChild ( this . _loopText ) ; <nl> <nl> - var btn = new ccui . Button ( " ccs - res / cocosui / switch - mask . png " ) ; <nl> - btn . setTitleText ( " Toggle Loop " ) ; <nl> - btn . setPosition ( 60 , winSize . height - 50 ) ; <nl> - btn . setTitleColor ( cc . color . RED ) ; <nl> - btn . addTouchEventListener ( this . toggleFocusLoop , this ) ; <nl> - this . addChild ( btn ) ; <nl> + this . _btn . addTouchEventListener ( this . toggleFocusLoop , this ) ; <nl> return true ; <nl> } <nl> return false ; <nl> var UIFocusTestNestedLayout3 = UIFocusTestBase . extend ( { <nl> this . _loopText . setColor ( cc . color . GREEN ) ; <nl> this . addChild ( this . _loopText ) ; <nl> <nl> - var btn = new ccui . Button ( " ccs - res / cocosui / switch - mask . png " ) ; <nl> - btn . setTitleText ( " Toggle Loop " ) ; <nl> - btn . setPosition ( 60 , winSize . height - 50 ) ; <nl> - btn . setTitleColor ( cc . color . RED ) ; <nl> - btn . addTouchEventListener ( this . toggleFocusLoop , this ) ; <nl> - this . addChild ( btn ) ; <nl> + this . _btn . addTouchEventListener ( this . toggleFocusLoop , this ) ; <nl> return true ; <nl> } <nl> return false ; <nl> var UIFocusTestListView = UIFocusTestBase . extend ( { <nl> this . _loopText . setColor ( cc . color . GREEN ) ; <nl> this . addChild ( this . _loopText ) ; <nl> <nl> - var btn = new ccui . Button ( " ccs - res / cocosui / switch - mask . png " ) ; <nl> - btn . setTitleText ( " Toggle Loop " ) ; <nl> - btn . setPosition ( 60 , winSize . height - 50 ) ; <nl> - btn . setTitleColor ( cc . color . RED ) ; <nl> - btn . addTouchEventListener ( this . toggleFocusLoop , this ) ; <nl> - this . addChild ( btn ) ; <nl> + this . _btn . addTouchEventListener ( this . toggleFocusLoop , this ) ; <nl> return true ; <nl> } <nl> return false ; <nl>
|
make uifocustest the same behavior as cpp ( )
|
cocos2d/cocos2d-x
|
2fe40dba68ae7289a8f152085bc903646fe97ef1
|
2017-09-08T02:35:15Z
|
mmm a / tensorflow / core / api_def / python_api / api_def_CropAndResize . pbtxt <nl> ppp b / tensorflow / core / api_def / python_api / api_def_CropAndResize . pbtxt <nl> <nl> op { <nl> graph_op_name : " CropAndResize " <nl> - endpoint { <nl> - name : " image . crop_and_resize " <nl> - } <nl> + visibility : HIDDEN <nl> } <nl> mmm a / tensorflow / core / api_def / python_api / api_def_ExtractImagePatches . pbtxt <nl> ppp b / tensorflow / core / api_def / python_api / api_def_ExtractImagePatches . pbtxt <nl> <nl> op { <nl> graph_op_name : " ExtractImagePatches " <nl> - endpoint { <nl> - name : " image . extract_image_patches " <nl> - } <nl> - endpoint { <nl> - name : " extract_image_patches " <nl> - deprecation_version : 2 <nl> - } <nl> + visibility : HIDDEN <nl> } <nl> mmm a / tensorflow / python / ops / array_ops . py <nl> ppp b / tensorflow / python / ops / array_ops . py <nl> def searchsorted ( sorted_sequence , <nl> <nl> <nl> quantize . __doc__ = gen_array_ops . quantize_v2 . __doc__ <nl> + <nl> + <nl> + @ tf_export ( " image . extract_image_patches " , v1 = [ ] ) <nl> + def extract_image_patches_v2 ( <nl> + images , <nl> + sizes , <nl> + strides , <nl> + rates , <nl> + padding , <nl> + name = None ) : <nl> + # pylint : disable = line - too - long <nl> + r " " " Extract ` patches ` from ` images ` and put them in the \ " depth \ " output dimension . <nl> + <nl> + Args : <nl> + images : A 4 - D Tensor with shape ` [ batch , in_rows , in_cols , depth ] <nl> + sizes : The size of the sliding window for each dimension of ` images ` . <nl> + strides : A 1 - D Tensor of length 4 . How far the centers of two consecutive <nl> + patches are in the images . Must be : ` [ 1 , stride_rows , stride_cols , 1 ] ` . <nl> + rates : A 1 - D Tensor of length 4 . Must be : ` [ 1 , rate_rows , rate_cols , 1 ] ` . <nl> + This is the input stride , specifying how far two consecutive patch samples <nl> + are in the input . Equivalent to extracting patches with ` patch_sizes_eff = <nl> + patch_sizes + ( patch_sizes - 1 ) * ( rates - 1 ) ` , followed by subsampling <nl> + them spatially by a factor of ` rates ` . This is equivalent to ` rate ` in <nl> + dilated ( a . k . a . Atrous ) convolutions . <nl> + padding : The type of padding algorithm to use . <nl> + We specify the size - related attributes as : ` ` ` python ksizes = [ 1 , <nl> + ksize_rows , ksize_cols , 1 ] strides = [ 1 , strides_rows , strides_cols , 1 ] <nl> + rates = [ 1 , rates_rows , rates_cols , 1 ] <nl> + name : A name for the operation ( optional ) . <nl> + <nl> + Returns : <nl> + A 4 - D Tensor . Has the same type as ` images ` , and with shape ` [ batch , <nl> + out_rows , out_cols , ksize_rows * ksize_cols * depth ] ` containing image <nl> + patches with size ` ksize_rows x ksize_cols x depth ` vectorized in the <nl> + \ " depth \ " dimension . Note ` out_rows ` and ` out_cols ` are the dimensions of <nl> + the output patches . <nl> + " " " <nl> + # pylint : enable = line - too - long <nl> + return gen_array_ops . extract_image_patches ( <nl> + images , sizes , strides , rates , padding , name ) <nl> + <nl> + extract_image_patches_deprecation = deprecation . deprecated_args ( <nl> + None , " ksizes is deprecated , use sizes instead " , " ksizes " ) <nl> + tf_export ( v1 = [ " image . extract_image_patches " , " extract_image_patches " ] ) ( <nl> + extract_image_patches_deprecation ( gen_array_ops . extract_image_patches ) ) <nl> mmm a / tensorflow / python / ops / image_ops_impl . py <nl> ppp b / tensorflow / python / ops / image_ops_impl . py <nl> def sobel_edges ( image ) : <nl> ' instead . ' ) ) <nl> tf_export ( v1 = [ ' image . resize_nearest_neighbor ' ] ) ( <nl> resize_nearest_neighbor_deprecation ( gen_image_ops . resize_nearest_neighbor ) ) <nl> + <nl> + <nl> + @ tf_export ( ' image . crop_and_resize ' , v1 = [ ] ) <nl> + def crop_and_resize_v2 ( <nl> + image , <nl> + boxes , <nl> + box_indices , <nl> + crop_size , <nl> + method = ' bilinear ' , <nl> + extrapolation_value = 0 , <nl> + name = None ) : <nl> + " " " Extracts crops from the input image tensor and resizes them . <nl> + <nl> + Extracts crops from the input image tensor and resizes them using bilinear <nl> + sampling or nearest neighbor sampling ( possibly with aspect ratio change ) to a <nl> + common output size specified by ` crop_size ` . This is more general than the <nl> + ` crop_to_bounding_box ` op which extracts a fixed size slice from the input <nl> + image and does not allow resizing or aspect ratio change . <nl> + <nl> + Returns a tensor with ` crops ` from the input ` image ` at positions defined at <nl> + the bounding box locations in ` boxes ` . The cropped boxes are all resized ( with <nl> + bilinear or nearest neighbor interpolation ) to a fixed <nl> + ` size = [ crop_height , crop_width ] ` . The result is a 4 - D tensor <nl> + ` [ num_boxes , crop_height , crop_width , depth ] ` . The resizing is corner aligned . <nl> + In particular , if ` boxes = [ [ 0 , 0 , 1 , 1 ] ] ` , the method will give identical <nl> + results to using ` tf . image . resize_bilinear ( ) ` or <nl> + ` tf . image . resize_nearest_neighbor ( ) ` ( depends on the ` method ` argument ) with <nl> + ` align_corners = True ` . <nl> + <nl> + Args : <nl> + image : A 4 - D tensor of shape ` [ batch , image_height , image_width , depth ] ` . <nl> + Both ` image_height ` and ` image_width ` need to be positive . <nl> + boxes : A 2 - D tensor of shape ` [ num_boxes , 4 ] ` . The ` i ` - th row of the tensor <nl> + specifies the coordinates of a box in the ` box_ind [ i ] ` image and is <nl> + specified in normalized coordinates ` [ y1 , x1 , y2 , x2 ] ` . A normalized <nl> + coordinate value of ` y ` is mapped to the image coordinate at ` y * <nl> + ( image_height - 1 ) ` , so as the ` [ 0 , 1 ] ` interval of normalized image <nl> + height is mapped to ` [ 0 , image_height - 1 ] ` in image height coordinates . <nl> + We do allow ` y1 ` > ` y2 ` , in which case the sampled crop is an up - down <nl> + flipped version of the original image . The width dimension is treated <nl> + similarly . Normalized coordinates outside the ` [ 0 , 1 ] ` range are allowed , <nl> + in which case we use ` extrapolation_value ` to extrapolate the input image <nl> + values . <nl> + box_indices : A 1 - D tensor of shape ` [ num_boxes ] ` with int32 values in ` [ 0 , <nl> + batch ) ` . The value of ` box_ind [ i ] ` specifies the image that the ` i ` - th box <nl> + refers to . <nl> + crop_size : A 1 - D tensor of 2 elements , ` size = [ crop_height , crop_width ] ` . <nl> + All cropped image patches are resized to this size . The aspect ratio of <nl> + the image content is not preserved . Both ` crop_height ` and ` crop_width ` <nl> + need to be positive . <nl> + method : An optional string specifying the sampling method for resizing . It <nl> + can be either ` " bilinear " ` or ` " nearest " ` and default to ` " bilinear " ` . <nl> + Currently two sampling methods are supported : Bilinear and Nearest <nl> + Neighbor . <nl> + extrapolation_value : An optional ` float ` . Defaults to ` 0 ` . Value used for <nl> + extrapolation , when applicable . <nl> + name : A name for the operation ( optional ) . <nl> + <nl> + Returns : <nl> + A 4 - D tensor of shape ` [ num_boxes , crop_height , crop_width , depth ] ` . <nl> + " " " <nl> + return gen_image_ops . crop_and_resize ( <nl> + image , boxes , box_indices , crop_size , method , extrapolation_value , name ) <nl> + <nl> + <nl> + crop_and_resize_deprecation = deprecation . deprecated_args ( <nl> + None , ' box_ind is deprecated , use box_indices instead ' , ' box_ind ' ) <nl> + tf_export ( v1 = [ ' image . crop_and_resize ' ] ) ( <nl> + crop_and_resize_deprecation ( gen_image_ops . crop_and_resize ) ) <nl> mmm a / tensorflow / tools / api / golden / v2 / tensorflow . image . pbtxt <nl> ppp b / tensorflow / tools / api / golden / v2 / tensorflow . image . pbtxt <nl> tf_module { <nl> } <nl> member_method { <nl> name : " crop_and_resize " <nl> - argspec : " args = [ \ ' image \ ' , \ ' boxes \ ' , \ ' box_ind \ ' , \ ' crop_size \ ' , \ ' method \ ' , \ ' extrapolation_value \ ' , \ ' name \ ' ] , varargs = None , keywords = None , defaults = [ \ ' bilinear \ ' , \ ' 0 \ ' , \ ' None \ ' ] , " <nl> + argspec : " args = [ \ ' image \ ' , \ ' boxes \ ' , \ ' box_indices \ ' , \ ' crop_size \ ' , \ ' method \ ' , \ ' extrapolation_value \ ' , \ ' name \ ' ] , varargs = None , keywords = None , defaults = [ \ ' bilinear \ ' , \ ' 0 \ ' , \ ' None \ ' ] , " <nl> } <nl> member_method { <nl> name : " crop_to_bounding_box " <nl> tf_module { <nl> } <nl> member_method { <nl> name : " extract_image_patches " <nl> - argspec : " args = [ \ ' images \ ' , \ ' ksizes \ ' , \ ' strides \ ' , \ ' rates \ ' , \ ' padding \ ' , \ ' name \ ' ] , varargs = None , keywords = None , defaults = [ \ ' None \ ' ] , " <nl> + argspec : " args = [ \ ' images \ ' , \ ' sizes \ ' , \ ' strides \ ' , \ ' rates \ ' , \ ' padding \ ' , \ ' name \ ' ] , varargs = None , keywords = None , defaults = [ \ ' None \ ' ] , " <nl> } <nl> member_method { <nl> name : " extract_jpeg_shape " <nl> mmm a / tensorflow / tools / compatibility / tf_upgrade_v2 . py <nl> ppp b / tensorflow / tools / compatibility / tf_upgrade_v2 . py <nl> def __init__ ( self ) : <nl> # Maps from a function name to a dictionary that describes how to <nl> # map from an old argument keyword to the new argument keyword . <nl> self . function_keyword_renames = { <nl> + " tf . image . crop_and_resize " : { <nl> + " box_ind " : " box_indices " , <nl> + } , <nl> + " tf . image . extract_image_patches " : { <nl> + " ksizes " : " sizes " , <nl> + } , <nl> + " tf . extract_image_patches " : { <nl> + " ksizes " : " sizes " , <nl> + } , <nl> " tf . expand_dims " : { <nl> " dim " : " axis " , <nl> } , <nl>
|
Change signature of tf . image . crop_and_resize and tf . image . extract_image_patches for TF 2 . 0 .
|
tensorflow/tensorflow
|
1c850ad297ff2b3236a440893b1a3b1ebc8a8ca7
|
2018-11-20T18:44:41Z
|
mmm a / include / v8 - profiler . h <nl> ppp b / include / v8 - profiler . h <nl> class V8EXPORT HeapSnapshot { <nl> / * * Returns a node by its id . * / <nl> const HeapGraphNode * GetNodeById ( uint64_t id ) const ; <nl> <nl> + / * * Returns total nodes count in the snapshot . * / <nl> + int GetNodesCount ( ) const ; <nl> + <nl> + / * * Returns a node by index . * / <nl> + const HeapGraphNode * GetNode ( int index ) const ; <nl> + <nl> / * * <nl> * Deletes the snapshot and removes it from HeapProfiler ' s list . <nl> * All pointers to nodes , edges and paths previously returned become <nl> mmm a / src / api . cc <nl> ppp b / src / api . cc <nl> const HeapGraphNode * HeapSnapshot : : GetNodeById ( uint64_t id ) const { <nl> } <nl> <nl> <nl> + int HeapSnapshot : : GetNodesCount ( ) const { <nl> + # ifdef ENABLE_LOGGING_AND_PROFILING <nl> + i : : Isolate * isolate = i : : Isolate : : Current ( ) ; <nl> + IsDeadCheck ( isolate , " v8 : : HeapSnapshot : : GetNodesCount " ) ; <nl> + return ToInternal ( this ) - > entries ( ) - > length ( ) ; <nl> + # else <nl> + return 0 ; <nl> + # endif <nl> + } <nl> + <nl> + <nl> + const HeapGraphNode * HeapSnapshot : : GetNode ( int index ) const { <nl> + # ifdef ENABLE_LOGGING_AND_PROFILING <nl> + i : : Isolate * isolate = i : : Isolate : : Current ( ) ; <nl> + IsDeadCheck ( isolate , " v8 : : HeapSnapshot : : GetNode " ) ; <nl> + return reinterpret_cast < const HeapGraphNode * > ( <nl> + ToInternal ( this ) - > entries ( ) - > at ( index ) ) ; <nl> + # else <nl> + return 0 ; <nl> + # endif <nl> + } <nl> + <nl> + <nl> void HeapSnapshot : : Serialize ( OutputStream * stream , <nl> HeapSnapshot : : SerializationFormat format ) const { <nl> # ifdef ENABLE_LOGGING_AND_PROFILING <nl> mmm a / test / cctest / test - heap - profiler . cc <nl> ppp b / test / cctest / test - heap - profiler . cc <nl> TEST ( DocumentURLWithException ) { <nl> reinterpret_cast < const i : : HeapEntry * > ( global ) ) - > name ( ) ) ; <nl> } <nl> <nl> + <nl> + TEST ( NodesIteration ) { <nl> + v8 : : HandleScope scope ; <nl> + LocalContext env ; <nl> + const v8 : : HeapSnapshot * snapshot = <nl> + v8 : : HeapProfiler : : TakeSnapshot ( v8 : : String : : New ( " iteration " ) ) ; <nl> + const v8 : : HeapGraphNode * global = GetGlobalObject ( snapshot ) ; <nl> + CHECK_NE ( NULL , global ) ; <nl> + / / Verify that we can find this object by iteration . <nl> + const int nodes_count = snapshot - > GetNodesCount ( ) ; <nl> + int count = 0 ; <nl> + for ( int i = 0 ; i < nodes_count ; + + i ) { <nl> + if ( snapshot - > GetNode ( i ) = = global ) <nl> + + + count ; <nl> + } <nl> + CHECK_EQ ( 1 , count ) ; <nl> + } <nl> + <nl> # endif / / ENABLE_LOGGING_AND_PROFILING <nl>
|
Heap profiler : add an ability to iterate over snapshot ' s nodes .
|
v8/v8
|
bf9b2f8c2ce1d7bc9c1ec692fff7bc52c3b55612
|
2011-06-21T08:02:34Z
|
mmm a / x64_dbg_dbg / memory . cpp <nl> ppp b / x64_dbg_dbg / memory . cpp <nl> bool MemGetPageRights ( uint Address , char * Rights ) <nl> <nl> bool MemPageRightsToString ( DWORD Protect , char * Rights ) <nl> { <nl> - memset ( Rights , 0 , RIGHTS_STRING_SIZE ) ; <nl> - <nl> switch ( Protect & 0xFF ) <nl> { <nl> case PAGE_NOACCESS : <nl> bool MemPageRightsToString ( DWORD Protect , char * Rights ) <nl> break ; <nl> } <nl> <nl> - Rights [ 4 ] = ( ( Protect & PAGE_GUARD ) = = PAGE_GUARD ) ? ' G ' : ' - ' ; <nl> + strcpy_s ( Rights + 4 , RIGHTS_STRING_SIZE - 4 , ( ( Protect & PAGE_GUARD ) = = PAGE_GUARD ) ? " G " : " - " ) ; <nl> / / Rights [ 5 ] = ( ( Protect & PAGE_NOCACHE ) = = PAGE_NOCACHE ) ? ' ' : ' - ' ; <nl> / / Rights [ 6 ] = ( ( Protect & PAGE_WRITECOMBINE ) = = PAGE_GUARD ) ? ' ' : ' - ' ; <nl> <nl>
|
Merge pull request from mrgreywater / fix - debug - string - termination
|
x64dbg/x64dbg
|
32dc0b73df5d7413166b4dbfb877e9feea859a27
|
2015-09-21T14:36:52Z
|
mmm a / include / internal / catch_capture . hpp <nl> ppp b / include / internal / catch_capture . hpp <nl> <nl> do { \ <nl> Catch : : ResultBuilder __catchResult ( macroName , CATCH_INTERNAL_LINEINFO , # expr , resultDisposition ) ; \ <nl> try { \ <nl> - ( __catchResult < = ( expr ) ) . endExpression ( ) ; \ <nl> + ( __catchResult < = expr ) . endExpression ( ) ; \ <nl> } \ <nl> catch ( . . . ) { \ <nl> __catchResult . useActiveException ( Catch : : ResultDisposition : : Normal ) ; \ <nl>
|
Revert " Fix parentheses warning on expression evaluation when using ccache "
|
catchorg/Catch2
|
15317632f3caf59a3ba3da2ec3dc3ee189bbbc9a
|
2015-09-27T01:06:53Z
|
mmm a / tools / shared . py <nl> ppp b / tools / shared . py <nl> def apply_opt_level ( self , opt_level , noisy = False ) : <nl> Settings . CORRECT_SIGNS = 0 <nl> Settings . CORRECT_OVERFLOWS = 0 <nl> Settings . CORRECT_ROUNDINGS = 0 <nl> - Settings . I64_MODE = 0 <nl> Settings . DOUBLE_MODE = 0 <nl> if noisy : print > > sys . stderr , ' Warning : Applying some potentially unsafe optimizations ! ( Use - O2 if this fails . ) ' <nl> <nl>
|
keep i64 mode 1 in - O3 , it is no longer slow , in fact it is faster now
|
emscripten-core/emscripten
|
bab81550d5c096a9ef6b1a7648c89b4731327665
|
2012-02-11T22:54:58Z
|
mmm a / src / policy / policy . h <nl> ppp b / src / policy / policy . h <nl> static constexpr unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VE <nl> SCRIPT_VERIFY_LOW_S | <nl> SCRIPT_VERIFY_WITNESS | <nl> SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM | <nl> - SCRIPT_VERIFY_WITNESS_PUBKEYTYPE ; <nl> + SCRIPT_VERIFY_WITNESS_PUBKEYTYPE | <nl> + SCRIPT_VERIFY_CONST_SCRIPTCODE ; <nl> <nl> / * * For convenience , standard but not mandatory verify flags . * / <nl> static constexpr unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCRIPT_VERIFY_FLAGS & ~ MANDATORY_SCRIPT_VERIFY_FLAGS ; <nl> mmm a / src / script / interpreter . cpp <nl> ppp b / src / script / interpreter . cpp <nl> bool EvalScript ( std : : vector < std : : vector < unsigned char > > & stack , const CScript & <nl> opcode = = OP_RSHIFT ) <nl> return set_error ( serror , SCRIPT_ERR_DISABLED_OPCODE ) ; / / Disabled opcodes . <nl> <nl> + / / With SCRIPT_VERIFY_CONST_SCRIPTCODE , OP_CODESEPARATOR in non - segwit script is rejected even in an unexecuted branch <nl> + if ( opcode = = OP_CODESEPARATOR & & sigversion = = SigVersion : : BASE & & ( flags & SCRIPT_VERIFY_CONST_SCRIPTCODE ) ) <nl> + return set_error ( serror , SCRIPT_ERR_OP_CODESEPARATOR ) ; <nl> + <nl> if ( fExec & & 0 < = opcode & & opcode < = OP_PUSHDATA4 ) { <nl> if ( fRequireMinimal & & ! CheckMinimalPush ( vchPushValue , opcode ) ) { <nl> return set_error ( serror , SCRIPT_ERR_MINIMALDATA ) ; <nl> bool EvalScript ( std : : vector < std : : vector < unsigned char > > & stack , const CScript & <nl> <nl> case OP_CODESEPARATOR : <nl> { <nl> + / / If SCRIPT_VERIFY_CONST_SCRIPTCODE flag is set , use of OP_CODESEPARATOR is rejected in pre - segwit <nl> + / / script , even in an unexecuted branch ( this is checked above the opcode case statement ) . <nl> + <nl> / / Hash starts after the code separator <nl> pbegincodehash = pc ; <nl> } <nl> bool EvalScript ( std : : vector < std : : vector < unsigned char > > & stack , const CScript & <nl> <nl> / / Drop the signature in pre - segwit scripts but not segwit scripts <nl> if ( sigversion = = SigVersion : : BASE ) { <nl> - FindAndDelete ( scriptCode , CScript ( vchSig ) ) ; <nl> + int found = FindAndDelete ( scriptCode , CScript ( vchSig ) ) ; <nl> + if ( found > 0 & & ( flags & SCRIPT_VERIFY_CONST_SCRIPTCODE ) ) <nl> + return set_error ( serror , SCRIPT_ERR_SIG_FINDANDDELETE ) ; <nl> } <nl> <nl> if ( ! CheckSignatureEncoding ( vchSig , flags , serror ) | | ! CheckPubKeyEncoding ( vchPubKey , flags , sigversion , serror ) ) { <nl> bool EvalScript ( std : : vector < std : : vector < unsigned char > > & stack , const CScript & <nl> { <nl> valtype & vchSig = stacktop ( - isig - k ) ; <nl> if ( sigversion = = SigVersion : : BASE ) { <nl> - FindAndDelete ( scriptCode , CScript ( vchSig ) ) ; <nl> + int found = FindAndDelete ( scriptCode , CScript ( vchSig ) ) ; <nl> + if ( found > 0 & & ( flags & SCRIPT_VERIFY_CONST_SCRIPTCODE ) ) <nl> + return set_error ( serror , SCRIPT_ERR_SIG_FINDANDDELETE ) ; <nl> } <nl> } <nl> <nl> mmm a / src / script / interpreter . h <nl> ppp b / src / script / interpreter . h <nl> enum <nl> / / Public keys in segregated witness scripts must be compressed <nl> / / <nl> SCRIPT_VERIFY_WITNESS_PUBKEYTYPE = ( 1U < < 15 ) , <nl> + <nl> + / / Making OP_CODESEPARATOR and FindAndDelete fail any non - segwit scripts <nl> + / / <nl> + SCRIPT_VERIFY_CONST_SCRIPTCODE = ( 1U < < 16 ) , <nl> } ; <nl> <nl> bool CheckSignatureEncoding ( const std : : vector < unsigned char > & vchSig , unsigned int flags , ScriptError * serror ) ; <nl> mmm a / src / script / script_error . cpp <nl> ppp b / src / script / script_error . cpp <nl> const char * ScriptErrorString ( const ScriptError serror ) <nl> return " Witness provided for non - witness script " ; <nl> case SCRIPT_ERR_WITNESS_PUBKEYTYPE : <nl> return " Using non - compressed keys in segwit " ; <nl> + case SCRIPT_ERR_OP_CODESEPARATOR : <nl> + return " Using OP_CODESEPARATOR in non - witness script " ; <nl> + case SCRIPT_ERR_SIG_FINDANDDELETE : <nl> + return " Signature is found in scriptCode " ; <nl> case SCRIPT_ERR_UNKNOWN_ERROR : <nl> case SCRIPT_ERR_ERROR_COUNT : <nl> default : break ; <nl> mmm a / src / script / script_error . h <nl> ppp b / src / script / script_error . h <nl> typedef enum ScriptError_t <nl> SCRIPT_ERR_WITNESS_UNEXPECTED , <nl> SCRIPT_ERR_WITNESS_PUBKEYTYPE , <nl> <nl> + / * Constant scriptCode * / <nl> + SCRIPT_ERR_OP_CODESEPARATOR , <nl> + SCRIPT_ERR_SIG_FINDANDDELETE , <nl> + <nl> SCRIPT_ERR_ERROR_COUNT <nl> } ScriptError ; <nl> <nl> mmm a / src / test / script_tests . cpp <nl> ppp b / src / test / script_tests . cpp <nl> static ScriptErrorDesc script_errors [ ] = { <nl> { SCRIPT_ERR_WITNESS_MALLEATED_P2SH , " WITNESS_MALLEATED_P2SH " } , <nl> { SCRIPT_ERR_WITNESS_UNEXPECTED , " WITNESS_UNEXPECTED " } , <nl> { SCRIPT_ERR_WITNESS_PUBKEYTYPE , " WITNESS_PUBKEYTYPE " } , <nl> + { SCRIPT_ERR_OP_CODESEPARATOR , " OP_CODESEPARATOR " } , <nl> + { SCRIPT_ERR_SIG_FINDANDDELETE , " SIG_FINDANDDELETE " } , <nl> } ; <nl> <nl> const char * FormatScriptError ( ScriptError_t err ) <nl>
|
Add constant scriptCode policy in non - segwit scripts
|
bitcoin/bitcoin
|
9dabfe49c066301ef75bcfcb089fd308366127c4
|
2018-05-04T20:26:12Z
|
mmm a / ports / coolprop / CONTROL <nl> ppp b / ports / coolprop / CONTROL <nl> <nl> Source : coolprop <nl> - Version : 6 . 1 . 0 - 3 <nl> + Version : 6 . 1 . 0 - 4 <nl> Description : Thermophysical properties for the masses <nl> Build - Depends : catch , eigen3 , pybind11 , if97 , fmt , rapidjson , msgpack , refprop - headers <nl> new file mode 100644 <nl> index 00000000000 . . bf2d11deb57 <nl> mmm / dev / null <nl> ppp b / ports / coolprop / fmt - fix . patch <nl> <nl> + diff - - git a / include / CPstrings . h b / include / CPstrings . h <nl> + index 2e5a5af . . 87f6b7c 100644 <nl> + mmm a / include / CPstrings . h <nl> ppp + b / include / CPstrings . h <nl> + <nl> + # include < iterator > <nl> + # include < algorithm > <nl> + # include < functional > <nl> + + # include < vector > <nl> + + # include < string > <nl> + <nl> + # if ! defined ( NO_CPPFORMAT ) <nl> + # ifndef FMT_HEADER_ONLY <nl> + <nl> + # include " fmt / format . h " / / For addition of the string formatting functions and macros from cppformat <nl> + # include " fmt / printf . h " / / For sprintf <nl> + # undef FMT_HEADER_ONLY <nl> + - # else <nl> + - # include < vector > <nl> + - # include < string > <nl> + # endif <nl> + <nl> + # include " Exceptions . h " <nl> + <nl> + / / Missing string formatting function , this old guy is needed for ancient gcc compilers on PowerPC for VxWorks <nl> + inline std : : string format ( const char * fmt , . . . ) ; <nl> + # else <nl> + - / / Missing std : : string formatting function - provided by the cppformat library <nl> + - inline std : : string format ( const char * format , fmt : : ArgList args ) { <nl> + - return fmt : : sprintf ( format , args ) ; <nl> + + template < class . . . Args > <nl> + + std : : string format ( const Args & . . . args ) <nl> + + { <nl> + + return fmt : : sprintf ( args . . . ) ; <nl> + } <nl> + - FMT_VARIADIC ( std : : string , format , const char * ) <nl> + # endif <nl> + <nl> + / / Missing string split - like in Python <nl> mmm a / ports / coolprop / portfile . cmake <nl> ppp b / ports / coolprop / portfile . cmake <nl> vcpkg_from_github ( <nl> REF 0e934e842e9ce83eea64fda1d4ab8e59adf9d8cd <nl> SHA512 a44eafc84f2b88259d7bcf6cfa81daeb81ea9d55bd356e59b3ef77b6f68ea405961c7cb54ba899e3896bb2a02d3e01119a4a51f72899126c8da6081fa2ece948 <nl> HEAD_REF master <nl> + PATCHES <nl> + $ { CMAKE_CURRENT_LIST_DIR } / fmt - fix . patch <nl> ) <nl> <nl> vcpkg_find_acquire_program ( PYTHON2 ) <nl> set ( ENV { PATH } " $ ENV { PATH } ; $ { PYTHON2_DIR } " ) <nl> file ( REMOVE_RECURSE $ { SOURCE_PATH } / externals ) <nl> <nl> # Patch up the file locations <nl> - file ( COPY <nl> - $ { CURRENT_INSTALLED_DIR } / include / catch . hpp <nl> + file ( COPY <nl> + $ { CURRENT_INSTALLED_DIR } / include / catch . hpp <nl> DESTINATION $ { SOURCE_PATH } / externals / Catch / single_include <nl> ) <nl> <nl> file ( COPY <nl> DESTINATION $ { SOURCE_PATH } / externals / Eigen / unsupported <nl> ) <nl> <nl> - file ( COPY <nl> + file ( COPY <nl> $ { CURRENT_INSTALLED_DIR } / include / rapidjson <nl> DESTINATION $ { SOURCE_PATH } / externals / rapidjson / include <nl> ) <nl> <nl> - file ( COPY <nl> + file ( COPY <nl> $ { CURRENT_INSTALLED_DIR } / include / IF97 . h <nl> DESTINATION $ { SOURCE_PATH } / externals / IF97 <nl> ) <nl> mmm a / ports / fmt / CONTROL <nl> ppp b / ports / fmt / CONTROL <nl> <nl> Source : fmt <nl> - Version : 4 . 1 . 0 <nl> + Version : 5 . 0 . 0 <nl> Description : Formatting library for C + + . It can be used as a safe alternative to printf or as a fast alternative to IOStreams . <nl> mmm a / ports / fmt / portfile . cmake <nl> ppp b / ports / fmt / portfile . cmake <nl> include ( vcpkg_common_functions ) <nl> vcpkg_from_github ( <nl> OUT_SOURCE_PATH SOURCE_PATH <nl> REPO fmtlib / fmt <nl> - REF 4 . 1 . 0 <nl> - SHA512 8daaa4a61bfe63345a12df0a9bca0b1cd6a162d0f4e97d2d2978ae19a1a1357ec4d4cce948ce726cdbe9403e51ad995950a2a99de28f9b9085c02ce845540b22 <nl> + REF 5 . 0 . 0 <nl> + SHA512 1ce93648ab7aca6082767ff009d5836e226fa42f183852ca15230f371ef0a34878110ca63d8669a68de7f115c137fdaa11de998986a9440f08d50f0f214ebb90 <nl> HEAD_REF master <nl> ) <nl> <nl> if ( VCPKG_LIBRARY_LINKAGE STREQUAL dynamic ) <nl> file ( MAKE_DIRECTORY $ { CURRENT_PACKAGES_DIR } / bin ) <nl> file ( MAKE_DIRECTORY $ { CURRENT_PACKAGES_DIR } / debug / bin ) <nl> file ( RENAME $ { CURRENT_PACKAGES_DIR } / lib / fmt . dll $ { CURRENT_PACKAGES_DIR } / bin / fmt . dll ) <nl> - file ( RENAME $ { CURRENT_PACKAGES_DIR } / debug / lib / fmt . dll $ { CURRENT_PACKAGES_DIR } / debug / bin / fmt . dll ) <nl> + file ( RENAME $ { CURRENT_PACKAGES_DIR } / debug / lib / fmtd . dll $ { CURRENT_PACKAGES_DIR } / debug / bin / fmtd . dll ) <nl> <nl> # Force FMT_SHARED to 1 <nl> - file ( READ $ { CURRENT_PACKAGES_DIR } / include / fmt / format . h FMT_FORMAT_H ) <nl> - string ( REPLACE " defined ( FMT_SHARED ) " " 1 " FMT_FORMAT_H " $ { FMT_FORMAT_H } " ) <nl> - file ( WRITE $ { CURRENT_PACKAGES_DIR } / include / fmt / format . h " $ { FMT_FORMAT_H } " ) <nl> + file ( READ $ { CURRENT_PACKAGES_DIR } / include / fmt / core . h FMT_CORE_H ) <nl> + string ( REPLACE " defined ( FMT_SHARED ) " " 1 " FMT_CORE_H " $ { FMT_CORE_H } " ) <nl> + file ( WRITE $ { CURRENT_PACKAGES_DIR } / include / fmt / core . h " $ { FMT_CORE_H } " ) <nl> endif ( ) <nl> file ( REMOVE_RECURSE $ { CURRENT_PACKAGES_DIR } / debug / include ) <nl> <nl> vcpkg_fixup_cmake_targets ( ) <nl> <nl> file ( READ $ { CURRENT_PACKAGES_DIR } / share / fmt / fmt - targets - debug . cmake FMT_DEBUG_MODULE ) <nl> - string ( REPLACE " lib / fmt . dll " " bin / fmt . dll " FMT_DEBUG_MODULE $ { FMT_DEBUG_MODULE } ) <nl> + string ( REPLACE " lib / fmtd . dll " " bin / fmtd . dll " FMT_DEBUG_MODULE $ { FMT_DEBUG_MODULE } ) <nl> file ( WRITE $ { CURRENT_PACKAGES_DIR } / share / fmt / fmt - targets - debug . cmake " $ { FMT_DEBUG_MODULE } " ) <nl> file ( READ $ { CURRENT_PACKAGES_DIR } / share / fmt / fmt - targets - release . cmake FMT_RELEASE_MODULE ) <nl> string ( REPLACE " lib / fmt . dll " " bin / fmt . dll " FMT_RELEASE_MODULE $ { FMT_RELEASE_MODULE } ) <nl>
|
Merge pull request from SuperWig / fmt - update
|
microsoft/vcpkg
|
a3c14ae9203f870ab0ec353220db8a9aba4a707e
|
2018-05-29T21:22:39Z
|
mmm a / aten / src / ATen / Declarations . cwrap <nl> ppp b / aten / src / ATen / Declarations . cwrap <nl> <nl> cpu_half : True <nl> arguments : <nl> - THTensor * self <nl> - - arg : THSize * size <nl> + - arg : IntListSize size <nl> long_args : True <nl> - - CONSTANT NULL <nl> + - CONSTANT { } <nl> ] ] <nl> [ [ <nl> name : set_ <nl> <nl> scalar_check : False <nl> arguments : <nl> - THTensor * self <nl> - - CONSTANT NULL , 0 , THLongStorageView ( { 0 } , THLongStorageViewKind : : SIZE ) , NULL <nl> + - CONSTANT NULL , 0 , { 0 } , { } <nl> - cname : setStorage <nl> scalar_check : False <nl> arguments : <nl> - THTensor * self <nl> - THStorage * source <nl> - CONSTANT 0 <nl> - - CONSTANT __storage_size . get ( ) <nl> - - CONSTANT NULL <nl> + - CONSTANT { static_cast < int64_t > ( source . pImpl ( ) - > size ( ) ) } <nl> + - CONSTANT { } <nl> - cname : setStorage <nl> arguments : <nl> - THTensor * self <nl> - THStorage * source <nl> - long storage_offset <nl> - - THSize * size <nl> - - arg : THStride * stride <nl> - default : NULL <nl> + - IntListSize size <nl> + - arg : IntListStride stride <nl> + default : { } <nl> ] ] <nl> [ [ <nl> name : _fill_ <nl> <nl> return : THTensor * <nl> arguments : <nl> - THTensor * self <nl> - - arg : THSize * size <nl> + - arg : IntListSize size <nl> long_args : True <nl> ] ] <nl> [ [ <nl> <nl> arguments : [ ] <nl> - cname : newWithSize <nl> arguments : <nl> - - THSize * size <nl> - - CONSTANT NULL <nl> + - IntListSize size <nl> + - CONSTANT { } <nl> ] ] <nl> [ [ <nl> name : tensor <nl> <nl> options : <nl> - cname : newWithSize <nl> arguments : <nl> - - THSize * size <nl> - - arg : THStride * stride <nl> + - IntListSize size <nl> + - arg : IntListStride stride <nl> - cname : newWithStorage <nl> arguments : <nl> - THStorage * storage <nl> - int64_t storageOffset <nl> - - THSize * size <nl> - - arg : THStride * stride <nl> - default : NULL <nl> + - IntListSize size <nl> + - arg : IntListStride stride <nl> + default : { } <nl> ] ] <nl> <nl> # In theory , this could be a part of the above declaration . But in <nl> new file mode 100644 <nl> index 000000000000 . . 6bf538288f47 <nl> mmm / dev / null <nl> ppp b / aten / src / ATen / InferSize . h <nl> <nl> + # pragma once <nl> + <nl> + # include < ATen / optional . h > <nl> + # include < ATen / ScalarType . h > <nl> + # include < sstream > <nl> + # include < vector > <nl> + <nl> + namespace at { <nl> + <nl> + / / Infers the size of a dim with size - 1 , if it exists . Also checks that new <nl> + / / shape is compatible with the number of elements . <nl> + static std : : vector < int64_t > infer_size ( IntList shape , int64_t numel ) { <nl> + auto res = shape . vec ( ) ; <nl> + int64_t newsize = 1 ; <nl> + auto infer_dim = at : : optional < int64_t > ( ) ; <nl> + for ( int64_t dim = 0 , ndim = shape . size ( ) ; dim ! = ndim ; dim + + ) { <nl> + if ( shape [ dim ] = = - 1 ) { <nl> + if ( infer_dim ) { <nl> + throw std : : runtime_error ( " only one dimension can be inferred " ) ; <nl> + } <nl> + infer_dim = dim ; <nl> + } else if ( shape [ dim ] > = 0 ) { <nl> + newsize * = shape [ dim ] ; <nl> + } else { <nl> + AT_ERROR ( " invalid shape dimension " , shape [ dim ] ) ; <nl> + } <nl> + } <nl> + <nl> + if ( numel = = newsize | | ( infer_dim & & newsize > 0 & & numel % newsize = = 0 ) ) { <nl> + if ( infer_dim ) { <nl> + / / we have a degree of freedom here to select the dimension size ; follow NumPy semantics <nl> + / / and just bail . <nl> + AT_CHECK ( newsize ! = 0 , " cannot reshape tensor of 0 elements into shape " , shape ) ; <nl> + res [ * infer_dim ] = numel / newsize ; <nl> + } <nl> + return res ; <nl> + } <nl> + <nl> + std : : ostringstream ss ; <nl> + ss < < " shape ' " < < shape < < " ' is invalid for input of size " < < numel ; <nl> + throw std : : runtime_error ( ss . str ( ) ) ; <nl> + } <nl> + <nl> + } <nl> deleted file mode 100644 <nl> index 3d506788e478 . . 000000000000 <nl> mmm a / aten / src / ATen / THLongStorageView . h <nl> ppp / dev / null <nl> <nl> - # pragma once <nl> - <nl> - # include < ATen / StorageImpl . h > <nl> - # include " TH / TH . h " <nl> - # include " TH / THStorageFunctions . hpp " <nl> - # include " TH / THTypeConversion . hpp " <nl> - <nl> - namespace at { <nl> - <nl> - enum class THLongStorageViewKind { <nl> - SIZE , <nl> - STRIDE , <nl> - LENGTH , <nl> - } ; <nl> - <nl> - / / make a fake storage out of a size , pointer pair . . . <nl> - / / used as an argument where THSize and THStride are passed into TH <nl> - class THLongStorageView { <nl> - public : <nl> - operator StorageImpl * ( ) { <nl> - if ( storage . pImpl ( ) - > size ( ) = = 0 & & zero_dim_to_null ) { <nl> - return nullptr ; <nl> - } <nl> - return storage . pImpl ( ) ; <nl> - } <nl> - <nl> - / * <nl> - / / This is done as an enum , and not as static constructors , as there <nl> - / / is no move / copy constructor for THLongStorageView <nl> - <nl> - static THLongStorageView makeFromSize ( ArrayRef < int64_t > ref ) { <nl> - . . . <nl> - } <nl> - <nl> - static THLongStorageView makeFromLength ( ArrayRef < int64_t > ref ) { <nl> - . . . <nl> - } <nl> - * / <nl> - <nl> - THLongStorageView ( ArrayRef < int64_t > ref , THLongStorageViewKind kind ) <nl> - : storage ( nullptr ) , zero_dim_to_null ( false ) { <nl> - / / zero_dim_to_one converts an empty ArrayRef into [ 1 ] <nl> - / / zero_dim_to_null converts an empty ArrayRef into a null THLongStorage <nl> - bool zero_dim_to_one = false ; <nl> - switch ( kind ) { <nl> - case THLongStorageViewKind : : SIZE : <nl> - zero_dim_to_one = true ; <nl> - break ; <nl> - case THLongStorageViewKind : : STRIDE : <nl> - zero_dim_to_null = true ; <nl> - break ; <nl> - case THLongStorageViewKind : : LENGTH : <nl> - break ; <nl> - } <nl> - <nl> - if ( zero_dim_to_one & & ref . size ( ) = = 0 ) { <nl> - / / make storage of size 0 actually a 1 - length storage with 1 element <nl> - / / so that our 0 - dim tensors get allocated as 1 - dim inside TH <nl> - <nl> - one = 1 ; <nl> - storage . set_pImpl ( new StorageImpl ( <nl> - at : : CTypeToScalarType < th : : from_type < int64_t > > : : to ( ) , <nl> - 1 , <nl> - { & one , kCPU } , / / non - owning <nl> - nullptr , <nl> - false ) ) ; <nl> - } else { <nl> - storage . set_pImpl ( new StorageImpl ( <nl> - at : : CTypeToScalarType < th : : from_type < int64_t > > : : to ( ) , <nl> - ref . size ( ) , <nl> - { const_cast < void * > ( static_cast < const void * > ( ref . data ( ) ) ) , <nl> - kCPU } , / / non - owning <nl> - nullptr , <nl> - false ) ) ; <nl> - } <nl> - } <nl> - private : <nl> - int64_t one ; <nl> - / / NB : The lifetime of objects like one are tied to the lifetime of an <nl> - / / instance of this class . That means if storage is used after an instance of <nl> - / / this class dies , it ' ll be corrupted . <nl> - Storage storage ; <nl> - bool zero_dim_to_null ; <nl> - } ; <nl> - <nl> - } <nl> new file mode 100644 <nl> index 000000000000 . . bbcdd7773547 <nl> mmm / dev / null <nl> ppp b / aten / src / ATen / THSizeStrideCompat . h <nl> <nl> + # pragma once <nl> + <nl> + # include < ATen / ScalarType . h > <nl> + # include < vector > <nl> + <nl> + / / NOTE : these functions are for compatibility into TH functions that takes sizes and strides . <nl> + / / We should just write the TH functions that don ' t require this , but that involves two steps : <nl> + / / 1 ) first class scalar support ( for sizes ) <nl> + / / 2 ) differentiating between nullptr / non - nullptr strides ( the former " infers " strides ) . <nl> + <nl> + namespace at { <nl> + <nl> + static inline at : : IntList get_intlist_size_th ( IntList sizes ) { <nl> + static int64_t one = 1 ; <nl> + if ( sizes . size ( ) = = 0 ) { <nl> + / / fake scalar <nl> + return IntList ( & one , 1 ) ; <nl> + } else { <nl> + return sizes ; <nl> + } <nl> + } <nl> + <nl> + static inline IntList get_intlist_stride_th ( IntList strides ) { <nl> + if ( strides . size ( ) = = 0 ) { <nl> + / / differentiating between nullptr / non - nullptr strides ( the former " infers " strides ) <nl> + return IntList ( ) ; <nl> + } else { <nl> + return strides ; <nl> + } <nl> + } <nl> + <nl> + } <nl> mmm a / aten / src / ATen / function_wrapper . py <nl> ppp b / aten / src / ATen / function_wrapper . py <nl> def __init__ ( self , reason ) : <nl> ' THDenseIndexTensor * ' : ' Tensor & ' , <nl> ' THStorage * ' : ' Storage & ' , <nl> ' THGenerator * ' : ' Generator * ' , <nl> - ' THSize * ' : ' IntList ' , <nl> - ' THStride * ' : ' IntList ' , <nl> + ' IntListSize ' : ' IntList ' , <nl> + ' IntListStride ' : ' IntList ' , <nl> ' accreal ' : ' Scalar ' , <nl> ' real ' : ' Scalar ' , <nl> ' long ' : ' int64_t ' , <nl> def __init__ ( self , reason ) : <nl> ' THDenseIndexTensor * ' : ' IndexTensor ' , <nl> ' THStorage * ' : ' Storage ' , <nl> ' THGenerator * ' : ' Generator * ' , <nl> - ' THSize * ' : ' IntList ' , <nl> - ' THStride * ' : ' IntList ' , <nl> + ' IntListSize ' : ' IntList ' , <nl> + ' IntListStride ' : ' IntList ' , <nl> ' accreal ' : ' accreal ' , <nl> ' real ' : ' real ' , <nl> ' long ' : ' int64_t ' , <nl> def __init__ ( self , reason ) : <nl> CodeTemplate ( <nl> ' check_generator < $ { Backend } Generator > ( $ { arg_name } , & globalContext ( ) . defaultGenerator ( backend ( ) ) ) ' ) , <nl> # This is a cast done via direct - construction <nl> - ' THSize * ' : CodeTemplate ( ' THLongStorageView $ { result_name } ( $ { arg_name } , THLongStorageViewKind : : SIZE ) ; ' ) , <nl> - # This is a cast done via direct - construction <nl> - ' THStride * ' : CodeTemplate ( ' THLongStorageView $ { result_name } ( $ { arg_name } , THLongStorageViewKind : : STRIDE ) ; ' ) , <nl> + ' IntListSize ' : CodeTemplate ( ' at : : IntList $ { result_name } = get_intlist_size_th ( $ { arg_name } ) ; ' ) , <nl> + ' IntListStride ' : CodeTemplate ( ' at : : IntList $ { result_name } = get_intlist_stride_th ( $ { arg_name } ) ; ' ) , <nl> ' real ' : CodeTemplate ( ' $ { arg_name } . to $ { ScalarName } ( ) ' ) , <nl> ' accreal ' : CodeTemplate ( ' $ { arg_name } . to $ { AccScalarName } ( ) ' ) , <nl> ' TensorList ' : CodeTemplate ( <nl> def __init__ ( self , reason ) : <nl> ' IntList ' : CodeTemplate ( ' check_intlist < $ { size } > ( $ { arg_name } , " $ { arg_name } " , $ { arg_pos } $ { , default_init } ) ' ) <nl> } <nl> <nl> - DIRECT_CONSTRUCTION_CHECKED_CAST = { ' THSize * ' , ' THStride * ' } <nl> + DIRECT_CONSTRUCTION_CHECKED_CAST = { ' IntListSize ' , ' IntListStride ' } <nl> <nl> CHECKED_USE = { <nl> ' THTensor * ' : ' { } _ - > tensor ' , <nl> def __init__ ( self , reason ) : <nl> # Replacements for constants when calling into TH <nl> CONSTANT_REPLACEMENTS = [ <nl> ( ' AS_REAL ' , ' $ { AS_REAL } ' ) , <nl> - ( ' __storage_size . get \ \ ( \ \ ) ' , <nl> - ' THLongStorageView ( static_cast < int64_t > ( source . pImpl ( ) - > size ( ) ) , THLongStorageViewKind : : LENGTH ) ' ) , <nl> ( ' __last_dim ' , ' self . ndimension ( ) - 1 ' ) , <nl> ] <nl> <nl> def emit_body ( env , option ) : <nl> output_count = 0 <nl> <nl> # scalar_check is the heuristic conditions when a result may be a scalar_check <nl> - # if there is a THSize * argument , then its dimensions are used to determine scalar . <nl> + # if there is a IntListSize argument , then its dimensions are used to determine scalar . <nl> # otherwise , it is true if all the input tensors are scalars , <nl> scalar_check_is_from_size = False <nl> scalar_check_is_from_option = False <nl> def emit_body ( env , option ) : <nl> for arg in option [ ' arguments ' ] : <nl> if is_real_argument_to_wrapper ( arg ) : <nl> count + = 1 <nl> - if arg [ ' type ' ] = = ' THSize * ' and not scalar_check_is_from_option : <nl> + if arg [ ' type ' ] = = ' IntListSize ' and not scalar_check_is_from_option : <nl> scalar_check_is_from_size = True <nl> scalar_check = ' { } . size ( ) = = 0 ' . format ( arg [ ' name ' ] ) <nl> if arg [ ' type ' ] = = ' TensorList ' : <nl> mmm a / aten / src / ATen / native / TensorShape . cpp <nl> ppp b / aten / src / ATen / native / TensorShape . cpp <nl> <nl> # include < TH / THTensor . hpp > <nl> # include " ATen / ATen . h " <nl> # include " ATen / ExpandUtils . h " <nl> + # include " ATen / InferSize . h " <nl> # include " ATen / NativeFunctions . h " <nl> # include " ATen / WrapDimUtils . h " <nl> # include " ATen / core / Error . h " <nl> Tensor repeat ( const Tensor & self , IntList repeats ) { <nl> return result ; <nl> } <nl> <nl> - / / Infers the size of a dim with size - 1 , if it exists . Also checks that new <nl> - / / shape is compatible with the number of elements . <nl> - static std : : vector < int64_t > infer_size ( IntList shape , int64_t numel ) { <nl> - auto res = shape . vec ( ) ; <nl> - int64_t newsize = 1 ; <nl> - auto infer_dim = at : : optional < int64_t > ( ) ; <nl> - for ( int64_t dim = 0 , ndim = shape . size ( ) ; dim ! = ndim ; dim + + ) { <nl> - if ( shape [ dim ] = = - 1 ) { <nl> - if ( infer_dim ) { <nl> - throw std : : runtime_error ( " only one dimension can be inferred " ) ; <nl> - } <nl> - infer_dim = dim ; <nl> - } else if ( shape [ dim ] > = 0 ) { <nl> - newsize * = shape [ dim ] ; <nl> - } else { <nl> - AT_ERROR ( " invalid shape dimension " , shape [ dim ] ) ; <nl> - } <nl> - } <nl> - <nl> - if ( numel = = newsize | | ( infer_dim & & newsize > 0 & & numel % newsize = = 0 ) ) { <nl> - if ( infer_dim ) { <nl> - / / we have a degree of freedom here to select the dimension size ; follow NumPy semantics <nl> - / / and just bail . <nl> - AT_CHECK ( newsize ! = 0 , " cannot reshape tensor of 0 elements into shape " , shape ) ; <nl> - res [ * infer_dim ] = numel / newsize ; <nl> - } <nl> - return res ; <nl> - } <nl> - <nl> - std : : ostringstream ss ; <nl> - ss < < " shape ' " < < shape < < " ' is invalid for input of size " < < numel ; <nl> - throw std : : runtime_error ( ss . str ( ) ) ; <nl> - } <nl> - <nl> Tensor reshape ( const Tensor & self , IntList proposed_shape ) { <nl> if ( self . type ( ) . is_sparse ( ) ) { <nl> AT_ERROR ( " reshape is not implemented for sparse tensors " ) ; <nl> mmm a / aten / src / ATen / templates / SparseTypeDerived . cpp <nl> ppp b / aten / src / ATen / templates / SparseTypeDerived . cpp <nl> <nl> # include " ATen / Allocator . h " <nl> # include " ATen / DeviceGuard . h " <nl> # include " ATen / NativeFunctions . h " <nl> - # include " ATen / THLongStorageView . h " <nl> + # include " ATen / THSizeStrideCompat . h " <nl> # include " ATen / UndefinedTensor . h " <nl> # include " ATen / Utils . h " <nl> # include " ATen / WrapDimUtils . h " <nl> mmm a / aten / src / ATen / templates / TypeDerived . cpp <nl> ppp b / aten / src / ATen / templates / TypeDerived . cpp <nl> <nl> # include " ATen / Allocator . h " <nl> # include " ATen / DeviceGuard . h " <nl> # include " ATen / NativeFunctions . h " <nl> - # include " ATen / THLongStorageView . h " <nl> + # include " ATen / THSizeStrideCompat . h " <nl> # include " ATen / UndefinedTensor . h " <nl> # include " ATen / Utils . h " <nl> # include " ATen / WrapDimUtils . h " <nl> mmm a / aten / src / TH / CMakeLists . txt <nl> ppp b / aten / src / TH / CMakeLists . txt <nl> INSTALL ( FILES <nl> generic / THStorageCopy . h <nl> generic / THTensor . cpp <nl> generic / THTensor . h <nl> + generic / THTensor . hpp <nl> generic / THTensorConv . cpp <nl> generic / THTensorConv . h <nl> generic / THTensorCopy . cpp <nl> mmm a / aten / src / TH / THStorageFunctions . cpp <nl> ppp b / aten / src / TH / THStorageFunctions . cpp <nl> <nl> # include " generic / THStorageCopy . cpp " <nl> # include " THGenerateHalfType . h " <nl> <nl> + THStorage * THStorage_new ( at : : ScalarType scalar_type ) { <nl> + THStorage * storage = new THStorage ( <nl> + scalar_type , <nl> + 0 , <nl> + getTHDefaultAllocator ( ) , <nl> + true ) ; <nl> + return storage ; <nl> + } <nl> + <nl> / / Free a non - weak pointer to THStorage <nl> void THStorage_free ( THStorage * storage ) { <nl> if ( ! storage ) { <nl> THStorage * THStorage_weakLock ( THStorage * weak_storage ) { <nl> return nullptr ; <nl> } <nl> <nl> - THDescBuff THLongStorage_sizeDesc ( const THLongStorage * size ) { <nl> - return _THSizeDesc ( THLongStorage_data ( size ) , size - > size ( ) ) ; <nl> - } <nl> - <nl> - THLongStorage * THLongStorage_newInferSize ( THLongStorage * size , ptrdiff_t nElement ) <nl> - { <nl> - ptrdiff_t total_size = ( size - > size ( ) > 0 ? 1 : 0 ) ; <nl> - ptrdiff_t dim_infer = - 1 ; <nl> - ptrdiff_t i ; <nl> - for ( i = 0 ; i < size - > size ( ) ; i + + ) { <nl> - if ( THLongStorage_data ( size ) [ i ] = = - 1 ) { <nl> - THArgCheck ( dim_infer = = - 1 , 1 , " only one dimension can be inferred " ) ; <nl> - dim_infer = i ; <nl> - } else { <nl> - total_size * = THLongStorage_data ( size ) [ i ] ; <nl> - } <nl> - } <nl> - if ( dim_infer ! = - 1 ) { <nl> - THDescBuff buf = THLongStorage_sizeDesc ( size ) ; <nl> - THArgCheck ( total_size > 0 & & nElement % total_size = = 0 , 2 , <nl> - " size ' % s ' is invalid for input with % td elements " , buf . str , nElement ) ; <nl> - } else { <nl> - THDescBuff buf = THLongStorage_sizeDesc ( size ) ; <nl> - THArgCheck ( nElement = = total_size , 2 , <nl> - " size ' % s ' is invalid for input with % td elements " , buf . str , nElement ) ; <nl> - } <nl> - THLongStorage * copy = THLongStorage_newWithSize ( size - > size ( ) ) ; <nl> - THLongStorage_copy ( copy , size ) ; <nl> - if ( dim_infer ! = - 1 ) { <nl> - THLongStorage_data ( copy ) [ dim_infer ] = nElement / total_size ; <nl> - } <nl> - return copy ; <nl> - } <nl> - <nl> ptrdiff_t THStorage_size ( const THStorage * self ) <nl> { <nl> return self - > size ( ) ; <nl> mmm a / aten / src / TH / THStorageFunctions . h <nl> ppp b / aten / src / TH / THStorageFunctions . h <nl> <nl> / / This exists to have a data - type independent way of freeing ( necessary for THPPointer ) . <nl> TH_API void THStorage_free ( THStorage * storage ) ; <nl> TH_API void THStorage_weakFree ( THStorage * storage ) ; <nl> - <nl> - TH_API THDescBuff THLongStorage_sizeDesc ( const THLongStorage * size ) ; <nl> - TH_API THLongStorage * THLongStorage_newInferSize ( THLongStorage * size , ptrdiff_t nElement ) ; <nl> mmm a / aten / src / TH / THStorageFunctions . hpp <nl> ppp b / aten / src / TH / THStorageFunctions . hpp <nl> <nl> / / If it is not , you must report that the storage is dead . <nl> / / <nl> <nl> + TH_CPP_API THStorage * THStorage_new ( at : : ScalarType scalar_type ) ; <nl> TH_API ptrdiff_t THStorage_size ( const THStorage * self ) ; <nl> <nl> TH_API void THStorage_retain ( THStorage * storage ) ; <nl> mmm a / aten / src / TH / THTensor . cpp <nl> ppp b / aten / src / TH / THTensor . cpp <nl> void THTensor_free ( THTensor * self ) <nl> self - > release ( ) ; <nl> } <nl> <nl> + void THTensor_setStorage ( THTensor * self , THStorage * storage_ , ptrdiff_t storageOffset_ , at : : IntList size_ , at : : IntList stride_ ) { <nl> + if ( size_ . data ( ) & & stride_ . data ( ) ) <nl> + THArgCheck ( size_ . size ( ) = = stride_ . size ( ) , 5 , " inconsistent size / stride sizes " ) ; <nl> + <nl> + AT_CHECK ( size_ . data ( ) , " size must not be null " ) ; <nl> + # ifdef DEBUG <nl> + THAssert ( size_ . size ( ) < = INT_MAX ) ; <nl> + # endif <nl> + THTensor_setStorageNd ( self , <nl> + storage_ , <nl> + storageOffset_ , <nl> + size_ . size ( ) , <nl> + size_ . data ( ) , <nl> + stride_ . data ( ) ) ; <nl> + } <nl> + <nl> + void THTensor_setStorageNd ( THTensor * self , THStorage * storage , ptrdiff_t storageOffset , int nDimension , const int64_t * size , const int64_t * stride ) <nl> + { <nl> + / * storage * / <nl> + if ( THTensor_getStoragePtr ( self ) ! = storage ) <nl> + { <nl> + if ( ! THTensor_getStoragePtr ( self ) ) { <nl> + THError ( " Tensor : invalid null storage " ) ; <nl> + } <nl> + auto scalar_type = THTensor_getStoragePtr ( self ) - > scalar_type ( ) ; <nl> + THStorage_free ( THTensor_getStoragePtr ( self ) ) ; <nl> + if ( storage ) <nl> + { <nl> + THTensor_stealAndSetStoragePtr ( self , storage ) ; <nl> + THStorage_retain ( THTensor_getStoragePtr ( self ) ) ; <nl> + } <nl> + else { <nl> + THTensor_stealAndSetStoragePtr ( self , THStorage_new ( scalar_type ) ) ; <nl> + } <nl> + } <nl> + <nl> + / * storageOffset * / <nl> + if ( storageOffset < 0 ) <nl> + THError ( " Tensor : invalid storage offset " ) ; <nl> + THTensor_setStorageOffset ( self , storageOffset ) ; <nl> + <nl> + / * size and stride * / <nl> + THTensor_resizeNd ( self , nDimension , size , stride ) ; <nl> + } <nl> + <nl> + void THTensor_resize ( THTensor * self , at : : IntList size , at : : IntList stride ) <nl> + { <nl> + THArgCheck ( size . data ( ) ! = NULL , 2 , " invalid size " ) ; <nl> + if ( stride . data ( ) ) <nl> + THArgCheck ( stride . size ( ) = = size . size ( ) , 3 , " invalid stride " ) ; <nl> + <nl> + # ifdef DEBUG <nl> + THAssert ( size . size ( ) < = INT_MAX ) ; <nl> + # endif <nl> + THTensor_resizeNd ( self , size . size ( ) , size . data ( ) , stride . data ( ) ) ; <nl> + } <nl> + <nl> + void THTensor_resizeNd ( THTensor * self , int nDimension , const int64_t * size , const int64_t * stride ) <nl> + { <nl> + int d ; <nl> + ptrdiff_t totalSize ; <nl> + bool hascorrectsize = true ; <nl> + <nl> + # ifndef USE_TH_SCALAR <nl> + AT_CHECK ( nDimension > 0 , " resizeNd nDimension must be greater than 0 " ) ; <nl> + # else <nl> + AT_CHECK ( nDimension > = 0 , " resizeNd nDimension must be non - negative " ) ; <nl> + # endif <nl> + <nl> + for ( d = 0 ; d < nDimension ; d + + ) <nl> + { <nl> + if ( ( self - > dim ( ) > d ) & & ( size [ d ] ! = self - > size ( d ) ) ) { <nl> + hascorrectsize = false ; <nl> + } <nl> + <nl> + / / NB : this used to test that stride [ d ] was > = 0 <nl> + if ( ( self - > dim ( ) > d ) & & stride & & ( stride [ d ] ! = self - > stride ( d ) ) ) { <nl> + hascorrectsize = false ; <nl> + } <nl> + } <nl> + <nl> + if ( nDimension ! = self - > dim ( ) ) { <nl> + hascorrectsize = false ; <nl> + } <nl> + <nl> + if ( hascorrectsize ) { <nl> + return ; <nl> + } <nl> + <nl> + if ( nDimension ! = self - > dim ( ) ) <nl> + { <nl> + THTensor_resizeDim ( self , nDimension ) ; <nl> + } <nl> + <nl> + totalSize = 1 ; <nl> + for ( d = nDimension - 1 ; d > = 0 ; d - - ) <nl> + { <nl> + THTensor_setSizeAtDim ( self , d , size [ d ] ) ; <nl> + if ( stride & & ( stride [ d ] > = 0 ) ) { <nl> + THTensor_setStrideAtDim ( self , d , stride [ d ] ) ; <nl> + } else { <nl> + if ( d = = nDimension - 1 ) { <nl> + THTensor_setStrideAtDim ( self , d , 1 ) ; <nl> + } else { <nl> + / / Keep stride monotonically increasing to match NumPy . <nl> + THTensor_setStrideAtDim ( self , d , std : : max < int64_t > ( self - > size ( d + 1 ) , 1 ) * self - > stride ( d + 1 ) ) ; <nl> + } <nl> + } <nl> + totalSize + = ( self - > size ( d ) - 1 ) * self - > stride ( d ) ; <nl> + } <nl> + <nl> + if ( totalSize + self - > storage_offset ( ) > 0 ) <nl> + { <nl> + if ( ! THTensor_getStoragePtr ( self ) ) { <nl> + THTensor_stealAndSetStoragePtr ( self , THStorage_new ( self - > scalar_type ( ) ) ) ; <nl> + } <nl> + if ( totalSize + self - > storage_offset ( ) > THTensor_getStoragePtr ( self ) - > size ( ) ) { <nl> + THStorage_resize ( THTensor_getStoragePtr ( self ) , totalSize + self - > storage_offset ( ) ) ; <nl> + } <nl> + } <nl> + } <nl> + <nl> / / On a high level , <nl> / / 1 . separate oldshape chunks of dimensions , where the dimensions are <nl> / / ` ` contiguous ' ' in each chunk , i . e . , oldstride [ i ] = oldshape [ i + 1 ] * oldstride [ i + 1 ] <nl> mmm a / aten / src / TH / THTensor . hpp <nl> ppp b / aten / src / TH / THTensor . hpp <nl> struct THTensor <nl> return strides_ [ d ] ; <nl> } <nl> <nl> - inline at : : IntList sizes ( ) { <nl> + inline at : : IntList sizes ( ) const { <nl> return sizes_ ; <nl> } <nl> <nl> - inline at : : IntList strides ( ) { <nl> + inline at : : IntList strides ( ) const { <nl> return strides_ ; <nl> } <nl> <nl> inline void THTensor_stealAndSetStoragePtr ( THTensor * tensor , THStorage * storage ) <nl> } <nl> <nl> TH_API void THTensor_free ( THTensor * self ) ; <nl> + TH_API void THTensor_setStorageNd ( THTensor * self , THStorage * storage , ptrdiff_t storageOffset , int nDimension , const int64_t * size , const int64_t * stride ) ; <nl> + TH_API void THTensor_resizeNd ( THTensor * self , int nDimension , const int64_t * size , const int64_t * stride ) ; <nl> + <nl> + TH_CPP_API void THTensor_resize ( THTensor * self , at : : IntList size , at : : IntList stride ) ; <nl> + TH_CPP_API void THTensor_setStorage ( THTensor * self , THStorage * storage_ , ptrdiff_t storageOffset_ , at : : IntList size_ , at : : IntList stride_ ) ; <nl> TH_CPP_API at : : optional < std : : vector < int64_t > > THTensor_compute_stride ( at : : IntList oldshape , at : : IntList oldstride , <nl> at : : IntList newshape ) ; <nl> + <nl> + # include " generic / THTensor . hpp " <nl> + # include " THGenerateAllTypes . h " <nl> + <nl> + # include " generic / THTensor . hpp " <nl> + # include " THGenerateHalfType . h " <nl> mmm a / aten / src / TH / generic / THStorage . cpp <nl> ppp b / aten / src / TH / generic / THStorage . cpp <nl> size_t THStorage_ ( elementSize ) ( ) <nl> <nl> THStorage * THStorage_ ( new ) ( void ) <nl> { <nl> - THStorage * storage = new THStorage ( <nl> - at : : CTypeToScalarType < th : : from_type < real > > : : to ( ) , <nl> - 0 , <nl> - getTHDefaultAllocator ( ) , <nl> - true ) ; <nl> - return storage ; <nl> + return THStorage_new ( at : : CTypeToScalarType < th : : from_type < real > > : : to ( ) ) ; <nl> } <nl> <nl> THStorage * THStorage_ ( newWithSize ) ( ptrdiff_t size ) <nl> mmm a / aten / src / TH / generic / THTensor . cpp <nl> ppp b / aten / src / TH / generic / THTensor . cpp <nl> <nl> # define TH_GENERIC_FILE " generic / THTensor . cpp " <nl> # else <nl> <nl> + # include < ATen / InferSize . h > <nl> # include < new > <nl> <nl> / * * * * access methods * * * * / <nl> int64_t THTensor_ ( stride ) ( const THTensor * self , int dim ) <nl> return self - > stride ( dim ) ; <nl> } <nl> <nl> - THLongStorage * THTensor_ ( newSizeOf ) ( THTensor * self ) <nl> - { <nl> - THLongStorage * size = THLongStorage_newWithSize ( self - > dim ( ) ) ; <nl> - THLongStorage_rawCopy ( size , THTensor_getSizePtr ( self ) ) ; <nl> - return size ; <nl> - } <nl> - <nl> - THLongStorage * THTensor_ ( newStrideOf ) ( THTensor * self ) <nl> - { <nl> - THLongStorage * stride = THLongStorage_newWithSize ( self - > dim ( ) ) ; <nl> - THLongStorage_rawCopy ( stride , THTensor_getStridePtr ( self ) ) ; <nl> - return stride ; <nl> - } <nl> - <nl> real * THTensor_ ( data ) ( const THTensor * self ) { <nl> return self - > data < real > ( ) ; <nl> } <nl> THTensor * THTensor_ ( newWithTensor ) ( THTensor * tensor ) <nl> } <nl> <nl> / * Storage init * / <nl> - THTensor * THTensor_ ( newWithStorage ) ( THStorage * storage , ptrdiff_t storageOffset , THLongStorage * size , THLongStorage * stride ) <nl> - { <nl> - if ( size & & stride ) { <nl> - THArgCheck ( size - > size ( ) = = stride - > size ( ) , 4 , " inconsistent size " ) ; <nl> + THTensor * THTensor_ ( newWithStorage ) ( THStorage * storage , ptrdiff_t storageOffset , at : : IntList sizes , at : : IntList strides ) { <nl> + if ( sizes . data ( ) & & strides . data ( ) ) { <nl> + AT_CHECK ( sizes . size ( ) = = strides . size ( ) , " number of sizes and strides must match " ) ; <nl> } <nl> - AT_CHECK ( size , " size must not be null " ) ; <nl> - <nl> - THTensor * self = new THTensor ( THStorage_ ( new ) ( ) ) ; <nl> - # ifdef DEBUG <nl> - THAssert ( size - > size ( ) < = INT_MAX ) ; <nl> - # endif <nl> - THTensor_ ( setStorageNd ) ( self , <nl> - storage , <nl> - storageOffset , <nl> - size - > size ( ) , <nl> - THLongStorage_data ( size ) , <nl> - ( stride ? THLongStorage_data ( stride ) : NULL ) ) ; <nl> - <nl> - return self ; <nl> - } <nl> - <nl> - THTensor * THTensor_ ( newWithStorageIntLists ) ( THStorage * storage , ptrdiff_t storageOffset , at : : IntList sizes , at : : IntList strides ) { <nl> - AT_CHECK ( sizes . size ( ) = = strides . size ( ) , " number of sizes and strides must match " ) ; <nl> + AT_CHECK ( sizes . data ( ) , " size must not be null " ) ; <nl> THTensor * self = new THTensor ( THStorage_ ( new ) ( ) ) ; <nl> THTensor_ ( setStorageNd ) ( self , storage , storageOffset , sizes . size ( ) , <nl> const_cast < int64_t * > ( sizes . data ( ) ) , const_cast < int64_t * > ( strides . data ( ) ) ) ; <nl> THTensor * THTensor_ ( newWithStorageIntLists ) ( THStorage * storage , ptrdiff_t storag <nl> THTensor * THTensor_ ( newWithStorage1d ) ( THStorage * storage , ptrdiff_t storageOffset , <nl> int64_t size0 , int64_t stride0 ) <nl> { <nl> - return THTensor_ ( newWithStorageIntLists ) ( storage , storageOffset , { size0 } , { stride0 } ) ; <nl> + return THTensor_ ( newWithStorage ) ( storage , storageOffset , { size0 } , { stride0 } ) ; <nl> } <nl> <nl> THTensor * THTensor_ ( newWithStorage2d ) ( THStorage * storage , ptrdiff_t storageOffset , <nl> int64_t size0 , int64_t stride0 , <nl> int64_t size1 , int64_t stride1 ) <nl> { <nl> - return THTensor_ ( newWithStorageIntLists ) ( storage , storageOffset , { size0 , size1 } , { stride0 , stride1 } ) ; <nl> + return THTensor_ ( newWithStorage ) ( storage , storageOffset , { size0 , size1 } , { stride0 , stride1 } ) ; <nl> } <nl> <nl> THTensor * THTensor_ ( newWithStorage3d ) ( THStorage * storage , ptrdiff_t storageOffset , <nl> THTensor * THTensor_ ( newWithStorage3d ) ( THStorage * storage , ptrdiff_t storageOffse <nl> int64_t size1 , int64_t stride1 , <nl> int64_t size2 , int64_t stride2 ) <nl> { <nl> - return THTensor_ ( newWithStorageIntLists ) ( storage , storageOffset , { size0 , size1 , size2 } , { stride0 , stride1 , stride2 } ) ; <nl> + return THTensor_ ( newWithStorage ) ( storage , storageOffset , { size0 , size1 , size2 } , { stride0 , stride1 , stride2 } ) ; <nl> } <nl> <nl> THTensor * THTensor_ ( newWithStorage4d ) ( THStorage * storage , ptrdiff_t storageOffset , <nl> THTensor * THTensor_ ( newWithStorage4d ) ( THStorage * storage , ptrdiff_t storageOffse <nl> int64_t size2 , int64_t stride2 , <nl> int64_t size3 , int64_t stride3 ) <nl> { <nl> - return THTensor_ ( newWithStorageIntLists ) ( storage , storageOffset , <nl> + return THTensor_ ( newWithStorage ) ( storage , storageOffset , <nl> { size0 , size1 , size2 , size3 } , <nl> { stride0 , stride1 , stride2 , stride3 } ) ; <nl> } <nl> <nl> - THTensor * THTensor_ ( newWithSize ) ( THLongStorage * size , THLongStorage * stride ) <nl> + THTensor * THTensor_ ( newWithSize ) ( at : : IntList size , at : : IntList stride ) <nl> { <nl> return THTensor_ ( newWithStorage ) ( NULL , 0 , size , stride ) ; <nl> } <nl> <nl> - THTensor * THTensor_ ( newWithSizeIntList ) ( at : : IntList sizes ) { <nl> - THTensor * self = new THTensor ( THStorage_ ( new ) ( ) ) ; <nl> - THTensor_ ( resizeNd ) ( self , sizes . size ( ) , const_cast < int64_t * > ( sizes . data ( ) ) , nullptr ) ; <nl> - <nl> - return self ; <nl> - } <nl> - <nl> THTensor * THTensor_ ( newWithSize1d ) ( int64_t size0 ) <nl> { <nl> - return THTensor_ ( newWithSizeIntList ) ( { size0 } ) ; <nl> + return THTensor_ ( newWithSize ) ( { size0 } , { } ) ; <nl> } <nl> <nl> THTensor * THTensor_ ( newWithSize2d ) ( int64_t size0 , int64_t size1 ) <nl> { <nl> - return THTensor_ ( newWithSizeIntList ) ( { size0 , size1 } ) ; <nl> + return THTensor_ ( newWithSize ) ( { size0 , size1 } , { } ) ; <nl> } <nl> <nl> THTensor * THTensor_ ( newWithSize3d ) ( int64_t size0 , int64_t size1 , int64_t size2 ) <nl> { <nl> - return THTensor_ ( newWithSizeIntList ) ( { size0 , size1 , size2 } ) ; <nl> + return THTensor_ ( newWithSize ) ( { size0 , size1 , size2 } , { } ) ; <nl> } <nl> <nl> THTensor * THTensor_ ( newWithSize4d ) ( int64_t size0 , int64_t size1 , int64_t size2 , int64_t size3 ) <nl> { <nl> - return THTensor_ ( newWithSizeIntList ) ( { size0 , size1 , size2 , size3 } ) ; <nl> + return THTensor_ ( newWithSize ) ( { size0 , size1 , size2 , size3 } , { } ) ; <nl> } <nl> <nl> THTensor * THTensor_ ( newClone ) ( THTensor * self ) <nl> THTensor * THTensor_ ( newUnfold ) ( THTensor * tensor , int dimension_ , int64_t size_ , <nl> return self ; <nl> } <nl> <nl> - THTensor * THTensor_ ( newView ) ( THTensor * tensor , THLongStorage * size ) <nl> + THTensor * THTensor_ ( newView ) ( THTensor * tensor , at : : IntList size ) <nl> { <nl> ptrdiff_t numel = THTensor_ ( nElement ) ( tensor ) ; <nl> THTensor * self = THTensor_ ( new ) ( ) ; <nl> - THLongStorage * inferred_size = THLongStorage_newInferSize ( size , numel ) ; <nl> + auto inferred_size = at : : infer_size ( size , numel ) ; <nl> auto stride = THTensor_compute_stride ( tensor - > sizes ( ) , <nl> tensor - > strides ( ) , <nl> - at : : IntList ( inferred_size - > data < int64_t > ( ) , inferred_size - > size ( ) ) ) ; <nl> + inferred_size ) ; <nl> THArgCheck ( stride . has_value ( ) , 2 , " view size is " <nl> " not compatible with input tensor ' s size and stride ( at least one dimension spans " <nl> " across two contiguous subspaces ) . Call . contiguous ( ) before . view ( ) . " ) ; <nl> auto stride_value = * stride ; <nl> - THLongStorage * new_stride = THLongStorage_newWithSize ( stride_value . size ( ) ) ; <nl> - THLongStorage_rawCopy ( new_stride , stride_value . data ( ) ) ; <nl> - THTensor_ ( setStorage ) ( self , THTensor_getStoragePtr ( tensor ) , tensor - > storage_offset ( ) , inferred_size , new_stride ) ; <nl> - THLongStorage_free ( inferred_size ) ; <nl> - THLongStorage_free ( new_stride ) ; <nl> + THTensor_setStorage ( self , THTensor_getStoragePtr ( tensor ) , tensor - > storage_offset ( ) , inferred_size , stride_value ) ; <nl> return self ; <nl> } <nl> <nl> / * Resize * / <nl> - void THTensor_ ( resize ) ( THTensor * self , THLongStorage * size , THLongStorage * stride ) <nl> + void THTensor_ ( resize ) ( THTensor * self , at : : IntList size , at : : IntList stride ) <nl> { <nl> - THArgCheck ( size ! = NULL , 2 , " invalid size " ) ; <nl> - if ( stride ) <nl> - THArgCheck ( stride - > size ( ) = = size - > size ( ) , 3 , " invalid stride " ) ; <nl> - <nl> - # ifdef DEBUG <nl> - THAssert ( size - > size ( ) < = INT_MAX ) ; <nl> - # endif <nl> - THTensor_ ( resizeNd ) ( self , size - > size ( ) , THLongStorage_data ( size ) , ( stride ? THLongStorage_data ( stride ) : NULL ) ) ; <nl> + return THTensor_resize ( self , size , stride ) ; <nl> } <nl> <nl> void THTensor_ ( resizeAs ) ( THTensor * self , THTensor * src ) <nl> void THTensor_ ( set ) ( THTensor * self , THTensor * src ) <nl> THTensor_getStridePtr ( src ) ) ; <nl> } <nl> <nl> - void THTensor_ ( setStorage ) ( THTensor * self , THStorage * storage_ , ptrdiff_t storageOffset_ , THLongStorage * size_ , THLongStorage * stride_ ) <nl> - { <nl> - if ( size_ & & stride_ ) <nl> - THArgCheck ( size_ - > size ( ) = = stride_ - > size ( ) , 5 , " inconsistent size / stride sizes " ) ; <nl> - <nl> - AT_CHECK ( size_ , " size must not be null " ) ; <nl> - # ifdef DEBUG <nl> - THAssert ( size_ < = INT_MAX ) ; <nl> - # endif <nl> - THTensor_ ( setStorageNd ) ( self , <nl> - storage_ , <nl> - storageOffset_ , <nl> - size_ - > size ( ) , <nl> - THLongStorage_data ( size_ ) , <nl> - ( stride_ ? THLongStorage_data ( stride_ ) : NULL ) ) ; <nl> - } <nl> - <nl> - void THTensor_ ( setStorageIntLists ) ( THTensor * self , THStorage * storage_ , ptrdiff_t storageOffset_ , <nl> - at : : IntList sizes , at : : IntList strides ) <nl> + void THTensor_ ( setStorage ) ( THTensor * self , THStorage * storage_ , ptrdiff_t storageOffset_ , at : : IntList size_ , at : : IntList stride_ ) <nl> { <nl> - AT_CHECK ( sizes . size ( ) = = strides . size ( ) , " number of sizes and strides must match " ) ; <nl> - <nl> - THTensor_ ( setStorageNd ) ( self , storage_ , storageOffset_ , sizes . size ( ) , <nl> - const_cast < int64_t * > ( sizes . data ( ) ) , const_cast < int64_t * > ( strides . data ( ) ) ) ; <nl> + THTensor_setStorage ( self , storage_ , storageOffset_ , size_ , stride_ ) ; <nl> } <nl> <nl> void THTensor_ ( setStorage1d ) ( THTensor * self , THStorage * storage_ , ptrdiff_t storageOffset_ , <nl> int64_t size0_ , int64_t stride0_ ) <nl> { <nl> - THTensor_ ( setStorageIntLists ) ( self , storage_ , storageOffset_ , <nl> - { size0_ } , { stride0_ } ) ; <nl> + THTensor_ ( setStorage ) ( self , storage_ , storageOffset_ , <nl> + { size0_ } , { stride0_ } ) ; <nl> } <nl> <nl> void THTensor_ ( setStorage2d ) ( THTensor * self , THStorage * storage_ , ptrdiff_t storageOffset_ , <nl> int64_t size0_ , int64_t stride0_ , <nl> int64_t size1_ , int64_t stride1_ ) <nl> { <nl> - THTensor_ ( setStorageIntLists ) ( self , storage_ , storageOffset_ , <nl> - { size0_ , size1_ } , <nl> - { stride0_ , stride1_ } ) ; <nl> + THTensor_ ( setStorage ) ( self , storage_ , storageOffset_ , <nl> + { size0_ , size1_ } , <nl> + { stride0_ , stride1_ } ) ; <nl> } <nl> <nl> void THTensor_ ( setStorage3d ) ( THTensor * self , THStorage * storage_ , ptrdiff_t storageOffset_ , <nl> void THTensor_ ( setStorage3d ) ( THTensor * self , THStorage * storage_ , ptrdiff_t stor <nl> int64_t size1_ , int64_t stride1_ , <nl> int64_t size2_ , int64_t stride2_ ) <nl> { <nl> - THTensor_ ( setStorageIntLists ) ( self , storage_ , storageOffset_ , <nl> - { size0_ , size1_ , size2_ } , <nl> - { stride0_ , stride1_ , stride2_ } ) ; <nl> + THTensor_ ( setStorage ) ( self , storage_ , storageOffset_ , <nl> + { size0_ , size1_ , size2_ } , <nl> + { stride0_ , stride1_ , stride2_ } ) ; <nl> } <nl> <nl> void THTensor_ ( setStorage4d ) ( THTensor * self , THStorage * storage_ , ptrdiff_t storageOffset_ , <nl> void THTensor_ ( setStorage4d ) ( THTensor * self , THStorage * storage_ , ptrdiff_t stor <nl> int64_t size [ 4 ] = { size0_ , size1_ , size2_ , size3_ } ; <nl> int64_t stride [ 4 ] = { stride0_ , stride1_ , stride2_ , stride3_ } ; <nl> <nl> - THTensor_ ( setStorageIntLists ) ( self , storage_ , storageOffset_ , size , stride ) ; <nl> + THTensor_ ( setStorage ) ( self , storage_ , storageOffset_ , size , stride ) ; <nl> } <nl> <nl> <nl> void THTensor_ ( freeCopyTo ) ( THTensor * self , THTensor * dst ) <nl> <nl> void THTensor_ ( setStorageNd ) ( THTensor * self , THStorage * storage , ptrdiff_t storageOffset , int nDimension , int64_t * size , int64_t * stride ) <nl> { <nl> - / * storage * / <nl> - if ( THTensor_getStoragePtr ( self ) ! = storage ) <nl> - { <nl> - if ( THTensor_getStoragePtr ( self ) ) <nl> - THStorage_ ( free ) ( THTensor_getStoragePtr ( self ) ) ; <nl> - <nl> - if ( storage ) <nl> - { <nl> - THTensor_stealAndSetStoragePtr ( self , storage ) ; <nl> - THStorage_ ( retain ) ( THTensor_getStoragePtr ( self ) ) ; <nl> - } <nl> - else <nl> - THTensor_stealAndSetStoragePtr ( self , THStorage_ ( new ) ( ) ) ; <nl> - } <nl> - <nl> - / * storageOffset * / <nl> - if ( storageOffset < 0 ) <nl> - THError ( " Tensor : invalid storage offset " ) ; <nl> - THTensor_setStorageOffset ( self , storageOffset ) ; <nl> - <nl> - / * size and stride * / <nl> - THTensor_ ( resizeNd ) ( self , nDimension , size , stride ) ; <nl> + return THTensor_setStorageNd ( self , storage , storageOffset , nDimension , size , stride ) ; <nl> } <nl> <nl> void THTensor_ ( resizeNd ) ( THTensor * self , int nDimension , int64_t * size , int64_t * stride ) <nl> { <nl> - int d ; <nl> - ptrdiff_t totalSize ; <nl> - bool hascorrectsize = true ; <nl> - <nl> - # ifndef USE_TH_SCALAR <nl> - AT_CHECK ( nDimension > 0 , " resizeNd nDimension must be greater than 0 " ) ; <nl> - # else <nl> - AT_CHECK ( nDimension > = 0 , " resizeNd nDimension must be non - negative " ) ; <nl> - # endif <nl> - <nl> - for ( d = 0 ; d < nDimension ; d + + ) <nl> - { <nl> - if ( ( self - > dim ( ) > d ) & & ( size [ d ] ! = self - > size ( d ) ) ) { <nl> - hascorrectsize = false ; <nl> - } <nl> - <nl> - / / NB : this used to test that stride [ d ] was > = 0 <nl> - if ( ( self - > dim ( ) > d ) & & stride & & ( stride [ d ] ! = self - > stride ( d ) ) ) { <nl> - hascorrectsize = false ; <nl> - } <nl> - } <nl> - <nl> - if ( nDimension ! = self - > dim ( ) ) { <nl> - hascorrectsize = false ; <nl> - } <nl> - <nl> - if ( hascorrectsize ) { <nl> - return ; <nl> - } <nl> - <nl> - if ( nDimension ! = self - > dim ( ) ) <nl> - { <nl> - THTensor_resizeDim ( self , nDimension ) ; <nl> - } <nl> - <nl> - totalSize = 1 ; <nl> - for ( d = nDimension - 1 ; d > = 0 ; d - - ) <nl> - { <nl> - THTensor_setSizeAtDim ( self , d , size [ d ] ) ; <nl> - if ( stride & & ( stride [ d ] > = 0 ) ) { <nl> - THTensor_setStrideAtDim ( self , d , stride [ d ] ) ; <nl> - } else { <nl> - if ( d = = nDimension - 1 ) { <nl> - THTensor_setStrideAtDim ( self , d , 1 ) ; <nl> - } else { <nl> - / / Keep stride monotonically increasing to match NumPy . <nl> - THTensor_setStrideAtDim ( self , d , std : : max < int64_t > ( self - > size ( d + 1 ) , 1 ) * self - > stride ( d + 1 ) ) ; <nl> - } <nl> - } <nl> - totalSize + = ( self - > size ( d ) - 1 ) * self - > stride ( d ) ; <nl> - } <nl> - <nl> - if ( totalSize + self - > storage_offset ( ) > 0 ) <nl> - { <nl> - if ( ! THTensor_getStoragePtr ( self ) ) { <nl> - THTensor_stealAndSetStoragePtr ( self , THStorage_ ( new ) ( ) ) ; <nl> - } <nl> - if ( totalSize + self - > storage_offset ( ) > THTensor_getStoragePtr ( self ) - > size ( ) ) { <nl> - THStorage_ ( resize ) ( THTensor_getStoragePtr ( self ) , totalSize + self - > storage_offset ( ) ) ; <nl> - } <nl> - } <nl> + return THTensor_resizeNd ( self , nDimension , size , stride ) ; <nl> } <nl> <nl> void THTensor_ ( set1d ) ( THTensor * tensor , int64_t x0 , real value ) <nl> THDescBuff THTensor_ ( desc ) ( const THTensor * tensor ) { <nl> } <nl> <nl> THDescBuff THTensor_ ( sizeDesc ) ( const THTensor * tensor ) { <nl> - THLongStorage * size = THTensor_ ( newSizeOf ) ( ( THTensor * ) tensor ) ; <nl> - THDescBuff buf = THLongStorage_sizeDesc ( size ) ; <nl> - THLongStorage_free ( size ) ; <nl> + THDescBuff buf = _THSizeDesc ( tensor - > sizes ( ) . data ( ) , tensor - > sizes ( ) . size ( ) ) ; <nl> return buf ; <nl> } <nl> <nl> mmm a / aten / src / TH / generic / THTensor . h <nl> ppp b / aten / src / TH / generic / THTensor . h <nl> TH_API int THTensor_ ( nDimensionLegacyNoScalars ) ( const THTensor * self ) ; <nl> TH_API int THTensor_ ( nDimensionLegacyAll ) ( const THTensor * self ) ; <nl> TH_API int64_t THTensor_ ( size ) ( const THTensor * self , int dim ) ; <nl> TH_API int64_t THTensor_ ( stride ) ( const THTensor * self , int dim ) ; <nl> - TH_API THLongStorage * THTensor_ ( newSizeOf ) ( THTensor * self ) ; <nl> - TH_API THLongStorage * THTensor_ ( newStrideOf ) ( THTensor * self ) ; <nl> TH_API real * THTensor_ ( data ) ( const THTensor * self ) ; <nl> <nl> <nl> / * * * * creation methods * * * * / <nl> TH_API THTensor * THTensor_ ( new ) ( void ) ; <nl> TH_API THTensor * THTensor_ ( newWithTensor ) ( THTensor * tensor ) ; <nl> - / * stride might be NULL * / <nl> - TH_API THTensor * THTensor_ ( newWithStorage ) ( THStorage * storage_ , ptrdiff_t storageOffset_ , THLongStorage * size_ , THLongStorage * stride_ ) ; <nl> TH_API THTensor * THTensor_ ( newWithStorage1d ) ( THStorage * storage_ , ptrdiff_t storageOffset_ , <nl> int64_t size0_ , int64_t stride0_ ) ; <nl> TH_API THTensor * THTensor_ ( newWithStorage2d ) ( THStorage * storage_ , ptrdiff_t storageOffset_ , <nl> TH_API THTensor * THTensor_ ( newWithStorage4d ) ( THStorage * storage_ , ptrdiff_t stor <nl> int64_t size3_ , int64_t stride3_ ) ; <nl> <nl> / * stride might be NULL * / <nl> - TH_API THTensor * THTensor_ ( newWithSize ) ( THLongStorage * size_ , THLongStorage * stride_ ) ; <nl> TH_API THTensor * THTensor_ ( newWithSize1d ) ( int64_t size0_ ) ; <nl> TH_API THTensor * THTensor_ ( newWithSize2d ) ( int64_t size0_ , int64_t size1_ ) ; <nl> TH_API THTensor * THTensor_ ( newWithSize3d ) ( int64_t size0_ , int64_t size1_ , int64_t size2_ ) ; <nl> TH_API THTensor * THTensor_ ( newSelect ) ( THTensor * tensor , int dimension_ , int64_t <nl> TH_API THTensor * THTensor_ ( newNarrow ) ( THTensor * tensor , int dimension_ , int64_t firstIndex_ , int64_t size_ ) ; <nl> TH_API THTensor * THTensor_ ( newTranspose ) ( THTensor * tensor , int dimension1_ , int dimension2_ ) ; <nl> TH_API THTensor * THTensor_ ( newUnfold ) ( THTensor * tensor , int dimension_ , int64_t size_ , int64_t step_ ) ; <nl> - TH_API THTensor * THTensor_ ( newView ) ( THTensor * tensor , THLongStorage * size ) ; <nl> <nl> / / resize * methods simply resize the storage . So they may not retain the current data at current indices . <nl> / / This is especially likely to happen when the tensor is not contiguous . In general , if you still need the <nl> / / values , unless you are doing some size and stride tricks , do not use resize * . <nl> - TH_API void THTensor_ ( resize ) ( THTensor * tensor , THLongStorage * size , THLongStorage * stride ) ; <nl> TH_API void THTensor_ ( resizeNd ) ( THTensor * tensor , int nDimension , int64_t * size , int64_t * stride ) ; <nl> TH_API void THTensor_ ( resizeAs ) ( THTensor * tensor , THTensor * src ) ; <nl> TH_API void THTensor_ ( resize1d ) ( THTensor * tensor , int64_t size0_ ) ; <nl> TH_API void THTensor_ ( resize5d ) ( THTensor * tensor , int64_t size0_ , int64_t size1_ <nl> / / Note : these are legacy resize functions that treat sizes as size - > size ( ) = = 0 and size - > data < int64_t > ( ) as being 0 - terminated . <nl> <nl> TH_API void THTensor_ ( set ) ( THTensor * self , THTensor * src ) ; <nl> - TH_API void THTensor_ ( setStorage ) ( THTensor * self , THStorage * storage_ , ptrdiff_t storageOffset_ , THLongStorage * size_ , THLongStorage * stride_ ) ; <nl> TH_API void THTensor_ ( setStorageNd ) ( THTensor * self , THStorage * storage_ , ptrdiff_t storageOffset_ , int nDimension , int64_t * size , int64_t * stride ) ; <nl> TH_API void THTensor_ ( setStorage1d ) ( THTensor * self , THStorage * storage_ , ptrdiff_t storageOffset_ , <nl> int64_t size0_ , int64_t stride0_ ) ; <nl> new file mode 100644 <nl> index 000000000000 . . 845ebacd6e59 <nl> mmm / dev / null <nl> ppp b / aten / src / TH / generic / THTensor . hpp <nl> <nl> + # ifndef TH_GENERIC_FILE <nl> + # define TH_GENERIC_FILE " generic / THTensor . hpp " <nl> + # else <nl> + <nl> + / / STOP ! ! ! Thinking of including this header directly ? Please <nl> + / / read Note [ TH abstraction violation ] <nl> + <nl> + / / NOTE : functions exist here only to support dispatch via Declarations . cwrap . You probably don ' t want to put <nl> + / / new functions in here , they should probably be un - genericized . <nl> + <nl> + TH_CPP_API void THTensor_ ( setStorage ) ( THTensor * self , THStorage * storage_ , ptrdiff_t storageOffset_ , <nl> + at : : IntList size_ , at : : IntList stride_ ) ; <nl> + TH_CPP_API THTensor * THTensor_ ( newView ) ( THTensor * tensor , at : : IntList size ) ; <nl> + / * strides . data ( ) might be NULL * / <nl> + TH_CPP_API THTensor * THTensor_ ( newWithStorage ) ( THStorage * storage , ptrdiff_t storageOffset , <nl> + at : : IntList sizes , at : : IntList strides ) ; <nl> + <nl> + TH_CPP_API void THTensor_ ( resize ) ( THTensor * self , at : : IntList size , at : : IntList stride ) ; <nl> + TH_CPP_API THTensor * THTensor_ ( newWithSize ) ( at : : IntList size , at : : IntList stride ) ; <nl> + <nl> + # endif <nl> mmm a / aten / src / TH / generic / THTensorEvenMoreMath . cpp <nl> ppp b / aten / src / TH / generic / THTensorEvenMoreMath . cpp <nl> void THTensor_ ( nonzero ) ( THLongTensor * subscript , THTensor * tensor ) <nl> void THTensor_ ( indexSelect ) ( THTensor * tensor , THTensor * src , int dim , THLongTensor * index ) <nl> { <nl> ptrdiff_t i , numel ; <nl> - THLongStorage * newSize ; <nl> THTensor * tSlice , * sSlice ; <nl> int64_t * index_data ; <nl> real * tensor_data , * src_data ; <nl> void THTensor_ ( indexSelect ) ( THTensor * tensor , THTensor * src , int dim , THLongTens <nl> <nl> numel = THLongTensor_nElement ( index ) ; <nl> <nl> - newSize = THLongStorage_newWithSize ( src - > dim ( ) ) ; <nl> - THLongStorage_rawCopy ( newSize , THTensor_getSizePtr ( src ) ) ; <nl> + std : : vector < int64_t > newSize = src - > sizes ( ) . vec ( ) ; <nl> # ifdef DEBUG <nl> THAssert ( numel < = LONG_MAX ) ; <nl> # endif <nl> - THLongStorage_data ( newSize ) [ dim ] = numel ; <nl> - THTensor_ ( resize ) ( tensor , newSize , NULL ) ; <nl> - THLongStorage_free ( newSize ) ; <nl> + newSize [ dim ] = numel ; <nl> + THTensor_ ( resize ) ( tensor , newSize , { } ) ; <nl> <nl> index = THLongTensor_newContiguous ( index ) ; <nl> index_data = THLongTensor_data ( index ) ; <nl> mmm a / aten / src / TH / generic / THTensorMoreMath . cpp <nl> ppp b / aten / src / TH / generic / THTensorMoreMath . cpp <nl> void THTensor_ ( preserveReduceDimSemantics ) ( <nl> <nl> void THTensor_ ( max ) ( THTensor * values_ , THLongTensor * indices_ , THTensor * t , int dimension , int keepdim ) <nl> { <nl> - THLongStorage * dim ; <nl> - <nl> THArgCheck ( dimension > = 0 & & dimension < THTensor_ ( nDimensionLegacyAll ) ( t ) , 2 , " dimension % d out of range " , <nl> dimension + TH_INDEX_BASE ) ; <nl> <nl> int in_dims = THTensor_ ( nDimensionLegacyAll ) ( t ) ; <nl> THTensor_ ( preserveReduceDimSemantics ) ( values_ , in_dims , dimension , keepdim ) ; <nl> THLongTensor_preserveReduceDimSemantics ( indices_ , in_dims , dimension , keepdim ) ; <nl> - dim = THTensor_ ( newSizeOf ) ( t ) ; <nl> - THLongStorage_set ( dim , dimension , 1 ) ; <nl> - THTensor_ ( resize ) ( values_ , dim , NULL ) ; <nl> - THLongTensor_resize ( indices_ , dim , NULL ) ; <nl> - THLongStorage_free ( dim ) ; <nl> + std : : vector < int64_t > dim = t - > sizes ( ) . vec ( ) ; <nl> + dim [ dimension ] = 1 ; <nl> + THTensor_ ( resize ) ( values_ , dim , { } ) ; <nl> + THLongTensor_resize ( indices_ , dim , { } ) ; <nl> <nl> / / two implementations optimized for data locality <nl> if ( THTensor_strideLegacyNoScalars ( t , dimension ) = = 1 ) { <nl> void THTensor_ ( max ) ( THTensor * values_ , THLongTensor * indices_ , THTensor * t , int <nl> <nl> void THTensor_ ( min ) ( THTensor * values_ , THLongTensor * indices_ , THTensor * t , int dimension , int keepdim ) <nl> { <nl> - THLongStorage * dim ; <nl> - <nl> THArgCheck ( dimension > = 0 & & dimension < THTensor_ ( nDimensionLegacyAll ) ( t ) , 2 , " dimension % d out of range " , <nl> dimension + TH_INDEX_BASE ) ; <nl> <nl> int in_dims = THTensor_ ( nDimensionLegacyAll ) ( t ) ; <nl> THTensor_ ( preserveReduceDimSemantics ) ( values_ , in_dims , dimension , keepdim ) ; <nl> THLongTensor_preserveReduceDimSemantics ( indices_ , in_dims , dimension , keepdim ) ; <nl> - dim = THTensor_ ( newSizeOf ) ( t ) ; <nl> - THLongStorage_set ( dim , dimension , 1 ) ; <nl> - THTensor_ ( resize ) ( values_ , dim , NULL ) ; <nl> - THLongTensor_resize ( indices_ , dim , NULL ) ; <nl> - THLongStorage_free ( dim ) ; <nl> + std : : vector < int64_t > dim = t - > sizes ( ) . vec ( ) ; <nl> + dim [ dimension ] = 1 ; <nl> + THTensor_ ( resize ) ( values_ , dim , { } ) ; <nl> + THLongTensor_resize ( indices_ , dim , { } ) ; <nl> <nl> / / two implementations optimized for data locality <nl> if ( THTensor_strideLegacyNoScalars ( t , dimension ) = = 1 ) { <nl> void THTensor_ ( min ) ( THTensor * values_ , THLongTensor * indices_ , THTensor * t , int <nl> <nl> void THTensor_ ( sum ) ( THTensor * r_ , THTensor * t , int dimension , int keepdim ) <nl> { <nl> - THLongStorage * dim ; <nl> - <nl> THArgCheck ( dimension > = 0 & & dimension < THTensor_ ( nDimensionLegacyAll ) ( t ) , 2 , " dimension % d out of range " , <nl> dimension + TH_INDEX_BASE ) ; <nl> <nl> THTensor_ ( preserveReduceDimSemantics ) ( r_ , THTensor_ ( nDimensionLegacyAll ) ( t ) , dimension , keepdim ) ; <nl> - dim = THTensor_ ( newSizeOf ) ( t ) ; <nl> - THLongStorage_set ( dim , dimension , 1 ) ; <nl> - THTensor_ ( resize ) ( r_ , dim , NULL ) ; <nl> - THLongStorage_free ( dim ) ; <nl> + std : : vector < int64_t > dim = t - > sizes ( ) . vec ( ) ; <nl> + dim [ dimension ] = 1 ; <nl> + THTensor_ ( resize ) ( r_ , dim , { } ) ; <nl> <nl> int serial_path = 0 ; <nl> # ifdef _OPENMP <nl> void THTensor_ ( sum ) ( THTensor * r_ , THTensor * t , int dimension , int keepdim ) <nl> <nl> void THTensor_ ( prod ) ( THTensor * r_ , THTensor * t , int dimension , int keepdim ) <nl> { <nl> - THLongStorage * dim ; <nl> - <nl> THArgCheck ( dimension > = 0 & & dimension < THTensor_ ( nDimensionLegacyAll ) ( t ) , 2 , " dimension % d out of range " , <nl> dimension + TH_INDEX_BASE ) ; <nl> <nl> THTensor_ ( preserveReduceDimSemantics ) ( r_ , THTensor_ ( nDimensionLegacyAll ) ( t ) , dimension , keepdim ) ; <nl> - dim = THTensor_ ( newSizeOf ) ( t ) ; <nl> - THLongStorage_set ( dim , dimension , 1 ) ; <nl> - THTensor_ ( resize ) ( r_ , dim , NULL ) ; <nl> - THLongStorage_free ( dim ) ; <nl> + std : : vector < int64_t > dim = t - > sizes ( ) . vec ( ) ; <nl> + dim [ dimension ] = 1 ; <nl> + THTensor_ ( resize ) ( r_ , dim , { } ) ; <nl> <nl> int serial_path = 0 ; <nl> # ifdef _OPENMP <nl> void THTensor_ ( sort ) ( THTensor * rt_ , THLongTensor * ri_ , THTensor * t , int dimensio <nl> THTensor_ ( copy ) ( rt_ , t ) ; <nl> <nl> { <nl> - THLongStorage * size = THTensor_ ( newSizeOf ) ( t ) ; <nl> - THLongTensor_resize ( ri_ , size , NULL ) ; <nl> - THLongStorage_free ( size ) ; <nl> + std : : vector < int64_t > size = t - > sizes ( ) . vec ( ) ; <nl> + THLongTensor_resize ( ri_ , size , { } ) ; <nl> } <nl> <nl> if ( descendingOrder ) <nl> real THTensor_ ( medianall ) ( THTensor * tensor ) <nl> <nl> void THTensor_ ( mode ) ( THTensor * values_ , THLongTensor * indices_ , THTensor * t , int dimension , int keepdim ) <nl> { <nl> - THLongStorage * dim ; <nl> THTensor * temp_ ; <nl> THLongTensor * tempi_ ; <nl> real * temp__data ; <nl> void THTensor_ ( mode ) ( THTensor * values_ , THLongTensor * indices_ , THTensor * t , int <nl> int in_dims = THTensor_ ( nDimensionLegacyAll ) ( t ) ; <nl> THTensor_ ( preserveReduceDimSemantics ) ( values_ , in_dims , dimension , keepdim ) ; <nl> THLongTensor_preserveReduceDimSemantics ( indices_ , in_dims , dimension , keepdim ) ; <nl> - dim = THTensor_ ( newSizeOf ) ( t ) ; <nl> - THLongStorage_set ( dim , dimension , 1 ) ; <nl> - THTensor_ ( resize ) ( values_ , dim , NULL ) ; <nl> - THLongTensor_resize ( indices_ , dim , NULL ) ; <nl> - THLongStorage_free ( dim ) ; <nl> + std : : vector < int64_t > dim = t - > sizes ( ) . vec ( ) ; <nl> + dim [ dimension ] = 1 ; <nl> + THTensor_ ( resize ) ( values_ , dim , { } ) ; <nl> + THLongTensor_resize ( indices_ , dim , { } ) ; <nl> <nl> t_size_dim = THTensor_sizeLegacyNoScalars ( t , dimension ) ; <nl> <nl> void THTensor_ ( mode ) ( THTensor * values_ , THLongTensor * indices_ , THTensor * t , int <nl> <nl> void THTensor_ ( kthvalue ) ( THTensor * values_ , THLongTensor * indices_ , THTensor * t , int64_t k , int dimension , int keepdim ) <nl> { <nl> - THLongStorage * dim ; <nl> THTensor * temp_ ; <nl> THLongTensor * tempi_ ; <nl> real * temp__data ; <nl> void THTensor_ ( kthvalue ) ( THTensor * values_ , THLongTensor * indices_ , THTensor * t , <nl> int in_dims = THTensor_ ( nDimensionLegacyAll ) ( t ) ; <nl> THTensor_ ( preserveReduceDimSemantics ) ( values_ , in_dims , dimension , keepdim ) ; <nl> THLongTensor_preserveReduceDimSemantics ( indices_ , in_dims , dimension , keepdim ) ; <nl> - dim = THTensor_ ( newSizeOf ) ( t ) ; <nl> - THLongStorage_set ( dim , dimension , 1 ) ; <nl> - THTensor_ ( resize ) ( values_ , dim , NULL ) ; <nl> - THLongTensor_resize ( indices_ , dim , NULL ) ; <nl> - THLongStorage_free ( dim ) ; <nl> + std : : vector < int64_t > dim = t - > sizes ( ) . vec ( ) ; <nl> + dim [ dimension ] = 1 ; <nl> + THTensor_ ( resize ) ( values_ , dim , { } ) ; <nl> + THLongTensor_resize ( indices_ , dim , { } ) ; <nl> <nl> t_size_dim = THTensor_sizeLegacyNoScalars ( t , dimension ) ; <nl> <nl> void THTensor_ ( topk ) ( THTensor * rt_ , THLongTensor * ri_ , THTensor * t , int64_t k , i <nl> THLongTensor_resize1d ( tmpIndices , sliceSize ) ; <nl> int64_t * tmpi__data = THLongTensor_data ( tmpIndices ) ; <nl> <nl> - THLongStorage * topKSize = THTensor_ ( newSizeOf ) ( t ) ; <nl> - THLongStorage_set ( topKSize , dim , k ) ; <nl> - THTensor_ ( resize ) ( rt_ , topKSize , NULL ) ; <nl> - THLongTensor_resize ( ri_ , topKSize , NULL ) ; <nl> - THLongStorage_free ( topKSize ) ; <nl> + std : : vector < int64_t > topKSize = t - > sizes ( ) . vec ( ) ; <nl> + topKSize [ dim ] = k ; <nl> + THTensor_ ( resize ) ( rt_ , topKSize , { } ) ; <nl> + THLongTensor_resize ( ri_ , topKSize , { } ) ; <nl> <nl> if ( dir ) { <nl> / * k largest elements , descending order ( optional : see sorted ) * / <nl> void THTensor_ ( catArray ) ( THTensor * result , THTensor * * inputs , int numInputs , int <nl> } <nl> <nl> / / Compute the size of the result <nl> - THLongStorage * size = THLongStorage_newWithSize ( nDims ) ; <nl> + std : : vector < int64_t > size ( nDims ) ; <nl> for ( int dim = 0 ; dim < nDims ; dim + + ) { <nl> int64_t result_dim_size = notSkippedTensor - > size ( dim ) ; <nl> if ( dim = = dimension ) { <nl> result_dim_size = cat_dim_size ; <nl> } <nl> - THLongStorage_data ( size ) [ dim ] = result_dim_size ; <nl> + size [ dim ] = result_dim_size ; <nl> } <nl> - THTensor_ ( resize ) ( result , size , NULL ) ; <nl> + THTensor_ ( resize ) ( result , size , { } ) ; <nl> <nl> / / Check contiguity of all inputs and result <nl> bool allContiguous = true ; <nl> void THTensor_ ( catArray ) ( THTensor * result , THTensor * * inputs , int numInputs , int <nl> } <nl> } <nl> } <nl> - THLongStorage_free ( size ) ; <nl> } <nl> <nl> int THTensor_ ( equal ) ( THTensor * ta , THTensor * tb ) <nl> int THTensor_ ( logicalAnyAll ) ( THTensor * tensor ) <nl> <nl> void THTensor_ ( logicalAnd ) ( THTensor * r_ , THTensor * t , int dimension , int keepdim ) <nl> { <nl> - THLongStorage * dim ; <nl> - <nl> THArgCheck ( dimension > = 0 & & dimension < THTensor_ ( nDimensionLegacyAll ) ( t ) , 2 , " dimension % d out of range " , <nl> dimension + TH_INDEX_BASE ) ; <nl> <nl> THTensor_ ( preserveReduceDimSemantics ) ( r_ , THTensor_ ( nDimensionLegacyAll ) ( t ) , dimension , keepdim ) ; <nl> - dim = THTensor_ ( newSizeOf ) ( t ) ; <nl> - THLongStorage_set ( dim , dimension , 1 ) ; <nl> - THTensor_ ( resize ) ( r_ , dim , NULL ) ; <nl> - THLongStorage_free ( dim ) ; <nl> + std : : vector < int64_t > dim = t - > sizes ( ) . vec ( ) ; <nl> + dim [ dimension ] = 1 ; <nl> + THTensor_ ( resize ) ( r_ , dim , { } ) ; <nl> <nl> int serial_path = 0 ; <nl> # ifdef _OPENMP <nl> void THTensor_ ( logicalAnd ) ( THTensor * r_ , THTensor * t , int dimension , int keepdim <nl> <nl> void THTensor_ ( logicalAny ) ( THTensor * r_ , THTensor * t , int dimension , int keepdim ) <nl> { <nl> - THLongStorage * dim ; <nl> - <nl> THArgCheck ( dimension > = 0 & & dimension < THTensor_ ( nDimensionLegacyAll ) ( t ) , 2 , " dimension % d out of range " , <nl> dimension + TH_INDEX_BASE ) ; <nl> <nl> THTensor_ ( preserveReduceDimSemantics ) ( r_ , THTensor_ ( nDimensionLegacyAll ) ( t ) , dimension , keepdim ) ; <nl> - dim = THTensor_ ( newSizeOf ) ( t ) ; <nl> - THLongStorage_set ( dim , dimension , 1 ) ; <nl> - THTensor_ ( resize ) ( r_ , dim , NULL ) ; <nl> - THLongStorage_free ( dim ) ; <nl> + std : : vector < int64_t > dim = t - > sizes ( ) . vec ( ) ; <nl> + dim [ dimension ] = 1 ; <nl> + THTensor_ ( resize ) ( r_ , dim , { } ) ; <nl> <nl> int serial_path = 0 ; <nl> # ifdef _OPENMP <nl> void THTensor_ ( mean ) ( THTensor * r_ , THTensor * t , int dimension , int keepdim ) <nl> <nl> void THTensor_ ( std ) ( THTensor * r_ , THTensor * t , int dimension , int biased , int keepdim ) <nl> { <nl> - THLongStorage * dim ; <nl> - <nl> THArgCheck ( dimension > = 0 & & dimension < THTensor_ ( nDimensionLegacyAll ) ( t ) , 3 , " invalid dimension % d " , <nl> dimension + TH_INDEX_BASE ) ; <nl> <nl> THTensor_ ( preserveReduceDimSemantics ) ( r_ , THTensor_ ( nDimensionLegacyAll ) ( t ) , dimension , keepdim ) ; <nl> - dim = THTensor_ ( newSizeOf ) ( t ) ; <nl> - THLongStorage_set ( dim , dimension , 1 ) ; <nl> - THTensor_ ( resize ) ( r_ , dim , NULL ) ; <nl> - THLongStorage_free ( dim ) ; <nl> + std : : vector < int64_t > dim = t - > sizes ( ) . vec ( ) ; <nl> + dim [ dimension ] = 1 ; <nl> + THTensor_ ( resize ) ( r_ , dim , { } ) ; <nl> <nl> TH_TENSOR_DIM_APPLY2 ( real , t , real , r_ , dimension , <nl> / / Uses Welford ' s algorithm for numeric stability <nl> void THTensor_ ( std ) ( THTensor * r_ , THTensor * t , int dimension , int biased , int ke <nl> <nl> void THTensor_ ( var ) ( THTensor * r_ , THTensor * t , int dimension , int biased , int keepdim ) <nl> { <nl> - THLongStorage * dim ; <nl> - <nl> THArgCheck ( dimension > = 0 & & dimension < THTensor_ ( nDimensionLegacyAll ) ( t ) , 3 , " invalid dimension % d " , <nl> dimension + TH_INDEX_BASE ) ; <nl> <nl> THTensor_ ( preserveReduceDimSemantics ) ( r_ , THTensor_ ( nDimensionLegacyAll ) ( t ) , dimension , keepdim ) ; <nl> - dim = THTensor_ ( newSizeOf ) ( t ) ; <nl> - THLongStorage_set ( dim , dimension , 1 ) ; <nl> - THTensor_ ( resize ) ( r_ , dim , NULL ) ; <nl> - THLongStorage_free ( dim ) ; <nl> + std : : vector < int64_t > dim = t - > sizes ( ) . vec ( ) ; <nl> + dim [ dimension ] = 1 ; <nl> + THTensor_ ( resize ) ( r_ , dim , { } ) ; <nl> <nl> TH_TENSOR_DIM_APPLY2 ( real , t , real , r_ , dimension , <nl> / / Uses Welford ' s algorithm for numeric stability <nl> void THTensor_ ( var ) ( THTensor * r_ , THTensor * t , int dimension , int biased , int ke <nl> <nl> void THTensor_ ( norm ) ( THTensor * r_ , THTensor * t , real value , int dimension , int keepdim ) <nl> { <nl> - THLongStorage * dim ; <nl> - <nl> THArgCheck ( dimension > = 0 & & dimension < THTensor_ ( nDimensionLegacyAll ) ( t ) , 3 , " invalid dimension % d " , <nl> dimension + TH_INDEX_BASE ) ; <nl> <nl> THTensor_ ( preserveReduceDimSemantics ) ( r_ , THTensor_ ( nDimensionLegacyAll ) ( t ) , dimension , keepdim ) ; <nl> - dim = THTensor_ ( newSizeOf ) ( t ) ; <nl> - THLongStorage_set ( dim , dimension , 1 ) ; <nl> - THTensor_ ( resize ) ( r_ , dim , NULL ) ; <nl> - THLongStorage_free ( dim ) ; <nl> + std : : vector < int64_t > dim = t - > sizes ( ) . vec ( ) ; <nl> + dim [ dimension ] = 1 ; <nl> + THTensor_ ( resize ) ( r_ , dim , { } ) ; <nl> <nl> # define DIM_REDUCE ( reduce , transform ) \ <nl> TH_TENSOR_DIM_APPLY2 ( real , t , real , r_ , dimension , \ <nl> mmm a / aten / src / THC / CMakeLists . txt <nl> ppp b / aten / src / THC / CMakeLists . txt <nl> INSTALL ( FILES <nl> generic / THCTensor . cpp <nl> generic / THCTensor . cu <nl> generic / THCTensor . h <nl> + generic / THCTensor . hpp <nl> generic / THCStorageCopy . cpp <nl> generic / THCStorageCopy . cu <nl> generic / THCStorageCopy . h <nl> mmm a / aten / src / THC / THCReduce . cuh <nl> ppp b / aten / src / THC / THCReduce . cuh <nl> bool THC_reduceDim ( THCState * state , <nl> state , out , THCTensor_nDimensionLegacyAll ( state , in ) , dim , keepdim ) ; <nl> <nl> / / Resize out <nl> - THLongStorage * sizes = THCTensor_newSizeOf ( state , in ) ; <nl> - THLongStorage_set ( sizes , dim , 1 ) ; <nl> - THCTensor_resize ( state , out , sizes , NULL ) ; <nl> - THLongStorage_free ( sizes ) ; <nl> + std : : vector < int64_t > sizes = in - > sizes ( ) . vec ( ) ; <nl> + sizes [ dim ] = 1 ; <nl> + THCTensor_resize ( state , out , sizes , { } ) ; <nl> <nl> / / It is possible that the tensor dimensions are able to be collapsed , <nl> / / and thus we can reduce the actual code complexity of the copy by <nl> mmm a / aten / src / THC / THCTensor . cpp <nl> ppp b / aten / src / THC / THCTensor . cpp <nl> int64_t THCTensor_strideLegacyNoScalars ( THCState * state , const THCTensor * self , <nl> return THTensor_strideLegacyNoScalars ( self , dim ) ; <nl> } <nl> <nl> - THLongStorage * THCTensor_newSizeOf ( THCState * state , THCTensor * self ) { <nl> - THLongStorage * size = THLongStorage_newWithSize ( self - > dim ( ) ) ; <nl> - THLongStorage_rawCopy ( size , THTensor_getSizePtr ( self ) ) ; <nl> - return size ; <nl> - } <nl> - <nl> THCTensor * THCTensor_new ( THCState * state , at : : ScalarType scalar_type ) { <nl> switch ( scalar_type ) { <nl> case at : : ScalarType : : Byte : <nl> THCTensor * THCTensor_new ( THCState * state , at : : ScalarType scalar_type ) { <nl> } <nl> } <nl> <nl> - void THCTensor_resize ( THCState * state , THCTensor * self , THLongStorage * size , THLongStorage * stride ) { <nl> - THArgCheck ( size ! = NULL , 2 , " invalid size " ) ; <nl> - if ( stride ) <nl> - THArgCheck ( stride - > size ( ) = = size - > size ( ) , 3 , " invalid stride " ) ; <nl> + void THCTensor_resize ( THCState * state , THCTensor * self , at : : IntList size , at : : IntList stride ) { <nl> + THArgCheck ( size . data ( ) ! = NULL , 2 , " invalid size " ) ; <nl> + if ( stride . data ( ) ) <nl> + THArgCheck ( stride . size ( ) = = size . size ( ) , 3 , " invalid stride " ) ; <nl> <nl> - THCTensor_resizeNd ( state , self , size - > size ( ) , THLongStorage_data ( size ) , ( stride ? THLongStorage_data ( stride ) : NULL ) ) ; <nl> + # ifdef DEBUG <nl> + THAssert ( size . size ( ) < = INT_MAX ) ; <nl> + # endif <nl> + THCTensor_resizeNd ( state , self , size . size ( ) , size . data ( ) , stride . data ( ) ) ; <nl> } <nl> <nl> void THCTensor_resizeAs ( THCState * state , THCTensor * self , THCTensor * src ) { <nl> void THCTensor_resizeAs ( THCState * state , THCTensor * self , THCTensor * src ) { <nl> THCTensor_resizeNd ( state , self , src - > dim ( ) , THTensor_getSizePtr ( src ) , NULL ) ; <nl> } <nl> <nl> - void THCTensor_resizeNd ( THCState * state , THCTensor * self , int nDimension , int64_t * size , int64_t * stride ) <nl> + void THCTensor_resizeNd ( THCState * state , THCTensor * self , int nDimension , const int64_t * size , const int64_t * stride ) <nl> { <nl> int d ; <nl> ptrdiff_t totalSize ; <nl> void THCTensor_set ( THCState * state , THCTensor * self , THCTensor * src ) <nl> THTensor_getStridePtr ( src ) ) ; <nl> } <nl> <nl> - void THCTensor_setStorageNd ( THCState * state , THCTensor * self , THCStorage * storage , ptrdiff_t storageOffset , int nDimension , int64_t * size , int64_t * stride ) <nl> + void THCTensor_setStorage ( THCState * state , THCTensor * self , THCStorage * storage_ , ptrdiff_t storageOffset_ , at : : IntList size_ , at : : IntList stride_ ) <nl> + { <nl> + if ( size_ . data ( ) & & stride_ . data ( ) ) <nl> + THArgCheck ( size_ . size ( ) = = stride_ . size ( ) , 5 , " inconsistent size / stride sizes " ) ; <nl> + <nl> + AT_CHECK ( size_ . data ( ) , " size must not be null " ) ; <nl> + THCTensor_setStorageNd ( state , <nl> + self , <nl> + storage_ , <nl> + storageOffset_ , <nl> + size_ . size ( ) , <nl> + size_ . data ( ) , <nl> + stride_ . data ( ) ) ; <nl> + } <nl> + <nl> + void THCTensor_setStorageNd ( THCState * state , THCTensor * self , THCStorage * storage , ptrdiff_t storageOffset , int nDimension , const int64_t * size , const int64_t * stride ) <nl> { <nl> / * storage * / <nl> if ( THTensor_getStoragePtr ( self ) ! = storage ) <nl> mmm a / aten / src / THC / THCTensor . hpp <nl> ppp b / aten / src / THC / THCTensor . hpp <nl> THC_API int64_t THCTensor_size ( THCState * state , const THCTensor * self , int dim ) ; <nl> THC_API int64_t THCTensor_sizeLegacyNoScalars ( THCState * state , const THCTensor * self , int dim ) ; <nl> THC_API int64_t THCTensor_stride ( THCState * state , const THCTensor * self , int dim ) ; <nl> THC_API int64_t THCTensor_strideLegacyNoScalars ( THCState * state , const THCTensor * self , int dim ) ; <nl> - THC_API THLongStorage * THCTensor_newSizeOf ( THCState * state , THCTensor * self ) ; <nl> <nl> THC_API THCTensor * THCTensor_new ( THCState * state , at : : ScalarType scalar_type ) ; <nl> <nl> - THC_API void THCTensor_resize ( THCState * state , THCTensor * tensor , THLongStorage * size , THLongStorage * stride ) ; <nl> - THC_API void THCTensor_resizeNd ( THCState * state , THCTensor * tensor , int nDimension , int64_t * size , int64_t * stride ) ; <nl> + THC_API void THCTensor_resize ( THCState * state , THCTensor * tensor , at : : IntList size , at : : IntList stride ) ; <nl> + THC_API void THCTensor_resizeNd ( THCState * state , THCTensor * tensor , int nDimension , const int64_t * size , const int64_t * stride ) ; <nl> THC_API void THCTensor_resizeAs ( THCState * state , THCTensor * tensor , THCTensor * src ) ; <nl> <nl> THC_API void THCTensor_set ( THCState * state , THCTensor * self , THCTensor * src ) ; <nl> - THC_API void THCTensor_setStorageNd ( THCState * state , THCTensor * self , THCStorage * storage , ptrdiff_t storageOffset , int nDimension , int64_t * size , int64_t * stride ) ; <nl> + THC_API void THCTensor_setStorage ( THCState * state , THCTensor * self , THCStorage * storage_ , ptrdiff_t storageOffset_ , at : : IntList size_ , at : : IntList stride_ ) ; <nl> + THC_API void THCTensor_setStorageNd ( THCState * state , THCTensor * self , THCStorage * storage , ptrdiff_t storageOffset , int nDimension , const int64_t * size , const int64_t * stride ) ; <nl> <nl> THC_API void THCTensor_squeeze1d ( THCState * state , THCTensor * self , THCTensor * src , int dimension_ ) ; <nl> THC_API void THCTensor_unsqueeze1d ( THCState * state , THCTensor * self , THCTensor * src , int dimension_ ) ; <nl> THC_API void THCTensor_preserveReduceDimSemantics ( THCState * state , THCTensor * te <nl> / * has more than one index that references the same datapoint , * / <nl> / * true otherwise . * / <nl> THC_API bool THCTensor_maybeOverlappingIndices ( THCState * state , const THCTensor * t ) ; <nl> + <nl> + # include " generic / THCTensor . hpp " <nl> + # include " THCGenerateAllTypes . h " <nl> mmm a / aten / src / THC / THCTensorMathCompare . cuh <nl> ppp b / aten / src / THC / THCTensorMathCompare . cuh <nl> void THC_logicalValue ( THCState * state , <nl> TensorTypeOut * self_ , <nl> TensorType * src , <nl> Op op ) { <nl> - THLongStorage * st = THCTensor_newSizeOf ( state , src ) ; <nl> - THCTensor_resize ( state , self_ , st , NULL ) ; <nl> - THLongStorage_free ( st ) ; <nl> + THCTensor_resize ( state , self_ , src - > sizes ( ) , { } ) ; <nl> <nl> if ( ! THC_pointwiseApply2 < ScalarTypeOut , ScalarType > ( state , self_ , src , op ) ) { <nl> THArgCheck ( false , 2 , CUTORCH_DIM_WARNING ) ; <nl> mmm a / aten / src / THC / THCTensorMathCompareT . cuh <nl> ppp b / aten / src / THC / THCTensorMathCompareT . cuh <nl> void THC_logicalTensor ( THCState * state , <nl> TensorType * src1 , <nl> TensorType * src2 , <nl> Op op ) { <nl> - THLongStorage * st = THCTensor_newSizeOf ( state , src1 ) ; <nl> - THCTensor_resize ( state , self_ , st , NULL ) ; <nl> - THLongStorage_free ( st ) ; <nl> + THCTensor_resize ( state , self_ , src1 - > sizes ( ) , { } ) ; <nl> <nl> THArgCheck ( THCTensor_nElement ( state , src1 ) = = <nl> THCTensor_nElement ( state , src2 ) , 3 , <nl> mmm a / aten / src / THC / THCTensorMathReduce . cuh <nl> ppp b / aten / src / THC / THCTensorMathReduce . cuh <nl> THC_reduceDimIndex ( THCState * state , <nl> THCTensor_preserveReduceDimSemantics ( <nl> state , tgt2_ , src_dims , dimension , keepdim ) ; <nl> <nl> - THLongStorage * dim = THCTensor_newSizeOf ( state , src ) ; <nl> - THLongStorage_set ( dim , dimension , 1 ) ; <nl> - THCTensor_resize ( state , tgt1_ , dim , NULL ) ; <nl> - THCTensor_resize ( state , tgt2_ , dim , NULL ) ; <nl> - THLongStorage_free ( dim ) ; <nl> + std : : vector < int64_t > dim = src - > sizes ( ) . vec ( ) ; <nl> + dim [ dimension ] = 1 ; <nl> + THCTensor_resize ( state , tgt1_ , dim , { } ) ; <nl> + THCTensor_resize ( state , tgt2_ , dim , { } ) ; <nl> <nl> TensorTypeK * tgt1 = ( TensorTypeK * ) THCTensor_newContiguous < ScalarTypeK > ( state , tgt1_ ) ; <nl> TensorTypeIndex * tgt2 = ( TensorTypeIndex * ) THCTensor_newContiguous < ScalarTypeIndex > ( state , tgt2_ ) ; <nl> mmm a / aten / src / THC / generic / THCTensor . cpp <nl> ppp b / aten / src / THC / generic / THCTensor . cpp <nl> <nl> # define THC_GENERIC_FILE " generic / THCTensor . cpp " <nl> # else <nl> <nl> + # include < ATen / InferSize . h > <nl> + <nl> / * * * * access methods * * * * / <nl> THCStorage * THCTensor_ ( storage ) ( THCState * state , const THCTensor * self ) <nl> { <nl> int64_t THCTensor_ ( strideLegacyNoScalars ) ( THCState * state , const THCTensor * self <nl> return THTensor_strideLegacyNoScalars ( self , dim ) ; <nl> } <nl> <nl> - THLongStorage * THCTensor_ ( newSizeOf ) ( THCState * state , THCTensor * self ) <nl> - { <nl> - return THCTensor_newSizeOf ( state , self ) ; <nl> - } <nl> - <nl> - THLongStorage * THCTensor_ ( newStrideOf ) ( THCState * state , THCTensor * self ) <nl> - { <nl> - THLongStorage * stride = THLongStorage_newWithSize ( self - > dim ( ) ) ; <nl> - THLongStorage_rawCopy ( stride , THTensor_getStridePtr ( self ) ) ; <nl> - return stride ; <nl> - } <nl> - <nl> real * THCTensor_ ( data ) ( THCState * state , const THCTensor * self ) <nl> { <nl> if ( THTensor_getStoragePtr ( self ) ) <nl> THCTensor * THCTensor_ ( newWithTensor ) ( THCState * state , THCTensor * tensor ) <nl> } <nl> <nl> / * Storage init * / <nl> - THCTensor * THCTensor_ ( newWithStorage ) ( THCState * state , THCStorage * storage , ptrdiff_t storageOffset , THLongStorage * size , THLongStorage * stride ) <nl> - { <nl> - if ( size & & stride ) <nl> - THArgCheck ( size - > size ( ) = = stride - > size ( ) , 4 , " inconsistent size " ) ; <nl> - <nl> - AT_CHECK ( size , " size must not be null " ) ; <nl> - THCTensor * self = new THCTensor ( THCStorage_ ( new ) ( state ) ) ; <nl> - THCTensor_ ( setStorageNd ) ( state , <nl> - self , <nl> - storage , <nl> - storageOffset , <nl> - size - > size ( ) , <nl> - THLongStorage_data ( size ) , <nl> - ( stride ? THLongStorage_data ( stride ) : NULL ) ) ; <nl> - <nl> - return self ; <nl> - } <nl> - <nl> - THCTensor * THCTensor_ ( newWithStorageIntLists ) ( THCState * state , THCStorage * storage , ptrdiff_t storageOffset , at : : IntList sizes , at : : IntList strides ) { <nl> - AT_CHECK ( sizes . size ( ) = = strides . size ( ) , " number of sizes and strides must match " ) ; <nl> + THCTensor * THCTensor_ ( newWithStorage ) ( THCState * state , THCStorage * storage , ptrdiff_t storageOffset , at : : IntList sizes , at : : IntList strides ) { <nl> + if ( sizes . data ( ) & & strides . data ( ) ) { <nl> + AT_CHECK ( sizes . size ( ) = = strides . size ( ) , " number of sizes and strides must match " ) ; <nl> + } <nl> + AT_CHECK ( sizes . data ( ) , " size must not be null " ) ; <nl> THCTensor * self = new THCTensor ( THCStorage_ ( new ) ( state ) ) ; <nl> THCTensor_ ( setStorageNd ) ( state , self , storage , storageOffset , sizes . size ( ) , <nl> const_cast < int64_t * > ( sizes . data ( ) ) , const_cast < int64_t * > ( strides . data ( ) ) ) ; <nl> THCTensor * THCTensor_ ( newWithStorageIntLists ) ( THCState * state , THCStorage * stora <nl> THCTensor * THCTensor_ ( newWithStorage1d ) ( THCState * state , THCStorage * storage , ptrdiff_t storageOffset , <nl> int64_t size0 , int64_t stride0 ) <nl> { <nl> - return THCTensor_ ( newWithStorageIntLists ) ( state , storage , storageOffset , { size0 } , { stride0 } ) ; <nl> + return THCTensor_ ( newWithStorage ) ( state , storage , storageOffset , { size0 } , { stride0 } ) ; <nl> } <nl> <nl> THCTensor * THCTensor_ ( newWithStorage2d ) ( THCState * state , THCStorage * storage , ptrdiff_t storageOffset , <nl> int64_t size0 , int64_t stride0 , <nl> int64_t size1 , int64_t stride1 ) <nl> { <nl> - return THCTensor_ ( newWithStorageIntLists ) ( state , storage , storageOffset , { size0 , size1 } , { stride0 , stride1 } ) ; <nl> + return THCTensor_ ( newWithStorage ) ( state , storage , storageOffset , { size0 , size1 } , { stride0 , stride1 } ) ; <nl> } <nl> <nl> THCTensor * THCTensor_ ( newWithStorage3d ) ( THCState * state , THCStorage * storage , ptrdiff_t storageOffset , <nl> THCTensor * THCTensor_ ( newWithStorage3d ) ( THCState * state , THCStorage * storage , pt <nl> int64_t size1 , int64_t stride1 , <nl> int64_t size2 , int64_t stride2 ) <nl> { <nl> - return THCTensor_ ( newWithStorageIntLists ) ( state , storage , storageOffset , { size0 , size1 , size2 } , { stride0 , stride1 , stride2 } ) ; <nl> + return THCTensor_ ( newWithStorage ) ( state , storage , storageOffset , { size0 , size1 , size2 } , { stride0 , stride1 , stride2 } ) ; <nl> } <nl> <nl> THCTensor * THCTensor_ ( newWithStorage4d ) ( THCState * state , THCStorage * storage , ptrdiff_t storageOffset , <nl> THCTensor * THCTensor_ ( newWithStorage4d ) ( THCState * state , THCStorage * storage , pt <nl> int64_t size2 , int64_t stride2 , <nl> int64_t size3 , int64_t stride3 ) <nl> { <nl> - return THCTensor_ ( newWithStorageIntLists ) ( state , storage , storageOffset , <nl> + return THCTensor_ ( newWithStorage ) ( state , storage , storageOffset , <nl> { size0 , size1 , size2 , size3 } , <nl> { stride0 , stride1 , stride2 , stride3 } ) ; <nl> } <nl> <nl> - THCTensor * THCTensor_ ( newWithSize ) ( THCState * state , THLongStorage * size , THLongStorage * stride ) <nl> + THCTensor * THCTensor_ ( newWithSize ) ( THCState * state , at : : IntList size , at : : IntList stride ) <nl> { <nl> return THCTensor_ ( newWithStorage ) ( state , NULL , 0 , size , stride ) ; <nl> } <nl> <nl> - THCTensor * THCTensor_ ( newWithSizeIntList ) ( THCState * state , at : : IntList sizes ) { <nl> - THCTensor * self = new THCTensor ( THCStorage_ ( new ) ( state ) ) ; <nl> - THCTensor_ ( resizeNd ) ( state , self , sizes . size ( ) , const_cast < int64_t * > ( sizes . data ( ) ) , nullptr ) ; <nl> - <nl> - return self ; <nl> - } <nl> - <nl> THCTensor * THCTensor_ ( newWithSize1d ) ( THCState * state , int64_t size0 ) <nl> { <nl> - return THCTensor_ ( newWithSizeIntList ) ( state , { size0 } ) ; <nl> + return THCTensor_ ( newWithSize ) ( state , { size0 } , { } ) ; <nl> } <nl> <nl> THCTensor * THCTensor_ ( newWithSize2d ) ( THCState * state , int64_t size0 , int64_t size1 ) <nl> { <nl> - return THCTensor_ ( newWithSizeIntList ) ( state , { size0 , size1 } ) ; <nl> + return THCTensor_ ( newWithSize ) ( state , { size0 , size1 } , { } ) ; <nl> } <nl> <nl> THCTensor * THCTensor_ ( newWithSize3d ) ( THCState * state , int64_t size0 , int64_t size1 , int64_t size2 ) <nl> { <nl> - return THCTensor_ ( newWithSizeIntList ) ( state , { size0 , size1 , size2 } ) ; <nl> + return THCTensor_ ( newWithSize ) ( state , { size0 , size1 , size2 } , { } ) ; <nl> } <nl> <nl> THCTensor * THCTensor_ ( newWithSize4d ) ( THCState * state , int64_t size0 , int64_t size1 , int64_t size2 , int64_t size3 ) <nl> { <nl> - return THCTensor_ ( newWithSizeIntList ) ( state , { size0 , size1 , size2 , size3 } ) ; <nl> + return THCTensor_ ( newWithSize ) ( state , { size0 , size1 , size2 , size3 } , { } ) ; <nl> } <nl> <nl> THCTensor * THCTensor_ ( newClone ) ( THCState * state , THCTensor * self ) <nl> THCTensor * THCTensor_ ( newUnfold ) ( THCState * state , THCTensor * tensor , int dimensi <nl> return self ; <nl> } <nl> <nl> - THCTensor * THCTensor_ ( newView ) ( THCState * state , THCTensor * tensor , THLongStorage * size ) <nl> + THCTensor * THCTensor_ ( newView ) ( THCState * state , THCTensor * tensor , at : : IntList size ) <nl> { <nl> ptrdiff_t numel = THCTensor_ ( nElement ) ( state , tensor ) ; <nl> THCTensor * self = THCTensor_ ( new ) ( state ) ; <nl> - THLongStorage * inferred_size = THLongStorage_newInferSize ( size , numel ) ; <nl> + auto inferred_size = at : : infer_size ( size , numel ) ; <nl> auto stride = THTensor_compute_stride ( tensor - > sizes ( ) , <nl> tensor - > strides ( ) , <nl> - at : : IntList ( inferred_size - > data < int64_t > ( ) , inferred_size - > size ( ) ) ) ; <nl> + inferred_size ) ; <nl> THArgCheck ( stride . has_value ( ) , 2 , " view size is " <nl> " not compatible with input tensor ' s size and stride ( at least one dimension spans " <nl> " across two contiguous subspaces ) . Call . contiguous ( ) before . view ( ) . " ) ; <nl> auto stride_value = * stride ; <nl> - THLongStorage * new_stride = THLongStorage_newWithSize ( stride_value . size ( ) ) ; <nl> - THLongStorage_rawCopy ( new_stride , stride_value . data ( ) ) ; <nl> - THCTensor_ ( setStorage ) ( state , self , THTensor_getStoragePtr ( tensor ) , tensor - > storage_offset ( ) , inferred_size , new_stride ) ; <nl> - THLongStorage_free ( inferred_size ) ; <nl> - THLongStorage_free ( new_stride ) ; <nl> + THCTensor_setStorage ( state , self , THTensor_getStoragePtr ( tensor ) , tensor - > storage_offset ( ) , inferred_size , stride_value ) ; <nl> return self ; <nl> } <nl> <nl> THCTensor * THCTensor_ ( newFoldBatchDim ) ( THCState * state , THCTensor * input ) { <nl> THArgCheck ( in_dims > = 2 , 1 , " Tensor needs to have at least two dimensions " ) ; <nl> THArgCheck ( THCTensor_ ( isContiguous ) ( state , input ) , 1 , <nl> " Tensor must be contiguous " ) ; <nl> - THLongStorage * newSize = THLongStorage_newWithSize ( in_dims - 1 ) ; <nl> - THLongStorage_data ( newSize ) [ 0 ] = THCTensor_ ( size ) ( state , input , 0 ) * THCTensor_ ( size ) ( state , input , 1 ) ; <nl> + std : : vector < int64_t > new_size ( in_dims - 1 ) ; <nl> + new_size [ 0 ] = THCTensor_ ( size ) ( state , input , 0 ) * THCTensor_ ( size ) ( state , input , 1 ) ; <nl> for ( int i = 2 ; i < in_dims ; i + + ) { <nl> - THLongStorage_data ( newSize ) [ i - 1 ] = THCTensor_ ( size ) ( state , input , i ) ; <nl> + new_size [ i - 1 ] = THCTensor_ ( size ) ( state , input , i ) ; <nl> } <nl> - THCTensor * output = THCTensor_ ( newView ) ( state , input , newSize ) ; <nl> - THLongStorage_free ( newSize ) ; <nl> + THCTensor * output = THCTensor_ ( newView ) ( state , input , new_size ) ; <nl> return output ; <nl> } <nl> <nl> / * Resize * / <nl> - void THCTensor_ ( resize ) ( THCState * state , THCTensor * self , THLongStorage * size , THLongStorage * stride ) <nl> + void THCTensor_ ( resize ) ( THCState * state , THCTensor * self , at : : IntList size , at : : IntList stride ) <nl> { <nl> THCTensor_resize ( state , self , size , stride ) ; <nl> } <nl> void THCTensor_ ( set ) ( THCState * state , THCTensor * self , THCTensor * src ) <nl> THCTensor_set ( state , self , src ) ; <nl> } <nl> <nl> - void THCTensor_ ( setStorage ) ( THCState * state , THCTensor * self , THCStorage * storage_ , ptrdiff_t storageOffset_ , THLongStorage * size_ , THLongStorage * stride_ ) <nl> - { <nl> - if ( size_ & & stride_ ) <nl> - THArgCheck ( size_ - > size ( ) = = stride_ - > size ( ) , 5 , " inconsistent size / stride sizes " ) ; <nl> - <nl> - AT_CHECK ( size_ , " size must not be null " ) ; <nl> - THCTensor_ ( setStorageNd ) ( state , <nl> - self , <nl> - storage_ , <nl> - storageOffset_ , <nl> - size_ - > size ( ) , <nl> - THLongStorage_data ( size_ ) , <nl> - ( stride_ ? THLongStorage_data ( stride_ ) : NULL ) ) ; <nl> - } <nl> - <nl> - void THCTensor_ ( setStorageIntLists ) ( THCState * state , THCTensor * self , THCStorage * storage_ , ptrdiff_t storageOffset_ , <nl> - at : : IntList sizes , at : : IntList strides ) <nl> - { <nl> - AT_CHECK ( sizes . size ( ) = = strides . size ( ) , " number of sizes and strides must match " ) ; <nl> - <nl> - THCTensor_ ( setStorageNd ) ( state , self , storage_ , storageOffset_ , sizes . size ( ) , <nl> - const_cast < int64_t * > ( sizes . data ( ) ) , const_cast < int64_t * > ( strides . data ( ) ) ) ; <nl> + void THCTensor_ ( setStorage ) ( THCState * state , THCTensor * self , THCStorage * storage_ , ptrdiff_t storageOffset_ , at : : IntList size_ , at : : IntList stride_ ) { <nl> + THCTensor_setStorage ( state , self , storage_ , storageOffset_ , size_ , stride_ ) ; <nl> } <nl> <nl> void THCTensor_ ( setStorage1d ) ( THCState * state , THCTensor * self , THCStorage * storage_ , ptrdiff_t storageOffset_ , <nl> int64_t size0_ , int64_t stride0_ ) <nl> { <nl> - THCTensor_ ( setStorageIntLists ) ( state , self , storage_ , storageOffset_ , <nl> - { size0_ } , { stride0_ } ) ; <nl> + THCTensor_ ( setStorage ) ( state , self , storage_ , storageOffset_ , <nl> + { size0_ } , { stride0_ } ) ; <nl> } <nl> <nl> void THCTensor_ ( setStorage2d ) ( THCState * state , THCTensor * self , THCStorage * storage_ , ptrdiff_t storageOffset_ , <nl> int64_t size0_ , int64_t stride0_ , <nl> int64_t size1_ , int64_t stride1_ ) <nl> { <nl> - THCTensor_ ( setStorageIntLists ) ( state , self , storage_ , storageOffset_ , <nl> - { size0_ , size1_ } , <nl> - { stride0_ , stride1_ } ) ; <nl> + THCTensor_ ( setStorage ) ( state , self , storage_ , storageOffset_ , <nl> + { size0_ , size1_ } , <nl> + { stride0_ , stride1_ } ) ; <nl> } <nl> <nl> void THCTensor_ ( setStorage3d ) ( THCState * state , THCTensor * self , THCStorage * storage_ , ptrdiff_t storageOffset_ , <nl> void THCTensor_ ( setStorage3d ) ( THCState * state , THCTensor * self , THCStorage * stor <nl> int64_t size1_ , int64_t stride1_ , <nl> int64_t size2_ , int64_t stride2_ ) <nl> { <nl> - THCTensor_ ( setStorageIntLists ) ( state , self , storage_ , storageOffset_ , <nl> - { size0_ , size1_ , size2_ } , <nl> - { stride0_ , stride1_ , stride2_ } ) ; <nl> + THCTensor_ ( setStorage ) ( state , self , storage_ , storageOffset_ , <nl> + { size0_ , size1_ , size2_ } , <nl> + { stride0_ , stride1_ , stride2_ } ) ; <nl> } <nl> <nl> void THCTensor_ ( setStorage4d ) ( THCState * state , THCTensor * self , THCStorage * storage_ , ptrdiff_t storageOffset_ , <nl> void THCTensor_ ( setStorage4d ) ( THCState * state , THCTensor * self , THCStorage * stor <nl> int64_t size [ 4 ] = { size0_ , size1_ , size2_ , size3_ } ; <nl> int64_t stride [ 4 ] = { stride0_ , stride1_ , stride2_ , stride3_ } ; <nl> <nl> - THCTensor_ ( setStorageIntLists ) ( state , self , storage_ , storageOffset_ , size , stride ) ; <nl> + THCTensor_ ( setStorage ) ( state , self , storage_ , storageOffset_ , size , stride ) ; <nl> } <nl> <nl> <nl> mmm a / aten / src / THC / generic / THCTensor . h <nl> ppp b / aten / src / THC / generic / THCTensor . h <nl> THC_API int64_t THCTensor_ ( size ) ( THCState * state , const THCTensor * self , int dim <nl> THC_API int64_t THCTensor_ ( sizeLegacyNoScalars ) ( THCState * state , const THCTensor * self , int dim ) ; <nl> THC_API int64_t THCTensor_ ( stride ) ( THCState * state , const THCTensor * self , int dim ) ; <nl> THC_API int64_t THCTensor_ ( strideLegacyNoScalars ) ( THCState * state , const THCTensor * self , int dim ) ; <nl> - THC_API THLongStorage * THCTensor_ ( newSizeOf ) ( THCState * state , THCTensor * self ) ; <nl> - THC_API THLongStorage * THCTensor_ ( newStrideOf ) ( THCState * state , THCTensor * self ) ; <nl> THC_API real * THCTensor_ ( data ) ( THCState * state , const THCTensor * self ) ; <nl> <nl> THC_API void THCTensor_ ( setFlag ) ( THCState * state , THCTensor * self , const char flag ) ; <nl> THC_API void THCTensor_ ( clearFlag ) ( THCState * state , THCTensor * self , const char <nl> / * * * * creation methods * * * * / <nl> THC_API THCTensor * THCTensor_ ( new ) ( THCState * state ) ; <nl> THC_API THCTensor * THCTensor_ ( newWithTensor ) ( THCState * state , THCTensor * tensor ) ; <nl> - / * stride might be NULL * / <nl> - THC_API THCTensor * THCTensor_ ( newWithStorage ) ( THCState * state , THCStorage * storage_ , ptrdiff_t storageOffset_ , THLongStorage * size_ , THLongStorage * stride_ ) ; <nl> THC_API THCTensor * THCTensor_ ( newWithStorage1d ) ( THCState * state , THCStorage * storage_ , ptrdiff_t storageOffset_ , <nl> int64_t size0_ , int64_t stride0_ ) ; <nl> THC_API THCTensor * THCTensor_ ( newWithStorage2d ) ( THCState * state , THCStorage * storage_ , ptrdiff_t storageOffset_ , <nl> THC_API THCTensor * THCTensor_ ( newWithStorage4d ) ( THCState * state , THCStorage * sto <nl> int64_t size3_ , int64_t stride3_ ) ; <nl> <nl> / * stride might be NULL * / <nl> - THC_API THCTensor * THCTensor_ ( newWithSize ) ( THCState * state , THLongStorage * size_ , THLongStorage * stride_ ) ; <nl> THC_API THCTensor * THCTensor_ ( newWithSize1d ) ( THCState * state , int64_t size0_ ) ; <nl> THC_API THCTensor * THCTensor_ ( newWithSize2d ) ( THCState * state , int64_t size0_ , int64_t size1_ ) ; <nl> THC_API THCTensor * THCTensor_ ( newWithSize3d ) ( THCState * state , int64_t size0_ , int64_t size1_ , int64_t size2_ ) ; <nl> THC_API THCTensor * THCTensor_ ( newSelect ) ( THCState * state , THCTensor * tensor , int <nl> THC_API THCTensor * THCTensor_ ( newNarrow ) ( THCState * state , THCTensor * tensor , int dimension_ , int64_t firstIndex_ , int64_t size_ ) ; <nl> THC_API THCTensor * THCTensor_ ( newTranspose ) ( THCState * state , THCTensor * tensor , int dimension1_ , int dimension2_ ) ; <nl> THC_API THCTensor * THCTensor_ ( newUnfold ) ( THCState * state , THCTensor * tensor , int dimension_ , int64_t size_ , int64_t step_ ) ; <nl> - THC_API THCTensor * THCTensor_ ( newView ) ( THCState * state , THCTensor * tensor , THLongStorage * size ) ; <nl> THC_API THCTensor * THCTensor_ ( newFoldBatchDim ) ( THCState * state , THCTensor * input ) ; <nl> <nl> / / resize * methods simply resize the storage . So they may not retain the current data at current indices . <nl> / / This is especially likely to happen when the tensor is not contiguous . In general , if you still need the <nl> / / values , unless you are doing some size and stride tricks , do not use resize * . <nl> - THC_API void THCTensor_ ( resize ) ( THCState * state , THCTensor * tensor , THLongStorage * size , THLongStorage * stride ) ; <nl> THC_API void THCTensor_ ( resizeNd ) ( THCState * state , THCTensor * tensor , int nDimension , int64_t * size , int64_t * stride ) ; <nl> THC_API void THCTensor_ ( resizeAs ) ( THCState * state , THCTensor * tensor , THCTensor * src ) ; <nl> THC_API void THCTensor_ ( resize1d ) ( THCState * state , THCTensor * tensor , int64_t size0_ ) ; <nl> THC_API void THCTensor_ ( resize4d ) ( THCState * state , THCTensor * tensor , int64_t si <nl> THC_API void THCTensor_ ( resize5d ) ( THCState * state , THCTensor * tensor , int64_t size0_ , int64_t size1_ , int64_t size2_ , int64_t size3_ , int64_t size4_ ) ; <nl> <nl> THC_API void THCTensor_ ( set ) ( THCState * state , THCTensor * self , THCTensor * src ) ; <nl> - THC_API void THCTensor_ ( setStorage ) ( THCState * state , THCTensor * self , THCStorage * storage_ , ptrdiff_t storageOffset_ , THLongStorage * size_ , THLongStorage * stride_ ) ; <nl> THC_API void THCTensor_ ( setStorageNd ) ( THCState * state , THCTensor * self , THCStorage * storage , ptrdiff_t storageOffset , int nDimension , int64_t * size , int64_t * stride ) ; <nl> THC_API void THCTensor_ ( setStorage1d ) ( THCState * state , THCTensor * self , THCStorage * storage_ , ptrdiff_t storageOffset_ , <nl> int64_t size0_ , int64_t stride0_ ) ; <nl> new file mode 100644 <nl> index 000000000000 . . fee43d1544c3 <nl> mmm / dev / null <nl> ppp b / aten / src / THC / generic / THCTensor . hpp <nl> <nl> + # ifndef THC_GENERIC_FILE <nl> + # define THC_GENERIC_FILE " generic / THCTensor . hpp " <nl> + # else <nl> + <nl> + / / STOP ! ! ! Thinking of including this header directly ? Please <nl> + / / read Note [ TH abstraction violation ] <nl> + <nl> + / / NOTE : functions exist here only to support dispatch via Declarations . cwrap . You probably don ' t want to put <nl> + / / new functions in here , they should probably be un - genericized . <nl> + <nl> + THC_API void THCTensor_ ( setStorage ) ( THCState * state , THCTensor * self , THCStorage * storage_ , ptrdiff_t storageOffset_ , <nl> + at : : IntList size_ , at : : IntList stride_ ) ; <nl> + THC_API THCTensor * THCTensor_ ( newView ) ( THCState * state , THCTensor * tensor , at : : IntList size ) ; <nl> + / * strides . data ( ) might be nullptr * / <nl> + THC_API THCTensor * THCTensor_ ( newWithStorage ) ( THCState * state , THCStorage * storage , ptrdiff_t storageOffset , <nl> + at : : IntList sizes , at : : IntList strides ) ; <nl> + <nl> + THC_API void THCTensor_ ( resize ) ( THCState * state , THCTensor * self , at : : IntList size , at : : IntList stride ) ; <nl> + THC_API THCTensor * THCTensor_ ( newWithSize ) ( THCState * state , at : : IntList size , at : : IntList stride ) ; <nl> + <nl> + # endif <nl> mmm a / aten / src / THC / generic / THCTensorCopy . cpp <nl> ppp b / aten / src / THC / generic / THCTensorCopy . cpp <nl> void THCTensor_ ( copy # # TYPEC ) ( THCState * state , THCTensor * self , struct TH # # TYPEC # <nl> if ( THCTypeIdx_ ( Real ) = = THCTypeIdx_ ( TYPEC ) ) { \ <nl> THCTensor_ ( copyCPU ) ( state , self , ( THTensor * ) src ) ; / * cast just removes warnings * / \ <nl> } else { \ <nl> - THLongStorage * size = TH # # TYPEC # # Tensor_newSizeOf ( src ) ; \ <nl> - THTensor * srcf = THTensor_ ( newWithSize ) ( size , NULL ) ; \ <nl> + THTensor * srcf = THTensor_ ( newWithSize ) ( src - > sizes ( ) , { } ) ; \ <nl> \ <nl> THTensor_ ( copy # # TYPEC ) ( srcf , src ) ; \ <nl> THCTensor_ ( copyCPU ) ( state , self , srcf ) ; \ <nl> \ <nl> - THLongStorage_free ( size ) ; \ <nl> THTensor_ ( free ) ( srcf ) ; \ <nl> } \ <nl> } <nl> void THTensor_ ( copyCuda ) ( THCState * state , THTensor * self , struct THCTensor * src ) <nl> if ( THCTypeIdx_ ( Real ) = = THCTypeIdx_ ( TYPEC ) ) { \ <nl> THTensor_ ( copyCuda ) ( state , ( THTensor * ) self , src ) ; / * cast just removes compiler warning * / \ <nl> } else { \ <nl> - THLongStorage * size = THCTensor_ ( newSizeOf ) ( state , src ) ; \ <nl> - THTensor * srcf = THTensor_ ( newWithSize ) ( size , NULL ) ; \ <nl> + THTensor * srcf = THTensor_ ( newWithSize ) ( src - > sizes ( ) , { } ) ; \ <nl> \ <nl> THTensor_ ( copyCuda ) ( state , srcf , src ) ; \ <nl> TH_CONCAT_4 ( TH , TYPEC , Tensor_copy , Real ) ( self , srcf ) ; \ <nl> \ <nl> - THLongStorage_free ( size ) ; \ <nl> THTensor_ ( free ) ( srcf ) ; \ <nl> } \ <nl> } <nl> mmm a / aten / src / THC / generic / THCTensorIndex . cu <nl> ppp b / aten / src / THC / generic / THCTensorIndex . cu <nl> void THCTensor_ ( indexSelect ) ( THCState * state , THCTensor * dst , THCTensor * src , in <nl> THArgCheck ( dim < srcDims , 4 , " Indexing dim is out of bounds " ) ; <nl> THArgCheck ( srcDims > 0 , 2 , " Source tensor is empty " ) ; <nl> <nl> - THLongStorage * newSize ; <nl> - <nl> - newSize = THCTensor_ ( newSizeOf ) ( state , src ) ; <nl> - THLongStorage_set ( newSize , dim , numIndices ) ; <nl> - THCTensor_ ( resize ) ( state , dst , newSize , NULL ) ; <nl> - THLongStorage_free ( newSize ) ; <nl> + std : : vector < int64_t > newSize = src - > sizes ( ) . vec ( ) ; <nl> + newSize [ dim ] = numIndices ; <nl> + THCTensor_ ( resize ) ( state , dst , newSize , { } ) ; <nl> <nl> ptrdiff_t dstTotalSize = THCTensor_ ( nElement ) ( state , dst ) ; <nl> if ( dstTotalSize = = 0 ) { <nl> mmm a / aten / src / THC / generic / THCTensorMasked . cu <nl> ppp b / aten / src / THC / generic / THCTensorMasked . cu <nl> THCTensor_ ( maskedFillByte ) ( THCState * state , <nl> THCTensor * tensor , THByteTensor * mask , real value ) <nl> { <nl> THCAssertSameGPU ( THCTensor_ ( checkGPU ) ( state , 1 , tensor ) ) ; <nl> - THLongStorage * maskSizes = THByteTensor_newSizeOf ( mask ) ; <nl> - THCudaByteTensor * maskCuda = THCudaByteTensor_newWithSize ( state , maskSizes , NULL ) ; <nl> - THLongStorage_free ( maskSizes ) ; <nl> + THCudaByteTensor * maskCuda = THCudaByteTensor_newWithSize ( state , mask - > sizes ( ) , { } ) ; <nl> THCudaByteTensor_copyByte ( state , maskCuda , mask ) ; <nl> THCTensor_ ( maskedFill ) ( state , tensor , maskCuda , value ) ; <nl> THCudaByteTensor_free ( state , maskCuda ) ; <nl> THCTensor_ ( maskedCopy ) ( THCState * state , <nl> / / iterator prefix sums ? Convert ` mask ` to the same datatype as what <nl> / / we ' re accumulating the prefix sum in ( int64_t ) to get around it <nl> THCudaLongTensor * maskLong = THCudaLongTensor_new ( state ) ; <nl> - THLongStorage * maskSizes = THCudaByteTensor_newSizeOf ( state , mask ) ; <nl> - THCudaLongTensor_resize ( state , maskLong , maskSizes , NULL ) ; <nl> + at : : IntList maskSizes = mask - > sizes ( ) ; <nl> + THCudaLongTensor_resize ( state , maskLong , maskSizes , { } ) ; <nl> THCudaLongTensor_copyCudaByte ( state , maskLong , mask ) ; <nl> <nl> / / Use a prefix sum to determine the output locations of the masked elements <nl> THCudaLongTensor * maskPrefixSum = THCudaLongTensor_new ( state ) ; <nl> - THCudaLongTensor_resize ( state , maskPrefixSum , maskSizes , NULL ) ; <nl> - THLongStorage_free ( maskSizes ) ; <nl> + THCudaLongTensor_resize ( state , maskPrefixSum , maskSizes , { } ) ; <nl> <nl> THCThrustAllocator thrustAlloc ( state ) ; <nl> thrust : : device_ptr < int64_t > <nl> THC_API void <nl> THCTensor_ ( maskedCopyByte ) ( THCState * state , <nl> THCTensor * tensor , THByteTensor * mask , THCTensor * src ) { <nl> THCAssertSameGPU ( THCTensor_ ( checkGPU ) ( state , 2 , tensor , src ) ) ; <nl> - THLongStorage * maskSizes = THByteTensor_newSizeOf ( mask ) ; <nl> - THCudaByteTensor * maskCuda = THCudaByteTensor_newWithSize ( state , maskSizes , NULL ) ; <nl> - THLongStorage_free ( maskSizes ) ; <nl> + THCudaByteTensor * maskCuda = THCudaByteTensor_newWithSize ( state , mask - > sizes ( ) , { } ) ; <nl> THCudaByteTensor_copyByte ( state , maskCuda , mask ) ; <nl> THCTensor_ ( maskedCopy ) ( state , tensor , maskCuda , src ) ; <nl> THCudaByteTensor_free ( state , maskCuda ) ; <nl> THCTensor_ ( maskedSelect ) ( THCState * state , <nl> / / iterator prefix sums ? Convert ` mask ` to the same datatype as what <nl> / / we ' re accumulating the prefix sum in ( int64_t ) to get around it <nl> THCudaLongTensor * maskLong = THCudaLongTensor_new ( state ) ; <nl> - THLongStorage * maskSizes = THCudaByteTensor_newSizeOf ( state , mask ) ; <nl> - THCudaLongTensor_resize ( state , maskLong , maskSizes , NULL ) ; <nl> + at : : IntList maskSizes = mask - > sizes ( ) ; <nl> + THCudaLongTensor_resize ( state , maskLong , maskSizes , { } ) ; <nl> THCudaLongTensor_copyCudaByte ( state , maskLong , mask ) ; <nl> <nl> / / Use a prefix sum to determine the output locations of the masked elements <nl> THCudaLongTensor * maskPrefixSum = THCudaLongTensor_new ( state ) ; <nl> - THCudaLongTensor_resize ( state , maskPrefixSum , maskSizes , NULL ) ; <nl> - THLongStorage_free ( maskSizes ) ; <nl> + THCudaLongTensor_resize ( state , maskPrefixSum , maskSizes , { } ) ; <nl> <nl> THCThrustAllocator thrustAlloc ( state ) ; <nl> thrust : : device_ptr < int64_t > <nl> THCTensor_ ( maskedSelectByte ) ( THCState * state , <nl> THCTensor * tensor , THCTensor * src , THByteTensor * mask ) <nl> { <nl> THCAssertSameGPU ( THCTensor_ ( checkGPU ) ( state , 2 , tensor , src ) ) ; <nl> - THLongStorage * maskSizes = THByteTensor_newSizeOf ( mask ) ; <nl> - THCudaByteTensor * maskCuda = THCudaByteTensor_newWithSize ( state , maskSizes , NULL ) ; <nl> - THLongStorage_free ( maskSizes ) ; <nl> + THCudaByteTensor * maskCuda = THCudaByteTensor_newWithSize ( state , mask - > sizes ( ) , { } ) ; <nl> THCudaByteTensor_copyByte ( state , maskCuda , mask ) ; <nl> THCTensor_ ( maskedSelect ) ( state , tensor , src , maskCuda ) ; <nl> THCudaByteTensor_free ( state , maskCuda ) ; <nl> mmm a / aten / src / THC / generic / THCTensorMath . cu <nl> ppp b / aten / src / THC / generic / THCTensorMath . cu <nl> void THCTensor_ ( catArray ) ( THCState * state , THCTensor * result , <nl> / / to be " skipped " . We maintain this behavior for backwards compatibility , but only for this specific <nl> / / size ( i . e . other empty sizes are not skipped ) . <nl> / / FIXME : warn if this is the case <nl> - THLongStorage * size ; <nl> int i , j , cohortMax ; <nl> int64_t offset ; <nl> bool hasSkippedInput = false ; <nl> void THCTensor_ ( catArray ) ( THCState * state , THCTensor * result , <nl> THArgCheck ( numInputs > 0 , 3 , " invalid number of inputs % d " , numInputs ) ; <nl> THArgCheck ( dimension > = 0 , 4 , " invalid dimension % d " , dimension ) ; <nl> <nl> - size = THLongStorage_newWithSize ( nDims ) ; <nl> + std : : vector < int64_t > size ( nDims ) ; <nl> <nl> / / Compute size of the result in the cat dimension <nl> int64_t cat_dim_size = 0 ; <nl> void THCTensor_ ( catArray ) ( THCState * state , THCTensor * result , <nl> if ( dim = = dimension ) { <nl> result_dim_size = cat_dim_size ; <nl> } <nl> - THLongStorage_data ( size ) [ dim ] = result_dim_size ; <nl> + size [ dim ] = result_dim_size ; <nl> } <nl> - THCTensor_ ( resize ) ( state , result , size , NULL ) ; <nl> - THLongStorage_free ( size ) ; <nl> + THCTensor_ ( resize ) ( state , result , size , { } ) ; <nl> <nl> / / We parallelize the copy if all 6 conditions pass : <nl> / / <nl> mmm a / aten / src / THC / generic / THCTensorMathPairwise . cu <nl> ppp b / aten / src / THC / generic / THCTensorMathPairwise . cu <nl> THC_API int THCTensor_ ( equal ) ( THCState * state , THCTensor * self_ , THCTensor * src_ <nl> / / 1 if the two tensors are equal at a position , otherwise 0 . If the minimum value <nl> / / in this buffer is 1 , the two tensors are equal , otherwise they are not <nl> <nl> - THLongStorage * size = THCTensor_ ( newSizeOf ) ( state , self_ ) ; <nl> - THCudaByteTensor * buf = THCudaByteTensor_newWithSize ( state , size , NULL ) ; <nl> + THCudaByteTensor * buf = THCudaByteTensor_newWithSize ( state , self_ - > sizes ( ) , { } ) ; <nl> <nl> if ( ! THC_pointwiseApply3 < uint8_t , real , real > ( state , buf , self_ , src_ , TensorEQOp < real , unsigned char > ( ) ) ) { <nl> THArgCheck ( false , 2 , CUTORCH_DIM_WARNING ) ; <nl> THC_API int THCTensor_ ( equal ) ( THCState * state , THCTensor * self_ , THCTensor * src_ <nl> <nl> unsigned char min = THCudaByteTensor_minall ( state , buf ) ; <nl> <nl> - THLongStorage_free ( size ) ; <nl> THCudaByteTensor_free ( state , buf ) ; <nl> <nl> return min ! = 0 ; <nl> mmm a / aten / src / THC / generic / THCTensorMathReduce . cu <nl> ppp b / aten / src / THC / generic / THCTensorMathReduce . cu <nl> THCTensor_ ( std ) ( THCState * state , THCTensor * self_ , THCTensor * src , int dimension <nl> <nl> THCTensor_preserveReduceDimSemantics ( <nl> state , self_ , THCTensor_ ( nDimensionLegacyAll ) ( state , src ) , dimension , keepdim ) ; <nl> - THLongStorage * dim = THCTensor_ ( newSizeOf ) ( state , src ) ; <nl> - THLongStorage_set ( dim , dimension , 1 ) ; <nl> - THCTensor_ ( resize ) ( state , self_ , dim , NULL ) ; <nl> - THLongStorage_free ( dim ) ; <nl> + std : : vector < int64_t > dim = src - > sizes ( ) . vec ( ) ; <nl> + dim [ dimension ] = 1 ; <nl> + THCTensor_ ( resize ) ( state , self_ , dim , { } ) ; <nl> <nl> THCTensor * self = THCTensor_ ( newContiguous ) ( state , self_ ) ; <nl> src = THCTensor_ ( newContiguous ) ( state , src ) ; <nl> THCTensor_ ( var ) ( THCState * state , THCTensor * self_ , THCTensor * src , int dimension <nl> <nl> THCTensor_preserveReduceDimSemantics ( <nl> state , self_ , THCTensor_ ( nDimensionLegacyAll ) ( state , src ) , dimension , keepdim ) ; <nl> - THLongStorage * dim = THCTensor_ ( newSizeOf ) ( state , src ) ; <nl> - THLongStorage_set ( dim , dimension , 1 ) ; <nl> - THCTensor_ ( resize ) ( state , self_ , dim , NULL ) ; <nl> - THLongStorage_free ( dim ) ; <nl> + std : : vector < int64_t > dim = src - > sizes ( ) . vec ( ) ; <nl> + dim [ dimension ] = 1 ; <nl> + THCTensor_ ( resize ) ( state , self_ , dim , { } ) ; <nl> <nl> THCTensor * self = THCTensor_ ( newContiguous ) ( state , self_ ) ; <nl> src = THCTensor_ ( newContiguous ) ( state , src ) ; <nl> THCTensor_ ( medianall ) ( THCState * state , THCTensor * self ) { <nl> nelem = THCTensor_ ( nElement ) ( state , self ) ; <nl> k = ( nelem - 1 ) > > 1 ; <nl> <nl> - THLongStorage * size = THLongStorage_newWithSize1 ( nelem ) ; <nl> - THCTensor * view = THCTensor_ ( newView ) ( state , self , size ) ; <nl> - <nl> - THLongStorage_free ( size ) ; <nl> + THCTensor * view = THCTensor_ ( newView ) ( state , self , { nelem } ) ; <nl> <nl> THCTensor * sorted = THCTensor_ ( new ) ( state ) ; <nl> THCudaLongTensor * indices = THCudaLongTensor_new ( state ) ; <nl> mmm a / aten / src / THC / generic / THCTensorMode . cu <nl> ppp b / aten / src / THC / generic / THCTensorMode . cu <nl> THC_API void THCTensor_ ( mode ) ( THCState * state , <nl> THCTensor * input , <nl> int dimension , <nl> int keepdim ) { <nl> - THLongStorage * dim ; <nl> THCTensor * transposed , * contiguous , * valuesTransposed ; <nl> THLongStorage * position ; <nl> THCudaLongStorage * sortBuffer ; <nl> THC_API void THCTensor_ ( mode ) ( THCState * state , <nl> state , values , ndim , dimension , keepdim ) ; <nl> THCTensor_preserveReduceDimSemantics ( <nl> state , indices , ndim , dimension , keepdim ) ; <nl> - dim = THCTensor_ ( newSizeOf ) ( state , input ) ; <nl> - THLongStorage_set ( dim , dimension , 1 ) ; <nl> - THCTensor_ ( resize ) ( state , values , dim , NULL ) ; <nl> - THCudaLongTensor_resize ( state , indices , dim , NULL ) ; <nl> - THLongStorage_free ( dim ) ; <nl> + std : : vector < int64_t > dim = input - > sizes ( ) . vec ( ) ; <nl> + dim [ dimension ] = 1 ; <nl> + THCTensor_ ( resize ) ( state , values , dim , { } ) ; <nl> + THCudaLongTensor_resize ( state , indices , dim , { } ) ; <nl> <nl> / / If sliceSize is 1 , copy input to values and set indices <nl> if ( sliceSize = = 1 ) { <nl> mmm a / aten / src / THC / generic / THCTensorSort . cu <nl> ppp b / aten / src / THC / generic / THCTensorSort . cu <nl> THC_API void THCTensor_ ( sort ) ( THCState * state , <nl> <nl> / / Make sure sufficient output space is allocated <nl> THCTensor_ ( resizeAs ) ( state , sorted , input ) ; <nl> - THLongStorage * inputSize = THCTensor_ ( newSizeOf ) ( state , input ) ; <nl> - THCudaLongTensor_resize ( state , indices , inputSize , NULL ) ; <nl> - THLongStorage_free ( inputSize ) ; <nl> + THCudaLongTensor_resize ( state , indices , input - > sizes ( ) , { } ) ; <nl> <nl> / / How large are the slices that we are sorting ? <nl> int64_t sliceSize = THCTensor_ ( sizeLegacyNoScalars ) ( state , input , dim ) ; <nl> mmm a / aten / src / THC / generic / THCTensorTopK . cu <nl> ppp b / aten / src / THC / generic / THCTensorTopK . cu <nl> THC_API void THCTensor_ ( topk ) ( THCState * state , <nl> <nl> / / Build the output size , which is the dim being selected set to <nl> / / size k <nl> - THLongStorage * topKSize = THCTensor_ ( newSizeOf ) ( state , input ) ; <nl> - THLongStorage_set ( topKSize , dim , k ) ; <nl> - THCTensor_ ( resize ) ( state , topK , topKSize , NULL ) ; <nl> - THCudaLongTensor_resize ( state , indices , topKSize , NULL ) ; <nl> - THLongStorage_free ( topKSize ) ; <nl> + std : : vector < int64_t > topKSize = input - > sizes ( ) . vec ( ) ; <nl> + topKSize [ dim ] = k ; <nl> + THCTensor_ ( resize ) ( state , topK , topKSize , { } ) ; <nl> + THCudaLongTensor_resize ( state , indices , topKSize , { } ) ; <nl> <nl> # define RUN_K ( INDEX_T , DIM , DIR ) \ <nl> gatherTopK < real , INDEX_T , DIM , DIR > \ <nl> mmm a / aten / src / THCUNN / generic / GatedLinearUnit . cu <nl> ppp b / aten / src / THCUNN / generic / GatedLinearUnit . cu <nl> void THNN_ ( GatedLinear_updateOutput ) ( <nl> THArgCheck ( nIn % 2 = = 0 , 2 , " Halving dimension must be even . Dim % d is size % ld " , <nl> dim + TH_INDEX_BASE , nIn ) ; <nl> const int64_t inputSize = THCTensor_ ( size ) ( state , input , dim ) / 2 ; <nl> - THLongStorage * newSizes = THCTensor_ ( newSizeOf ) ( state , input ) ; <nl> - THLongStorage_set ( newSizes , dim , inputSize ) ; <nl> - THCTensor_ ( resize ) ( state , output , newSizes , NULL ) ; <nl> + std : : vector < int64_t > newSizes = input - > sizes ( ) . vec ( ) ; <nl> + newSizes [ dim ] = inputSize ; <nl> + THCTensor_ ( resize ) ( state , output , newSizes , { } ) ; <nl> <nl> / / halve tensor <nl> THCTensor * firstHalf = THCTensor_ ( newNarrow ) ( state , input , dim , 0 , inputSize ) ; <nl> void THNN_ ( GatedLinear_updateOutput ) ( <nl> / / x = x1 : cmul ( sigmoid ( x2 ) ) <nl> THC_pointwiseApply3 < real , real , real > ( state , output , secondHalf , firstHalf , gatedLinearCSigMul_functor < real , accreal > ( ) ) ; <nl> <nl> - THLongStorage_free ( newSizes ) ; <nl> THCTensor_ ( free ) ( state , firstHalf ) ; <nl> THCTensor_ ( free ) ( state , secondHalf ) ; <nl> } <nl> mmm a / aten / src / THCUNN / generic / LookupTable . cu <nl> ppp b / aten / src / THCUNN / generic / LookupTable . cu <nl> void THNN_ ( LookupTable_accGradParameters ) ( <nl> return ; <nl> } <nl> <nl> - THLongStorage * inputSize = THCIndexTensor_ ( newSizeOf ) ( state , input ) ; <nl> - THCIndexTensor_ ( resize ) ( state , sortedIndices , inputSize , NULL ) ; <nl> - THCIndexTensor_ ( resize ) ( state , origIndices , inputSize , NULL ) ; <nl> - THLongStorage_free ( inputSize ) ; <nl> + THCIndexTensor_ ( resize ) ( state , sortedIndices , input - > sizes ( ) , { } ) ; <nl> + THCIndexTensor_ ( resize ) ( state , origIndices , input - > sizes ( ) , { } ) ; <nl> <nl> / / Sort the inputs into sorted with the corresponding indices ; we <nl> / / don ' t need a stable or multidimensional sort , so just use Thrust <nl> mmm a / aten / src / THCUNN / generic / LookupTableBag . cu <nl> ppp b / aten / src / THCUNN / generic / LookupTableBag . cu <nl> void THNN_ ( LookupTableBag_updateOutput ) ( <nl> <nl> cudaStream_t stream = THCState_getCurrentStream ( state ) ; <nl> <nl> - THLongStorage * inputSize = THCIndexTensor_ ( newSizeOf ) ( state , input ) ; <nl> - THLongStorage * outputSize = THLongStorage_newWithSize ( 2 ) ; <nl> - THLongStorage_data ( outputSize ) [ 0 ] = numBags ; <nl> - THLongStorage_data ( outputSize ) [ 1 ] = stride ; <nl> - THCTensor_ ( resize ) ( state , output , outputSize , NULL ) ; <nl> + std : : vector < int64_t > outputSize = { numBags , stride } ; <nl> + THCTensor_ ( resize ) ( state , output , outputSize , { } ) ; <nl> THCTensor_ ( zero ) ( state , output ) ; <nl> - THCIndexTensor_ ( resize ) ( state , offset2bag , inputSize , NULL ) ; <nl> - THLongStorage_free ( inputSize ) ; <nl> - THLongStorage_free ( outputSize ) ; <nl> + THCIndexTensor_ ( resize ) ( state , offset2bag , input - > sizes ( ) , { } ) ; <nl> <nl> dim3 block = dim3 ( 32 , 8 ) ; <nl> int grid = 1024 ; <nl> void THNN_ ( LookupTableBag_accGradParameters ) ( <nl> <nl> cudaStream_t stream = THCState_getCurrentStream ( state ) ; <nl> <nl> - THLongStorage * inputSize = THCIndexTensor_ ( newSizeOf ) ( state , input ) ; <nl> - THCIndexTensor_ ( resize ) ( state , sortedIndices , inputSize , NULL ) ; <nl> - THCIndexTensor_ ( resize ) ( state , origIndices , inputSize , NULL ) ; <nl> - THLongStorage_free ( inputSize ) ; <nl> + THCIndexTensor_ ( resize ) ( state , sortedIndices , input - > sizes ( ) , { } ) ; <nl> + THCIndexTensor_ ( resize ) ( state , origIndices , input - > sizes ( ) , { } ) ; <nl> <nl> / / Sort the inputs into sorted with the corresponding indices ; we <nl> / / don ' t need a stable or multidimensional sort , so just use Thrust <nl> mmm a / aten / src / THCUNN / generic / VolumetricDilatedMaxPooling . cu <nl> ppp b / aten / src / THCUNN / generic / VolumetricDilatedMaxPooling . cu <nl> void THNN_ ( VolumetricDilatedMaxPooling_updateOutput ) ( <nl> THCDeviceTensor < real , 4 > cudaOutput ; <nl> cudaOutput = toDeviceTensor < real , 4 > ( state , output ) ; <nl> <nl> - THLongStorage * indicesSize = THLongStorage_newWithSize ( 4 ) ; <nl> - int64_t indicesSizeRaw [ 4 ] = { batchSize * inputSlices , <nl> - outputTime , outputHeight , outputWidth } ; <nl> - THLongStorage_rawCopy ( indicesSize , indicesSizeRaw ) ; <nl> - <nl> THCIndexTensor * indices1 = THCIndexTensor_ ( newWithStorage ) ( <nl> state , THCIndexTensor_ ( storage ) ( state , indices ) , <nl> THCIndexTensor_ ( storageOffset ) ( state , indices ) , <nl> - indicesSize , NULL ) ; <nl> - <nl> - THLongStorage_free ( indicesSize ) ; <nl> + { batchSize * inputSlices , outputTime , outputHeight , outputWidth } , { } ) ; <nl> <nl> THCDeviceTensor < THCIndex_t , 4 > cudaIndices = <nl> toDeviceTensor < THCIndex_t , 4 > ( state , indices1 ) ; <nl> void THNN_ ( VolumetricDilatedMaxPooling_updateGradInput ) ( <nl> cudaGradOutput = toDeviceTensor < real , 4 > ( state , gradOutput ) ; <nl> real * gradInputData = THCTensor_ ( data ) ( state , gradInput ) ; <nl> <nl> - THLongStorage * indicesSize = THLongStorage_newWithSize ( 4 ) ; <nl> - int64_t indicesSizeRaw [ 4 ] = { batchSize * inputSlices , <nl> - outputTime , outputHeight , outputWidth } ; <nl> - THLongStorage_rawCopy ( indicesSize , indicesSizeRaw ) ; <nl> THCIndexTensor * indices1 = THCIndexTensor_ ( newWithStorage ) ( <nl> state , THCIndexTensor_ ( storage ) ( state , indices ) , <nl> - THCIndexTensor_ ( storageOffset ) ( state , indices ) , indicesSize , NULL ) ; <nl> - THLongStorage_free ( indicesSize ) ; <nl> + THCIndexTensor_ ( storageOffset ) ( state , indices ) , <nl> + { batchSize * inputSlices , outputTime , outputHeight , outputWidth } , { } ) ; <nl> <nl> THCDeviceTensor < THCIndex_t , 4 > cudaIndices = <nl> toDeviceTensor < THCIndex_t , 4 > ( state , indices1 ) ; <nl> mmm a / aten / src / THNN / generic / GatedLinearUnit . c <nl> ppp b / aten / src / THNN / generic / GatedLinearUnit . c <nl> void THNN_ ( GatedLinear_updateOutput ) ( <nl> dim + TH_INDEX_BASE , nIn ) ; <nl> <nl> const int64_t inputSize = THTensor_ ( size ) ( input , dim ) / 2 ; <nl> - THLongStorage * newSizes = THTensor_ ( newSizeOf ) ( input ) ; <nl> - THLongStorage_set ( newSizes , dim , inputSize ) ; <nl> - THTensor_ ( resize ) ( output , newSizes , NULL ) ; <nl> + std : : vector < int64_t > newSizes = input - > sizes ( ) . vec ( ) ; <nl> + newSizes [ dim ] = inputSize ; <nl> + THTensor_ ( resize ) ( output , newSizes , { } ) ; <nl> <nl> / / halve tensor <nl> THTensor * firstHalf = THTensor_ ( newNarrow ) ( input , dim , 0 , inputSize ) ; <nl> void THNN_ ( GatedLinear_updateOutput ) ( <nl> THTensor_ ( sigmoid ) ( output , secondHalf ) ; <nl> THTensor_ ( cmul ) ( output , output , firstHalf ) ; <nl> <nl> - THLongStorage_free ( newSizes ) ; <nl> THTensor_ ( free ) ( firstHalf ) ; <nl> THTensor_ ( free ) ( secondHalf ) ; <nl> } <nl>
|
Stop using THLongStorage for sizes / strides , remove THLongStorageView .
|
pytorch/pytorch
|
6ac35b35d12b65851f3269b838dc36d64e97237b
|
2018-08-06T16:25:32Z
|
mmm a / src / flag - definitions . h <nl> ppp b / src / flag - definitions . h <nl> DEFINE_BOOL ( legacy_const , true , " legacy semantics for const in sloppy mode " ) <nl> / / Features that are complete ( but still behind - - harmony / es - staging flag ) . <nl> # define HARMONY_STAGED ( V ) \ <nl> V ( harmony_arrow_functions , " harmony arrow functions " ) \ <nl> - V ( harmony_array_includes , " harmony Array . prototype . includes " ) \ <nl> V ( harmony_tostring , " harmony toString " ) \ <nl> V ( harmony_concat_spreadable , " harmony isConcatSpreadable " ) \ <nl> V ( harmony_rest_parameters , " harmony rest parameters " ) \ <nl> V ( harmony_sloppy , " harmony features in sloppy mode " ) <nl> <nl> / / Features that are shipping ( turned on by default , but internal flag remains ) . <nl> - # define HARMONY_SHIPPING ( V ) \ <nl> - V ( harmony_new_target , " harmony new . target " ) \ <nl> - V ( harmony_object_observe , " harmony Object . observe " ) \ <nl> - V ( harmony_spreadcalls , " harmony spread - calls " ) \ <nl> - V ( harmony_spread_arrays , " harmony spread in array literals " ) \ <nl> + # define HARMONY_SHIPPING ( V ) \ <nl> + V ( harmony_array_includes , " harmony Array . prototype . includes " ) \ <nl> + V ( harmony_new_target , " harmony new . target " ) \ <nl> + V ( harmony_object_observe , " harmony Object . observe " ) \ <nl> + V ( harmony_spreadcalls , " harmony spread - calls " ) \ <nl> + V ( harmony_spread_arrays , " harmony spread in array literals " ) \ <nl> V ( harmony_object , " harmony Object methods " ) <nl> <nl> / / Once a shipping feature has proved stable in the wild , it will be dropped <nl>
|
Ship - - harmony_array_includes
|
v8/v8
|
5aeb748d374157b602e4d01dc1251cc72072cc92
|
2015-08-24T18:16:13Z
|
mmm a / FALSEHOODS . md <nl> ppp b / FALSEHOODS . md <nl> surprising how many false assumptions programmers continue to make about them . <nl> These include , but are not limited to : <nl> * * Moving within a country * : In countries with phone number portability , <nl> you may retain your number when moving , even in some cases if it is a <nl> - fixed - line number and even if it has an area code . ( See <nl> - [ xkcd ] ( https : / / xkcd . com / 1129 / ) for a US example . ) <nl> + fixed - line number and even if it has an area code ( see <nl> + * [ xkcd ] ( https : / / xkcd . com / 1129 / ) * for a US example . ) <nl> * * Moving to another country * : Some people keep their mobile phones when <nl> they move to another country . <nl> * * Geopolitical turmoil * : Sometimes countries change their borders , cease <nl> surprising how many false assumptions programmers continue to make about them . <nl> information . Unless a piece of user - supplied data has actually been verified <nl> to be a phone number , it should be stored as - is as entered by the user . <nl> <nl> + 1 . * * Phone numbers are numbers * * <nl> + <nl> + Never try to store phone numbers as an int or any other kind of numeric <nl> + data type . You can ' t do arithmetic on them , and while 007 , 07 and 7 are the <nl> + same number they are not necessarily the same phone number - in some <nl> + countries a leading 0 is significant and forms part of the number itself <nl> + ( see * A leading zero in numbers formatted for domestic usage can always be <nl> + discarded when dialing from abroad * ) . Moreover , a phone number may contain <nl> + other diallable characters ( see * Phone numbers contain only digits * ) or an <nl> + extension portion , dialled after waiting for a tone . <nl> + <nl> + * * Tip : * * Use the library to parse and format numbers to handle this <nl> + correctly for every country . <nl> + <nl> 1 . * * Phone numbering plans published by governments or telecoms represent <nl> reality * * <nl> <nl>
|
add an extra falsehood : that phone numbers are numbers ( )
|
google/libphonenumber
|
50b6a04c1e7cc65d2d50950f07cb0d1957c81997
|
2016-10-27T13:24:58Z
|
mmm a / Marlin / language_de . h <nl> ppp b / Marlin / language_de . h <nl> <nl> # define MSG_BABYSTEP_X " Babystep X " <nl> # define MSG_BABYSTEP_Y " Babystep Y " <nl> # define MSG_BABYSTEP_Z " Babystep Z " <nl> - # define MSG_ENDSTOP_ABORT " Endstop - Abbr . ein " <nl> + # define MSG_ENDSTOP_ABORT " Endstopp - Abbr . ein " <nl> # define MSG_HEATING_FAILED_LCD " HEIZEN FEHLGESCHLAGEN " <nl> # define MSG_ERR_REDUNDANT_TEMP " REDUND . TEMPERATURABWEICHUNG " <nl> # define MSG_THERMAL_RUNAWAY LCD_STR_THERMOMETER " NICHT ERREICHT " <nl> <nl> <nl> # define MSG_INFO_MENU " Über den Drucker " <nl> # define MSG_INFO_PRINTER_MENU " Drucker Info " <nl> - # define MSG_INFO_STATS_MENU " Drucker Stats " <nl> + # define MSG_INFO_STATS_MENU " Drucker Stat . " <nl> # define MSG_INFO_BOARD_MENU " Board Info " <nl> # define MSG_INFO_THERMISTOR_MENU " Thermistors " <nl> # define MSG_INFO_EXTRUDERS " Extruders " <nl> # define MSG_INFO_BAUDRATE " Baud " <nl> - # define MSG_INFO_PROTOCOL " Protokol " <nl> + # define MSG_INFO_PROTOCOL " Protokoll " <nl> # define MSG_LIGHTS_ON " Gehäuse Licht an " <nl> # define MSG_LIGHTS_OFF " Gehäuse Licht aus " <nl> <nl> <nl> # define MSG_FILAMENT_CHANGE_INIT_1 " Warte auf den " <nl> # define MSG_FILAMENT_CHANGE_INIT_2 " Start des " <nl> # define MSG_FILAMENT_CHANGE_INIT_3 " Filamentwechsels " <nl> - # define MSG_FILAMENT_CHANGE_UNLOAD_1 " Warte auf das " <nl> - # define MSG_FILAMENT_CHANGE_UNLOAD_2 " Herausnehmen " <nl> + # define MSG_FILAMENT_CHANGE_UNLOAD_1 " Warte auf " <nl> + # define MSG_FILAMENT_CHANGE_UNLOAD_2 " Herausnahme " <nl> # define MSG_FILAMENT_CHANGE_UNLOAD_3 " des Filaments " <nl> - # define MSG_FILAMENT_CHANGE_INSERT_1 " Fädle Filament " <nl> - # define MSG_FILAMENT_CHANGE_INSERT_2 " ein und drücke " <nl> - # define MSG_FILAMENT_CHANGE_INSERT_3 " den Knopf . . . " <nl> - # define MSG_FILAMENT_CHANGE_LOAD_1 " Warte auf das " <nl> + # define MSG_FILAMENT_CHANGE_INSERT_1 " Filament einlegen " <nl> + # define MSG_FILAMENT_CHANGE_INSERT_2 " und Knopf " <nl> + # define MSG_FILAMENT_CHANGE_INSERT_3 " drücken . . . " <nl> + # define MSG_FILAMENT_CHANGE_LOAD_1 " Warte auf " <nl> # define MSG_FILAMENT_CHANGE_LOAD_2 " Laden des " <nl> # define MSG_FILAMENT_CHANGE_LOAD_3 " Filaments " <nl> - # define MSG_FILAMENT_CHANGE_EXTRUDE_1 " Warte auf das " <nl> - # define MSG_FILAMENT_CHANGE_EXTRUDE_2 " Extrudieren des " <nl> + # define MSG_FILAMENT_CHANGE_EXTRUDE_1 " Warte auf " <nl> + # define MSG_FILAMENT_CHANGE_EXTRUDE_2 " Extrusion des " <nl> # define MSG_FILAMENT_CHANGE_EXTRUDE_3 " Filaments " <nl> - # define MSG_FILAMENT_CHANGE_RESUME_1 " Warte auf das " <nl> - # define MSG_FILAMENT_CHANGE_RESUME_2 " Fortsetzen des " <nl> + # define MSG_FILAMENT_CHANGE_RESUME_1 " Warte auf " <nl> + # define MSG_FILAMENT_CHANGE_RESUME_2 " Fortsetzung des " <nl> # define MSG_FILAMENT_CHANGE_RESUME_3 " Druckes " <nl> # else / / LCD_HEIGHT < 4 <nl> # define MSG_FILAMENT_CHANGE_INIT_1 " Bitte warten . . . " <nl> # define MSG_FILAMENT_CHANGE_UNLOAD_1 " Auswerfen . . . " <nl> # define MSG_FILAMENT_CHANGE_INSERT_1 " Laden und Klick " <nl> # define MSG_FILAMENT_CHANGE_LOAD_1 " Laden . . . " <nl> - # define MSG_FILAMENT_CHANGE_EXTRUDE_1 " Extruden . . . " <nl> + # define MSG_FILAMENT_CHANGE_EXTRUDE_1 " Extrudieren . . . " <nl> # define MSG_FILAMENT_CHANGE_RESUME_1 " Weitermachen . . . " <nl> # endif / / LCD_HEIGHT < 4 <nl> <nl>
|
Update language_de . h
|
MarlinFirmware/Marlin
|
8530c323099809c9bb4e26232699ac8d86837ef2
|
2016-12-02T18:40:36Z
|
mmm a / libraries / Ticker / examples / TickerBasic / TickerBasic . ino <nl> ppp b / libraries / Ticker / examples / TickerBasic / TickerBasic . ino <nl> <nl> There are two variants of the attach function : attach and attach_ms . <nl> The first one takes period in seconds , the second one in milliseconds . <nl> <nl> - An LED connected to GPIO1 will be blinking . Use a built - in LED on ESP - 01 <nl> - or connect an external one to TXD on other boards . <nl> + The built - in LED will be blinking . <nl> * / <nl> <nl> # include < Ticker . h > <nl> int count = 0 ; <nl> <nl> void flip ( ) <nl> { <nl> - int state = digitalRead ( 1 ) ; / / get the current state of GPIO1 pin <nl> - digitalWrite ( 1 , ! state ) ; / / set pin to the opposite state <nl> + int state = digitalRead ( LED_BUILTIN ) ; / / get the current state of GPIO1 pin <nl> + digitalWrite ( LED_BUILTIN , ! state ) ; / / set pin to the opposite state <nl> <nl> + + count ; <nl> / / when the counter reaches a certain value , start blinking like crazy <nl> void flip ( ) <nl> } <nl> <nl> void setup ( ) { <nl> - pinMode ( 1 , OUTPUT ) ; <nl> - digitalWrite ( 1 , LOW ) ; <nl> + pinMode ( LED_BUILTIN , OUTPUT ) ; <nl> + digitalWrite ( LED_BUILTIN , LOW ) ; <nl> <nl> / / flip the pin every 0 . 3s <nl> flipper . attach ( 0 . 3 , flip ) ; <nl> mmm a / libraries / Ticker / examples / TickerParameter / TickerParameter . ino <nl> ppp b / libraries / Ticker / examples / TickerParameter / TickerParameter . ino <nl> <nl> This sample runs two tickers that both call one callback function , <nl> but with different arguments . <nl> <nl> - An LED connected to GPIO1 will be pulsing . Use a built - in LED on ESP - 01 <nl> - or connect an external one to TXD on other boards . <nl> + The built - in LED will be pulsing . <nl> * / <nl> <nl> # include < Ticker . h > <nl> Ticker tickerSetHigh ; <nl> Ticker tickerSetLow ; <nl> <nl> void setPin ( int state ) { <nl> - digitalWrite ( 1 , state ) ; <nl> + digitalWrite ( LED_BUILTIN , state ) ; <nl> } <nl> <nl> void setup ( ) { <nl> - pinMode ( 1 , OUTPUT ) ; <nl> + pinMode ( LED_BUILTIN , OUTPUT ) ; <nl> digitalWrite ( 1 , LOW ) ; <nl> <nl> / / every 25 ms , call setPin ( 0 ) <nl>
|
Use LED_BUILTIN so that it works w / o attaching external LED ( )
|
esp8266/Arduino
|
ac626ad9f8b398ae4cd56b9325541ba3a99fffd7
|
2017-09-21T09:22:27Z
|
mmm a / src / core / lib / iomgr / timer_generic . cc <nl> ppp b / src / core / lib / iomgr / timer_generic . cc <nl> grpc_core : : TraceFlag grpc_timer_trace ( false , " timer " ) ; <nl> grpc_core : : TraceFlag grpc_timer_check_trace ( false , " timer_check " ) ; <nl> <nl> / * A " timer shard " . Contains a ' heap ' and a ' list ' of timers . All timers with <nl> - * deadlines earlier than ' queue_deadline " cap are maintained in the heap and <nl> + * deadlines earlier than ' queue_deadline_cap ' are maintained in the heap and <nl> * others are maintained in the list ( unordered ) . This helps to keep the number <nl> * of elements in the heap low . <nl> * <nl> * The ' queue_deadline_cap ' gets recomputed periodically based on the timer <nl> * stats maintained in ' stats ' and the relevant timers are then moved from the <nl> - * ' list ' to ' heap ' <nl> + * ' list ' to ' heap ' . <nl> * / <nl> typedef struct { <nl> gpr_mu mu ; <nl> grpc_time_averaged_stats stats ; <nl> - / * All and only timers with deadlines < = this will be in the heap . * / <nl> + / * All and only timers with deadlines < this will be in the heap . * / <nl> grpc_millis queue_deadline_cap ; <nl> - / * The deadline of the next timer due in this shard * / <nl> + / * The deadline of the next timer due in this shard . * / <nl> grpc_millis min_deadline ; <nl> - / * Index of this timer_shard in the g_shard_queue * / <nl> + / * Index of this timer_shard in the g_shard_queue . * / <nl> uint32_t shard_queue_index ; <nl> / * This holds all timers with deadlines < queue_deadline_cap . Timers in this <nl> list have the top bit of their deadline set to 0 . * / <nl> static timer_shard * * g_shard_queue ; <nl> <nl> # ifndef NDEBUG <nl> <nl> - / * = = Hash table for duplicate timer detection = = * / <nl> + / * = = DEBUG ONLY : hash table for duplicate timer detection = = * / <nl> <nl> # define NUM_HASH_BUCKETS 1009 / * Prime number close to 1000 * / <nl> <nl> static void remove_from_ht ( grpc_timer * t ) { <nl> t - > hash_table_next = nullptr ; <nl> } <nl> <nl> - / * If a timer is added to a timer shard ( either heap or a list ) , it cannot <nl> + / * If a timer is added to a timer shard ( either heap or a list ) , it must <nl> * be pending . A timer is added to hash table only - if it is added to the <nl> * timer shard . <nl> * Therefore , if timer - > pending is false , it cannot be in hash table * / <nl> static void timer_cancel ( grpc_timer * timer ) { <nl> ' queue_deadline_cap ' ) into into shard - > heap . <nl> Returns ' true ' if shard - > heap has atleast ONE element <nl> REQUIRES : shard - > mu locked * / <nl> - static int refill_heap ( timer_shard * shard , grpc_millis now ) { <nl> + static bool refill_heap ( timer_shard * shard , grpc_millis now ) { <nl> / * Compute the new queue window width and bound by the limits : * / <nl> double computed_deadline_delta = <nl> grpc_time_averaged_stats_update_average ( & shard - > stats ) * <nl> mmm a / src / core / lib / iomgr / timer_heap . cc <nl> ppp b / src / core / lib / iomgr / timer_heap . cc <nl> void grpc_timer_heap_init ( grpc_timer_heap * heap ) { <nl> <nl> void grpc_timer_heap_destroy ( grpc_timer_heap * heap ) { gpr_free ( heap - > timers ) ; } <nl> <nl> - int grpc_timer_heap_add ( grpc_timer_heap * heap , grpc_timer * timer ) { <nl> + bool grpc_timer_heap_add ( grpc_timer_heap * heap , grpc_timer * timer ) { <nl> if ( heap - > timer_count = = heap - > timer_capacity ) { <nl> heap - > timer_capacity = <nl> GPR_MAX ( heap - > timer_capacity + 1 , heap - > timer_capacity * 3 / 2 ) ; <nl> void grpc_timer_heap_remove ( grpc_timer_heap * heap , grpc_timer * timer ) { <nl> note_changed_priority ( heap , heap - > timers [ i ] ) ; <nl> } <nl> <nl> - int grpc_timer_heap_is_empty ( grpc_timer_heap * heap ) { <nl> + bool grpc_timer_heap_is_empty ( grpc_timer_heap * heap ) { <nl> return heap - > timer_count = = 0 ; <nl> } <nl> <nl> mmm a / src / core / lib / iomgr / timer_heap . h <nl> ppp b / src / core / lib / iomgr / timer_heap . h <nl> typedef struct { <nl> uint32_t timer_capacity ; <nl> } grpc_timer_heap ; <nl> <nl> - / * return 1 if the new timer is the first timer in the heap * / <nl> - int grpc_timer_heap_add ( grpc_timer_heap * heap , grpc_timer * timer ) ; <nl> + / * return true if the new timer is the first timer in the heap * / <nl> + bool grpc_timer_heap_add ( grpc_timer_heap * heap , grpc_timer * timer ) ; <nl> <nl> void grpc_timer_heap_init ( grpc_timer_heap * heap ) ; <nl> void grpc_timer_heap_destroy ( grpc_timer_heap * heap ) ; <nl> void grpc_timer_heap_remove ( grpc_timer_heap * heap , grpc_timer * timer ) ; <nl> grpc_timer * grpc_timer_heap_top ( grpc_timer_heap * heap ) ; <nl> void grpc_timer_heap_pop ( grpc_timer_heap * heap ) ; <nl> <nl> - int grpc_timer_heap_is_empty ( grpc_timer_heap * heap ) ; <nl> + bool grpc_timer_heap_is_empty ( grpc_timer_heap * heap ) ; <nl> <nl> # endif / * GRPC_CORE_LIB_IOMGR_TIMER_HEAP_H * / <nl> mmm a / src / core / lib / iomgr / timer_manager . cc <nl> ppp b / src / core / lib / iomgr / timer_manager . cc <nl> static void start_timer_thread_and_unlock ( void ) { <nl> <nl> void grpc_timer_manager_tick ( ) { <nl> grpc_core : : ExecCtx exec_ctx ; <nl> - grpc_millis next = GRPC_MILLIS_INF_FUTURE ; <nl> - grpc_timer_check ( & next ) ; <nl> + grpc_timer_check ( nullptr ) ; <nl> } <nl> <nl> static void run_some_timers ( ) { <nl> static void run_some_timers ( ) { <nl> / / remove a waiter from the pool , and start another thread if necessary <nl> - - g_waiter_count ; <nl> if ( g_waiter_count = = 0 & & g_threaded ) { <nl> + / / The number of timer threads is always increasing until all the threads <nl> + / / are stopped . In rare cases , if a large number of timers fire <nl> + / / simultaneously , we may end up using a large number of threads . <nl> start_timer_thread_and_unlock ( ) ; <nl> } else { <nl> - / / if there ' s no thread waiting with a timeout , kick an existing <nl> + / / if there ' s no thread waiting with a timeout , kick an existing untimed <nl> / / waiter so that the next deadline is not missed <nl> if ( ! g_has_timed_waiter ) { <nl> if ( grpc_timer_check_trace . enabled ( ) ) { <nl> mmm a / src / core / lib / iomgr / timer_manager . h <nl> ppp b / src / core / lib / iomgr / timer_manager . h <nl> <nl> <nl> # include < stdbool . h > <nl> <nl> - / * Timer Manager tries to keep one thread waiting for the next timeout at all <nl> - times * / <nl> + / * Timer Manager tries to keep only one thread waiting for the next timeout at <nl> + all times , and thus effectively preventing the thundering herd problem . * / <nl> <nl> void grpc_timer_manager_init ( void ) ; <nl> void grpc_timer_manager_shutdown ( void ) ; <nl>
|
Clean some timer code
|
grpc/grpc
|
a51b44aa132f07401403e1bc16c388badd2e149b
|
2018-10-02T01:01:04Z
|
mmm a / tensorflow / compiler / xla / python / tpu_driver / event_id . h <nl> ppp b / tensorflow / compiler / xla / python / tpu_driver / event_id . h <nl> namespace tpu_driver { <nl> / / This class provides a typed interface for these values as well as support for <nl> / / hashing and ostreams ( for logging ) . <nl> struct EventId { <nl> - int64_t client_id ; <nl> - int64_t operation_id ; <nl> + uint64_t client_id ; <nl> + uint64_t operation_id ; <nl> <nl> template < typename H > <nl> friend H AbslHashValue ( H h , const EventId & c ) { <nl> struct EventId { <nl> return absl : : StrCat ( client_id , " : " , operation_id ) ; <nl> } <nl> <nl> - int64_t AsInt ( ) const { return client_id < < 44 | operation_id ; } <nl> + uint64_t AsInt ( ) const { return client_id < < 44 | operation_id ; } <nl> <nl> - static EventId FromInt ( int64_t value ) { <nl> + static EventId FromInt ( uint64_t value ) { <nl> return EventId { value > > 44 , value & 0xfffffffffff } ; <nl> } <nl> } ; <nl> mmm a / tensorflow / compiler / xla / python / tpu_driver / grpc_tpu_driver . cc <nl> ppp b / tensorflow / compiler / xla / python / tpu_driver / grpc_tpu_driver . cc <nl> class GrpcEvent : public Event { <nl> GrpcTpuStream * stream_ ; <nl> } ; <nl> <nl> + class ErrorEvent : public GrpcEvent { <nl> + public : <nl> + explicit ErrorEvent ( Status status ) : GrpcEvent ( EventId { 0 , 0 } , nullptr ) { <nl> + status_ = status ; <nl> + } <nl> + <nl> + xla : : Status Await ( ) override { return status_ ; } <nl> + absl : : optional < xla : : Status > AwaitWithTimeout ( <nl> + absl : : Duration duration ) override { <nl> + return status_ ; <nl> + } <nl> + void AddCallback ( std : : function < void ( Status ) > callback ) override { <nl> + callback ( status_ ) ; <nl> + } <nl> + <nl> + private : <nl> + Status status_ ; <nl> + } ; <nl> + <nl> class GrpcBufferHandle : public BufferHandle { <nl> public : <nl> explicit GrpcBufferHandle ( <nl> class GrpcTpuDriver : public TpuDriver { <nl> static std : : unique_ptr < grpc : : CloudTpuDriver : : Stub > CreateTpuDriverStub ( <nl> const TpuDriverConfig & config ) ; <nl> <nl> + uint32 client_id ( ) const { return client_id_ ; } <nl> + <nl> private : <nl> std : : unique_ptr < GrpcTpuStream > AllocateStream ( int32_t core_id ) ; <nl> <nl> const TpuDriverConfig config_ ; <nl> - const int32_t client_id_ ; <nl> + const uint32_t client_id_ ; <nl> / / Map from stream IDs to streams . <nl> absl : : flat_hash_map < int32_t , std : : unique_ptr < GrpcTpuStream > > streams_ ; <nl> std : : unique_ptr < GrpcTpuStream > host_stream_ ; <nl> / / Shared by all streams . <nl> - std : : atomic < int64_t > operation_id_ { 0 } ; <nl> - } ; <nl> + std : : atomic < uint64_t > operation_id_ { 0 } ; <nl> + } ; / / namespace <nl> <nl> GrpcEvent : : ~ GrpcEvent ( ) { stream_ - > DeleteEvent ( id_ ) ; } <nl> <nl> GrpcTpuStream : : ~ GrpcTpuStream ( ) { <nl> / / Mark all remaining events invalid . <nl> absl : : MutexLock lock ( & events_mutex_ ) ; <nl> for ( auto e : events_ ) { <nl> - UpdateEventStatus ( e . first , xla : : Status ( tensorflow : : error : : Code : : ABORTED , <nl> - " Tpustream was closed . " ) ) ; <nl> + if ( ! e . second . done ) { <nl> + LOG ( ERROR ) < < " Resetting : " < < e . first ; <nl> + UpdateEventStatus ( e . first , xla : : Status ( tensorflow : : error : : Code : : ABORTED , <nl> + " Driver was closed . " ) ) ; <nl> + } <nl> } <nl> } <nl> VLOG ( 1 ) < < " Closing stream . " ; <nl> void GrpcTpuStream : : UpdateEventStatus ( EventId id , Status status ) { <nl> <nl> / / This is the first time this event finishes . Remember the results and call <nl> / / the callbacks . <nl> - VLOG ( 1 ) < < " Response received for GrpcEvent " < < id < < " . Firing " <nl> - < < it - > second . callbacks . size ( ) < < " callbacks . " ; <nl> + VLOG ( 1 ) < < " Response received for GrpcEvent " < < id < < " . " <nl> + < < status . ToString ( ) < < " . Firing " < < it - > second . callbacks . size ( ) <nl> + < < " callbacks . " ; <nl> it - > second . done = true ; <nl> it - > second . status = status ; <nl> for ( const auto & callback : it - > second . callbacks ) { <nl> absl : : optional < Status > GrpcTpuStream : : WaitForEvent ( EventId id , <nl> events_mutex_ . AssertHeld ( ) ; <nl> return ! events_ . contains ( id ) | | events_ [ id ] . done ; <nl> } ; <nl> + <nl> if ( events_mutex_ . AwaitWithTimeout ( absl : : Condition ( & done ) , duration ) ) { <nl> return events_ . contains ( id ) ? events_ [ id ] . status : Status ( ) ; <nl> } <nl> void GrpcTpuStream : : StreamWriterFn ( ) { <nl> reqs . push_back ( StreamRequest ( ) ) ; <nl> request_bytes = 0 ; <nl> } <nl> + VLOG ( 1 ) < < " Sending request : " < < EventId : : FromInt ( e - > operation_id ( ) ) ; <nl> + VLOG ( 2 ) < < " Sending request : " < < e - > DebugString ( ) ; <nl> reqs . back ( ) . mutable_entry ( ) - > AddAllocated ( e ) ; <nl> } <nl> num_pending_requests_ = 0 ; <nl> void GrpcTpuStream : : StreamWriterFn ( ) { <nl> void GrpcTpuStream : : StreamReaderFn ( ) { <nl> StreamResponse resp ; <nl> while ( stream_ - > Read ( & resp ) ) { <nl> - VLOG ( 1 ) < < " Received response : " < < resp . DebugString ( ) ; <nl> + VLOG ( 2 ) < < " Received response : " < < resp . DebugString ( ) ; <nl> for ( const StreamResponse : : Entry entry : resp . entry ( ) ) { <nl> EventId event_id = EventId : : FromInt ( entry . operation_id ( ) ) ; <nl> + VLOG ( 1 ) < < " Received response for : " < < event_id ; <nl> <nl> TraceMe activity ( " GrpcTpuStream : : RequestComplete " ) ; <nl> if ( entry . has_transfer_from ( ) ) { <nl> std : : unique_ptr < LoadedProgramHandle > GrpcTpuStream : : LoadProgram ( <nl> InitializeRequest ( req . get ( ) , wait_for ) ; <nl> TraceMe activity ( absl : : StrCat ( " GrpcTpuStream : : LoadProgram " ) ) ; <nl> req - > mutable_load ( ) - > set_core_id ( core_id ) ; <nl> - req - > mutable_load ( ) - > set_compiled_program_handle ( <nl> - static_cast < const GrpcCompiledProgramHandle * > ( handle ) - > id ( ) . AsInt ( ) ) ; <nl> + auto grpc_handle = static_cast < const GrpcCompiledProgramHandle * > ( handle ) ; <nl> + if ( grpc_handle - > id ( ) . client_id ! = driver_ - > client_id ( ) ) { <nl> + auto event = absl : : make_unique < ErrorEvent > ( <nl> + xla : : InvalidArgument ( " Invalid program handle ( wrong client id ) . Did " <nl> + " you restart the server or use a stale handle ? " ) ) ; <nl> + return absl : : make_unique < GrpcLoadedProgramHandle > ( event - > id ( ) , <nl> + std : : move ( event ) ) ; <nl> + } <nl> + req - > mutable_load ( ) - > set_compiled_program_handle ( grpc_handle - > id ( ) . AsInt ( ) ) ; <nl> auto event = <nl> absl : : make_unique < GrpcEvent > ( EventId : : FromInt ( req - > operation_id ( ) ) , this ) ; <nl> AddWriteRequest ( std : : move ( req ) ) ; <nl> std : : unique_ptr < Event > GrpcTpuStream : : ExecuteProgram ( <nl> absl : : Span < Event * const > wait_for ) { <nl> auto req = absl : : make_unique < StreamRequest : : Entry > ( ) ; <nl> InitializeRequest ( req . get ( ) , wait_for ) ; <nl> + auto program_handle = static_cast < GrpcLoadedProgramHandle * > ( program ) ; <nl> + if ( program_handle - > id ( ) . client_id ! = driver_ - > client_id ( ) ) { <nl> + return absl : : make_unique < ErrorEvent > ( <nl> + xla : : InvalidArgument ( " Invalid program handle ( wrong client id ) . Did " <nl> + " you restart the server or use a stale handle ? " ) ) ; <nl> + } <nl> + <nl> req - > mutable_execute ( ) - > set_loaded_program_handle ( <nl> - static_cast < GrpcLoadedProgramHandle * > ( program ) - > id ( ) . AsInt ( ) ) ; <nl> + program_handle - > id ( ) . AsInt ( ) ) ; <nl> + <nl> for ( BufferHandle * input : inputs ) { <nl> - req - > mutable_execute ( ) - > add_input_handle ( <nl> - static_cast < GrpcBufferHandle * > ( input ) - > id ( ) . AsInt ( ) ) ; <nl> + auto * grpc_handle = static_cast < GrpcBufferHandle * > ( input ) ; <nl> + if ( grpc_handle - > id ( ) . client_id ! = driver_ - > client_id ( ) ) { <nl> + return absl : : make_unique < ErrorEvent > ( xla : : InvalidArgument ( <nl> + " Invalid input buffer ( wrong client id ) . Did you restart the server " <nl> + " or use a stale handle ? " ) ) ; <nl> + } <nl> + req - > mutable_execute ( ) - > add_input_handle ( grpc_handle - > id ( ) . AsInt ( ) ) ; <nl> } <nl> + <nl> for ( BufferHandle * output : outputs ) { <nl> + auto * grpc_handle = static_cast < GrpcBufferHandle * > ( output ) ; <nl> + if ( grpc_handle - > id ( ) . client_id ! = driver_ - > client_id ( ) ) { <nl> + return absl : : make_unique < ErrorEvent > ( xla : : InvalidArgument ( <nl> + " Invalid output buffer ( wrong client id ) . Did you restart the server " <nl> + " or use a stale handle ? " ) ) ; <nl> + } <nl> req - > mutable_execute ( ) - > add_output_handle ( <nl> static_cast < GrpcBufferHandle * > ( output ) - > id ( ) . AsInt ( ) ) ; <nl> } <nl> mmm a / tensorflow / compiler / xla / python / tpu_driver / tpu_service . proto <nl> ppp b / tensorflow / compiler / xla / python / tpu_driver / tpu_service . proto <nl> message StreamResponse { <nl> message OpenRequest { } <nl> <nl> message OpenResponse { <nl> - required int32 client_id = 1 ; <nl> + required fixed32 client_id = 1 ; <nl> + <nl> + / / Maximum time this client can be idle before it is GC ' ed and all resources <nl> + / / released . <nl> + optional int32 max_idle_time_seconds = 2 [ default = 3600 ] ; <nl> } <nl> <nl> message CloseRequest { <nl> - required int32 client_id = 1 ; <nl> + required fixed32 client_id = 1 ; <nl> } <nl> <nl> message CloseResponse { } <nl>
|
TpuDriver : Improve handling of restarted clients / servers .
|
tensorflow/tensorflow
|
690d47e60bdb8adfd387f0c0db01af153a3ed6b9
|
2019-11-15T22:04:48Z
|
mmm a / xbmc / cores / dvdplayer / DVDInputStreams / DVDInputStreamFFmpeg . cpp <nl> ppp b / xbmc / cores / dvdplayer / DVDInputStreams / DVDInputStreamFFmpeg . cpp <nl> <nl> * / <nl> <nl> # include " DVDInputStreamFFmpeg . h " <nl> - # include " xbmc / playlists / PlayListM3U . h " <nl> + # include " playlists / PlayListM3U . h " <nl> # include " settings / Settings . h " <nl> # include " Util . h " <nl> # include " utils / log . h " <nl>
|
fix wrong include path
|
xbmc/xbmc
|
64bd317efc12a43870c3eb8fe2bbb87b1713992f
|
2015-04-10T12:51:37Z
|
mmm a / src / DbStructureModel . cpp <nl> ppp b / src / DbStructureModel . cpp <nl> QMimeData * DbStructureModel : : mimeData ( const QModelIndexList & indices ) const <nl> <nl> / / Create the MIME data object <nl> QMimeData * mime = new QMimeData ( ) ; <nl> - mime - > setProperty ( " db_file " , m_db - > curDBFilename ) ; / / Also save the file name to avoid dropping an object on the same database as it comes from <nl> + mime - > setProperty ( " db_file " , m_db - > currentFile ( ) ) ; / / Also save the file name to avoid dropping an object on the same database as it comes from <nl> mime - > setData ( " text / plain " , d ) ; <nl> return mime ; <nl> } <nl> bool DbStructureModel : : dropMimeData ( const QMimeData * data , Qt : : DropAction action <nl> if ( ! data - > hasFormat ( " text / plain " ) ) <nl> return false ; <nl> <nl> - if ( data - > property ( " db_file " ) = = m_db - > curDBFilename ) <nl> + if ( data - > property ( " db_file " ) = = m_db - > currentFile ( ) ) <nl> return false ; <nl> <nl> / / Get data <nl> mmm a / src / ExportSqlDialog . cpp <nl> ppp b / src / ExportSqlDialog . cpp <nl> void ExportSqlDialog : : accept ( ) <nl> if ( selectedItems . count ( ) = = 1 ) / / One table - > Suggest table name <nl> defaultFileName = selectedItems . at ( 0 ) - > text ( ) + " . sql " ; <nl> else if ( selectedItems . count ( ) = = ui - > listTables - > count ( ) ) / / All tables - > Suggest database name <nl> - defaultFileName = pdb - > curDBFilename + " . sql " ; ; <nl> + defaultFileName = pdb - > currentFile ( ) + " . sql " ; ; <nl> <nl> QString fileName = FileDialog : : getSaveFileName ( <nl> this , <nl> mmm a / src / MainWindow . cpp <nl> ppp b / src / MainWindow . cpp <nl> void MainWindow : : fileSave ( ) <nl> void MainWindow : : fileRevert ( ) <nl> { <nl> if ( db . isOpen ( ) ) { <nl> - QString msg = tr ( " Are you sure you want to undo all changes made to the database file ' % 1 ' since the last save ? " ) . arg ( db . curDBFilename ) ; <nl> + QString msg = tr ( " Are you sure you want to undo all changes made to the database file ' % 1 ' since the last save ? " ) . arg ( db . currentFile ( ) ) ; <nl> if ( QMessageBox : : question ( this , QApplication : : applicationName ( ) , msg , QMessageBox : : Yes | QMessageBox : : Default , QMessageBox : : No | QMessageBox : : Escape ) = = QMessageBox : : Yes ) <nl> { <nl> db . revertAll ( ) ; <nl> void MainWindow : : saveProject ( ) <nl> QString filename = FileDialog : : getSaveFileName ( this , <nl> tr ( " Choose a filename to save under " ) , <nl> tr ( " DB Browser for SQLite project file ( * . sqbpro ) " ) , <nl> - db . curDBFilename ) ; <nl> + db . currentFile ( ) ) ; <nl> if ( ! filename . isEmpty ( ) ) <nl> { <nl> / / Make sure the file has got a . sqbpro ending <nl> void MainWindow : : saveProject ( ) <nl> <nl> / / Database file name <nl> xml . writeStartElement ( " db " ) ; <nl> - xml . writeAttribute ( " path " , db . curDBFilename ) ; <nl> + xml . writeAttribute ( " path " , db . currentFile ( ) ) ; <nl> xml . writeEndElement ( ) ; <nl> <nl> / / Window settings <nl> mmm a / src / sqlitedb . h <nl> ppp b / src / sqlitedb . h <nl> class DBBrowserDB : public QObject <nl> bool encrypted ( ) const { return isEncrypted ; } <nl> bool readOnly ( ) const { return isReadOnly ; } <nl> bool getDirty ( ) const ; <nl> + QString currentFile ( ) const { return curDBFilename ; } <nl> void logSQL ( QString statement , int msgtype ) ; <nl> <nl> QString getPragma ( const QString & pragma ) ; <nl> class DBBrowserDB : public QObject <nl> objectMap objMap ; <nl> <nl> QString lastErrorMessage ; <nl> - QString curDBFilename ; <nl> <nl> signals : <nl> void sqlExecuted ( QString sql , int msgtype ) ; <nl> void dbChanged ( bool dirty ) ; <nl> <nl> private : <nl> + QString curDBFilename ; <nl> + <nl> QStringList savepointList ; <nl> <nl> bool isEncrypted ; <nl>
|
Make current filename a private class member
|
sqlitebrowser/sqlitebrowser
|
1a7aad0ff026d73f4df076b77b7dc7438b1a4134
|
2016-01-27T22:08:48Z
|
mmm a / rust / watchman_client / src / expr . rs <nl> ppp b / rust / watchman_client / src / expr . rs <nl> impl Into < Value > for Expr { <nl> . into ( ) , <nl> Self : : Since ( term ) = > match term { <nl> SinceTerm : : ObservedClock ( c ) = > { <nl> - vec ! [ " since " . into ( ) , c . to_string ( ) . into ( ) , " oclock " . into ( ) ] . into ( ) <nl> + vec ! [ " since " . into ( ) , c . into ( ) , " oclock " . into ( ) ] . into ( ) <nl> } <nl> SinceTerm : : CreatedClock ( c ) = > { <nl> - vec ! [ " since " . into ( ) , c . to_string ( ) . into ( ) , " cclock " . into ( ) ] . into ( ) <nl> + vec ! [ " since " . into ( ) , c . into ( ) , " cclock " . into ( ) ] . into ( ) <nl> } <nl> SinceTerm : : MTime ( c ) = > { <nl> vec ! [ " since " . into ( ) , c . to_string ( ) . into ( ) , " mtime " . into ( ) ] . into ( ) <nl> mmm a / rust / watchman_client / src / pdu . rs <nl> ppp b / rust / watchman_client / src / pdu . rs <nl> pub enum Clock { <nl> / / / <nl> / / / < https : / / facebook . github . io / watchman / docs / clockspec . html > <nl> # [ derive ( Serialize , Deserialize , Debug , Clone ) ] <nl> - pub struct ClockSpec ( String ) ; <nl> + # [ serde ( untagged ) ] <nl> + pub enum ClockSpec { <nl> + StringClock ( String ) , <nl> + UnixTimestamp ( i64 ) , <nl> + } <nl> <nl> / / / Construct a null clockspec <nl> impl Default for ClockSpec { <nl> impl ClockSpec { <nl> / / / starting up from scratch and don ' t have a saved clock value <nl> / / / to use as the basis for your query . <nl> pub fn null ( ) - > Self { <nl> - Self ( " c : 0 : 0 " . to_string ( ) ) <nl> + Self : : StringClock ( " c : 0 : 0 " . to_string ( ) ) <nl> } <nl> <nl> / / / Construct a named cursor clockspec . <nl> impl ClockSpec { <nl> / / / We do not recommend using named cursors because of the exclusive <nl> / / / lock requirement . <nl> pub fn named_cursor ( cursor : & str ) - > Self { <nl> - Self ( format ! ( " n : { } " , cursor ) ) <nl> + Self : : StringClock ( format ! ( " n : { } " , cursor ) ) <nl> } <nl> <nl> / / / A clock specified as a unix timestamp . <nl> impl ClockSpec { <nl> / / / 1 second and will often result in over - reporting the same events <nl> / / / when they happen in the same second . <nl> pub fn unix_timestamp ( time_t : i64 ) - > Self { <nl> - Self ( time_t . to_string ( ) ) <nl> + Self : : UnixTimestamp ( time_t ) <nl> } <nl> } <nl> <nl> - impl std : : ops : : Deref for ClockSpec { <nl> - type Target = str ; <nl> - fn deref ( & self ) - > & str { <nl> - & self . 0 <nl> + impl Into < Value > for ClockSpec { <nl> + fn into ( self ) - > Value { <nl> + match self { <nl> + Self : : StringClock ( st ) = > Value : : Utf8String ( st ) , <nl> + Self : : UnixTimestamp ( ts ) = > Value : : Integer ( ts ) , <nl> + } <nl> } <nl> } <nl> <nl>
|
watchman_client : pass integer for UNIX timestamp ClockSpec
|
facebook/watchman
|
472e547b25aeaeee0f9680f57d3aaced6a4d4bf5
|
2020-01-18T02:54:28Z
|
mmm a / externals / catch <nl> ppp b / externals / catch <nl> @ @ - 1 + 1 @ @ <nl> - Subproject commit cd76f5730c9a3afa19f3b9c83608d9c7ab325a19 <nl> + Subproject commit 62dae592c330ab74cea30c897255ee9518639c3f <nl>
|
externals : Update catch to v2 . 1 . 1
|
yuzu-emu/yuzu
|
090da0b5c118e45cdf33724411c8766046443916
|
2018-01-27T20:42:56Z
|
mmm a / vnpy / gateway / rpc / rpc_gateway . py <nl> ppp b / vnpy / gateway / rpc / rpc_gateway . py <nl> def subscribe ( self , req : SubscribeRequest ) : <nl> def send_order ( self , req : OrderRequest ) : <nl> " " " " " " <nl> gateway_name = self . symbol_gateway_map . get ( req . vt_symbol , " " ) <nl> - self . client . send_order ( req , gateway_name ) <nl> + return self . client . send_order ( req , gateway_name ) <nl> <nl> def cancel_order ( self , req : CancelRequest ) : <nl> " " " " " " <nl>
|
[ Fix ] no vt_orderid return after sending order
|
vnpy/vnpy
|
81c7e105ab765071923002af1b5098a7c63fe301
|
2019-07-24T02:46:25Z
|
mmm a / src / memcached / clustering . cc <nl> ppp b / src / memcached / clustering . cc <nl> void memcached_parser_maker_t : : on_change ( ) { <nl> it ! = snapshot . namespaces . end ( ) ; <nl> it + + ) { <nl> if ( parsers . find ( it - > first ) = = parsers . end ( ) & & ! it - > second . is_deleted ( ) ) { <nl> - int port = 10000 + ( random ( ) % 10000 ) ; <nl> + int port = 10000 + rng_t ( ) . randint ( 55535 ) ; <nl> / / We ' re feeling lucky <nl> namespace_id_t tmp = it - > first ; <nl> parsers . insert ( tmp , new parser_and_namespace_if_t ( it - > first , this , port ) ) ; <nl>
|
fixing port randomness to be less awful , collisions now much less likely
|
rethinkdb/rethinkdb
|
77267749b39e6e5384b772213022d9a8a66156b0
|
2012-03-15T17:21:01Z
|
mmm a / cocos / base / CCConfiguration . cpp <nl> ppp b / cocos / base / CCConfiguration . cpp <nl> void Configuration : : loadConfigFile ( const std : : string & filename ) <nl> <nl> / / light info <nl> std : : string name = " cocos2d . x . 3d . max_dir_light_in_shader " ; <nl> - if ( _valueDict . find ( name ) ! = dataMap . end ( ) ) <nl> + if ( _valueDict . find ( name ) ! = _valueDict . end ( ) ) <nl> _maxDirLightInShader = _valueDict [ name ] . asInt ( ) ; <nl> else <nl> _valueDict [ name ] = Value ( _maxDirLightInShader ) ; <nl> <nl> name = " cocos2d . x . 3d . max_point_light_in_shader " ; <nl> - if ( _valueDict . find ( name ) ! = dataMap . end ( ) ) <nl> + if ( _valueDict . find ( name ) ! = _valueDict . end ( ) ) <nl> _maxPointLightInShader = _valueDict [ name ] . asInt ( ) ; <nl> else <nl> _valueDict [ name ] = Value ( _maxPointLightInShader ) ; <nl> <nl> name = " cocos2d . x . 3d . max_spot_light_in_shader " ; <nl> - if ( _valueDict . find ( name ) ! = dataMap . end ( ) ) <nl> + if ( _valueDict . find ( name ) ! = _valueDict . end ( ) ) <nl> _maxSpotLightInShader = _valueDict [ name ] . asInt ( ) ; <nl> else <nl> _valueDict [ name ] = Value ( _maxSpotLightInShader ) ; <nl>
|
works on win32
|
cocos2d/cocos2d-x
|
cc3df75d1f2455126a5f45536557d4744c34338a
|
2014-10-02T22:46:47Z
|
mmm a / cocos2d - win32 . vc2012 . sln <nl> ppp b / cocos2d - win32 . vc2012 . sln <nl> Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " libJSBinding " , " scripting \ j <nl> EndProjectSection <nl> EndProject <nl> Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " CrystalCraze " , " samples \ Javascript \ CrystalCraze \ proj . win32 \ CrystalCraze . vcxproj " , " { 9A17D9A4 - 4B11 - 4E32 - 94F6 - 895FF4909EC5 } " <nl> + ProjectSection ( ProjectDependencies ) = postProject <nl> + { 21B2C324 - 891F - 48EA - AD1A - 5AE13DE12E28 } = { 21B2C324 - 891F - 48EA - AD1A - 5AE13DE12E28 } <nl> + { 39379840 - 825A - 45A0 - B363 - C09FFEF864BD } = { 39379840 - 825A - 45A0 - B363 - C09FFEF864BD } <nl> + EndProjectSection <nl> EndProject <nl> Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " AssetsManagerTest " , " samples \ Cpp \ AssetsManagerTest \ proj . win32 \ AssetsManagerTest . vcxproj " , " { 6D37505F - A890 - 441D - BD3F - A61E2C0469CE } " <nl> EndProject <nl> mmm a / scripting / javascript / bindings / ScriptingCore . cpp <nl> ppp b / scripting / javascript / bindings / ScriptingCore . cpp <nl> JSBool jsval_to_ccarray ( JSContext * cx , jsval v , CCArray * * ret ) { <nl> jsval ccarray_to_jsval ( JSContext * cx , CCArray * arr ) <nl> { <nl> JSObject * jsretArr = JS_NewArrayObject ( cx , 0 , NULL ) ; <nl> - <nl> - for ( unsigned int i = 0 ; i < arr - > count ( ) ; + + i ) { <nl> - jsval arrElement ; <nl> - CCObject * obj = arr - > objectAtIndex ( i ) ; <nl> - <nl> - / / First , check whether object is associated with js object . <nl> - js_proxy_t * jsproxy = js_get_or_create_proxy < cocos2d : : CCObject > ( cx , obj ) ; <nl> - if ( jsproxy ) { <nl> - arrElement = OBJECT_TO_JSVAL ( jsproxy - > obj ) ; <nl> - } <nl> - else { <nl> - CCString * strVal = NULL ; <nl> - CCDictionary * dictVal = NULL ; <nl> - CCArray * arrVal = NULL ; <nl> - CCDouble * doubleVal = NULL ; <nl> - CCBool * boolVal = NULL ; <nl> - CCFloat * floatVal = NULL ; <nl> - CCInteger * intVal = NULL ; <nl> + if ( arr & & arr - > count ( ) > 0 ) { <nl> + for ( unsigned int i = 0 ; i < arr - > count ( ) ; + + i ) { <nl> + jsval arrElement ; <nl> + CCObject * obj = arr - > objectAtIndex ( i ) ; <nl> + <nl> + / / First , check whether object is associated with js object . <nl> + js_proxy_t * jsproxy = js_get_or_create_proxy < cocos2d : : CCObject > ( cx , obj ) ; <nl> + if ( jsproxy ) { <nl> + arrElement = OBJECT_TO_JSVAL ( jsproxy - > obj ) ; <nl> + } <nl> + else { <nl> + CCString * strVal = NULL ; <nl> + CCDictionary * dictVal = NULL ; <nl> + CCArray * arrVal = NULL ; <nl> + CCDouble * doubleVal = NULL ; <nl> + CCBool * boolVal = NULL ; <nl> + CCFloat * floatVal = NULL ; <nl> + CCInteger * intVal = NULL ; <nl> <nl> - if ( ( strVal = dynamic_cast < cocos2d : : CCString * > ( obj ) ) ) { <nl> - arrElement = c_string_to_jsval ( cx , strVal - > getCString ( ) ) ; <nl> - } else if ( ( dictVal = dynamic_cast < cocos2d : : CCDictionary * > ( obj ) ) ) { <nl> - arrElement = ccdictionary_to_jsval ( cx , dictVal ) ; <nl> - } else if ( ( arrVal = dynamic_cast < cocos2d : : CCArray * > ( obj ) ) ) { <nl> - arrElement = ccarray_to_jsval ( cx , arrVal ) ; <nl> - } else if ( ( doubleVal = dynamic_cast < CCDouble * > ( obj ) ) ) { <nl> - arrElement = DOUBLE_TO_JSVAL ( doubleVal - > getValue ( ) ) ; <nl> - } else if ( ( floatVal = dynamic_cast < CCFloat * > ( obj ) ) ) { <nl> - arrElement = DOUBLE_TO_JSVAL ( floatVal - > getValue ( ) ) ; <nl> - } else if ( ( intVal = dynamic_cast < CCInteger * > ( obj ) ) ) { <nl> - arrElement = INT_TO_JSVAL ( intVal - > getValue ( ) ) ; <nl> - } else if ( ( boolVal = dynamic_cast < CCBool * > ( obj ) ) ) { <nl> - arrElement = BOOLEAN_TO_JSVAL ( boolVal - > getValue ( ) ? JS_TRUE : JS_FALSE ) ; <nl> - } else { <nl> - CCAssert ( false , " the type isn ' t suppored . " ) ; <nl> + if ( ( strVal = dynamic_cast < cocos2d : : CCString * > ( obj ) ) ) { <nl> + arrElement = c_string_to_jsval ( cx , strVal - > getCString ( ) ) ; <nl> + } else if ( ( dictVal = dynamic_cast < cocos2d : : CCDictionary * > ( obj ) ) ) { <nl> + arrElement = ccdictionary_to_jsval ( cx , dictVal ) ; <nl> + } else if ( ( arrVal = dynamic_cast < cocos2d : : CCArray * > ( obj ) ) ) { <nl> + arrElement = ccarray_to_jsval ( cx , arrVal ) ; <nl> + } else if ( ( doubleVal = dynamic_cast < CCDouble * > ( obj ) ) ) { <nl> + arrElement = DOUBLE_TO_JSVAL ( doubleVal - > getValue ( ) ) ; <nl> + } else if ( ( floatVal = dynamic_cast < CCFloat * > ( obj ) ) ) { <nl> + arrElement = DOUBLE_TO_JSVAL ( floatVal - > getValue ( ) ) ; <nl> + } else if ( ( intVal = dynamic_cast < CCInteger * > ( obj ) ) ) { <nl> + arrElement = INT_TO_JSVAL ( intVal - > getValue ( ) ) ; <nl> + } else if ( ( boolVal = dynamic_cast < CCBool * > ( obj ) ) ) { <nl> + arrElement = BOOLEAN_TO_JSVAL ( boolVal - > getValue ( ) ? JS_TRUE : JS_FALSE ) ; <nl> + } else { <nl> + CCAssert ( false , " the type isn ' t suppored . " ) ; <nl> + } <nl> + } <nl> + if ( ! JS_SetElement ( cx , jsretArr , i , & arrElement ) ) { <nl> + break ; <nl> } <nl> - } <nl> - if ( ! JS_SetElement ( cx , jsretArr , i , & arrElement ) ) { <nl> - break ; <nl> } <nl> } <nl> return OBJECT_TO_JSVAL ( jsretArr ) ; <nl>
|
Merge pull request from dumganhar / master
|
cocos2d/cocos2d-x
|
2fbd09fe273d0ed9da3618f1544d65f53ab89f59
|
2013-03-15T14:25:17Z
|
mmm a / lib / IRGen / GenProto . cpp <nl> ppp b / lib / IRGen / GenProto . cpp <nl> namespace { <nl> <nl> void destroy ( IRGenFunction & IGF , Address addr ) const { <nl> emitDestroyCall ( IGF , getWitnessTable ( IGF ) , addr . getAddress ( ) ) ; <nl> - } <nl> + } <nl> + <nl> + virtual std : : pair < llvm : : Value * , llvm : : Value * > <nl> + getSizeAndAlignment ( IRGenFunction & IGF ) const { <nl> + / / Call the size an alignment witness . <nl> + llvm : : Value * witnessTable = getWitnessTable ( IGF ) ; <nl> + llvm : : Value * fn = loadValueWitness ( IGF , witnessTable , <nl> + ValueWitness : : SizeAndAlignment ) ; <nl> + llvm : : CallInst * call = IGF . Builder . CreateCall ( fn , witnessTable ) ; <nl> + call - > setCallingConv ( IGF . IGM . RuntimeCC ) ; <nl> + call - > setDoesNotThrow ( ) ; <nl> + <nl> + / / Extract the size and alignment . <nl> + unsigned int Array [ 2 ] = { 0 , 1 } ; <nl> + llvm : : Value * size <nl> + = IGF . Builder . CreateExtractValue ( call , <nl> + ArrayRef < unsigned int > ( Array , 1 ) , <nl> + " size " ) ; <nl> + llvm : : Value * align <nl> + = IGF . Builder . CreateExtractValue ( call , <nl> + ArrayRef < unsigned int > ( Array + 1 , 1 ) , <nl> + " align " ) ; <nl> + return std : : make_pair ( size , align ) ; <nl> + } <nl> } ; <nl> <nl> / / / Ways in which an object can fit into a fixed - size buffer . <nl> mmm a / lib / IRGen / TypeInfo . h <nl> ppp b / lib / IRGen / TypeInfo . h <nl> class TypeInfo { <nl> llvm : : Type * getStorageType ( ) const { return StorageType ; } <nl> <nl> / / / Return the size and alignment of this type . <nl> - std : : pair < llvm : : Value * , llvm : : Value * > <nl> + virtual std : : pair < llvm : : Value * , llvm : : Value * > <nl> getSizeAndAlignment ( IRGenFunction & IGF ) const ; <nl> llvm : : Value * getSizeOnly ( IRGenFunction & IGF ) const ; <nl> llvm : : Value * getAlignmentOnly ( IRGenFunction & IGF ) const ; <nl>
|
Virtualize TypeInfo : : getSizeAndAlignment ( ) and teach it to query the
|
apple/swift
|
2da3c6c25144896521946c59b8bad241618ca45d
|
2012-07-10T19:08:14Z
|
similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / CNTK . core . bs <nl> rename to contrib / Python / cntk / CNTK . core . bs <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / __init__ . py <nl> rename to contrib / Python / cntk / __init__ . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / conftest . py <nl> rename to contrib / Python / cntk / conftest . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / context . py <nl> rename to contrib / Python / cntk / context . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / examples / LogReg / SimpleMapping - 3Classes . txt <nl> rename to contrib / Python / cntk / examples / LogReg / SimpleMapping - 3Classes . txt <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / examples / LogReg / Train - 3Classes . txt <nl> rename to contrib / Python / cntk / examples / LogReg / Train - 3Classes . txt <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / examples / LogReg / logreg . py <nl> rename to contrib / Python / cntk / examples / LogReg / logreg . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / examples / MNIST / Data / labelsmap . txt <nl> rename to contrib / Python / cntk / examples / MNIST / Data / labelsmap . txt <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / examples / MNIST / fetch_mnist_data . py <nl> rename to contrib / Python / cntk / examples / MNIST / fetch_mnist_data . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / examples / MNIST / mnist_one_layer . py <nl> rename to contrib / Python / cntk / examples / MNIST / mnist_one_layer . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / examples / __init__ . py <nl> rename to contrib / Python / cntk / examples / __init__ . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / graph . py <nl> rename to contrib / Python / cntk / graph . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / objectives . py <nl> rename to contrib / Python / cntk / objectives . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / ops . py <nl> rename to contrib / Python / cntk / ops . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / optimizer . py <nl> rename to contrib / Python / cntk / optimizer . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / pytest . ini <nl> rename to contrib / Python / cntk / pytest . ini <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / reader . py <nl> rename to contrib / Python / cntk / reader . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / templates / cntk_eval_template . cntk <nl> rename to contrib / Python / cntk / templates / cntk_eval_template . cntk <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / templates / cntk_predict_template . cntk <nl> rename to contrib / Python / cntk / templates / cntk_predict_template . cntk <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / templates / cntk_test_template . cntk <nl> rename to contrib / Python / cntk / templates / cntk_test_template . cntk <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / templates / cntk_train_template . cntk <nl> rename to contrib / Python / cntk / templates / cntk_train_template . cntk <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / test / __init__ . py <nl> rename to contrib / Python / cntk / test / __init__ . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / test / test_context . py <nl> rename to contrib / Python / cntk / test / test_context . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / test / test_fetch_ops . py <nl> rename to contrib / Python / cntk / test / test_fetch_ops . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / test / test_graph . py <nl> rename to contrib / Python / cntk / test / test_graph . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / test / test_ops . py <nl> rename to contrib / Python / cntk / test / test_ops . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / test / test_reader . py <nl> rename to contrib / Python / cntk / test / test_reader . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / cntk / utils / _fetch_ops . py <nl> rename to contrib / Python / cntk / utils / _fetch_ops . py <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / requirements . txt <nl> rename to contrib / Python / requirements . txt <nl> similarity index 100 % <nl> rename from LanguageBindings / Python / setup_sh . ps <nl> rename to contrib / Python / setup_sh . ps <nl>
|
Renamed folder LanguageBindings to contri
|
microsoft/CNTK
|
8af637de2b59086a706a979cdd7c7b9960809919
|
2016-03-22T19:06:40Z
|
mmm a / 3rdParty / velocypack / src / Validator . cpp <nl> ppp b / 3rdParty / velocypack / src / Validator . cpp <nl> void Validator : : validateCompactObject ( uint8_t const * ptr , std : : size_t length ) { <nl> / / validate key <nl> validate ( p , e - p , true ) ; <nl> Slice key ( p ) ; <nl> - if ( ! key . isString ( ) & & ! key . isInteger ( ) ) { <nl> + bool isString = key . isString ( ) ; <nl> + if ( ! isString & & ! key . isInteger ( ) ) { <nl> throw Exception ( Exception : : ValidatorInvalidLength , " Invalid object key type " ) ; <nl> } <nl> + ValueLength keySize = key . byteSize ( ) ; <nl> + / / validate key <nl> + if ( isString & & options - > validateUtf8Strings ) { <nl> + validate ( p , keySize , true ) ; <nl> + } <nl> <nl> / / validate value <nl> - p + = key . byteSize ( ) ; <nl> + p + = keySize ; <nl> validate ( p , e - p , true ) ; <nl> p + = Slice ( p ) . byteSize ( ) ; <nl> } <nl> void Validator : : validateIndexedObject ( uint8_t const * ptr , std : : size_t length ) { <nl> validate ( member , indexTable - member , true ) ; <nl> <nl> Slice key ( member ) ; <nl> - if ( ! key . isString ( ) & & ! key . isInteger ( ) ) { <nl> + bool const isString = key . isString ( ) ; <nl> + if ( ! isString & & ! key . isInteger ( ) ) { <nl> throw Exception ( Exception : : ValidatorInvalidLength , " Invalid object key type " ) ; <nl> } <nl> <nl> ValueLength const keySize = key . byteSize ( ) ; <nl> + if ( isString & & options - > validateUtf8Strings ) { <nl> + validate ( member , keySize , true ) ; <nl> + } <nl> + <nl> uint8_t const * value = member + keySize ; <nl> if ( value > = indexTable ) { <nl> throw Exception ( Exception : : ValidatorInvalidLength , " Object value leaking into index table " ) ; <nl> mmm a / CHANGELOG <nl> ppp b / CHANGELOG <nl> <nl> devel <nl> mmm - - <nl> <nl> + * Added startup option ` - - server . validate - utf8 - strings ` . <nl> + <nl> + This option controls whether strings in incoming JSON or VPack requests are <nl> + validated for UTF - 8 conformity . If set to ` true ` ( which is the default value ) , <nl> + all strings are validated , and requests containing invalid UTF - 8 data will be <nl> + rejected . Setting the option to ` false ` will turn off the UTF - 8 string <nl> + validation for incoming requests . This mode should only be used for <nl> + deployments that are known to already contain invalid UTF - 8 data and to keep <nl> + them operational until the wrong string encoding is fixed in the data . <nl> + <nl> * Updated OpenSSL to 1 . 1 . 1f . <nl> <nl> * Fixed a bug which occurred if a dbserver was shut down exactly <nl> mmm a / arangod / Replication / DatabaseInitialSyncer . cpp <nl> ppp b / arangod / Replication / DatabaseInitialSyncer . cpp <nl> Result DatabaseInitialSyncer : : parseCollectionDump ( transaction : : Methods & trx , <nl> if ( found & & ( cType = = StaticStrings : : MimeTypeVPack ) ) { <nl> LOG_TOPIC ( " b9f4d " , DEBUG , Logger : : REPLICATION ) < < " using vpack for chunk contents " ; <nl> <nl> - VPackOptions options ; <nl> - options . validateUtf8Strings = true ; <nl> - options . disallowExternals = true ; <nl> - options . disallowCustom = true ; <nl> - options . checkAttributeUniqueness = true ; <nl> - options . unsupportedTypeBehavior = VPackOptions : : FailOnUnsupportedType ; <nl> - VPackValidator validator ( & options ) ; <nl> + VPackValidator validator ( & basics : : VelocyPackHelper : : requestValidationOptions ) ; <nl> <nl> try { <nl> while ( p < end ) { <nl> Result DatabaseInitialSyncer : : parseCollectionDump ( transaction : : Methods & trx , <nl> TRI_ASSERT ( * end = = ' \ 0 ' ) ; <nl> LOG_TOPIC ( " bad5d " , DEBUG , Logger : : REPLICATION ) < < " using json for chunk contents " ; <nl> <nl> + <nl> VPackBuilder builder ; <nl> - VPackParser parser ( builder ) ; <nl> + VPackParser parser ( builder , & basics : : VelocyPackHelper : : requestValidationOptions ) ; <nl> <nl> while ( p < end ) { <nl> char const * q = strchr ( p , ' \ n ' ) ; <nl> mmm a / arangod / Replication / ReplicationFeature . h <nl> ppp b / arangod / Replication / ReplicationFeature . h <nl> <nl> struct TRI_vocbase_t ; <nl> <nl> namespace arangodb { <nl> + namespace application_features { <nl> + class ApplicationServer ; <nl> + } <nl> <nl> class GeneralResponse ; <nl> <nl> mmm a / arangod / Replication / Syncer . h <nl> ppp b / arangod / Replication / Syncer . h <nl> <nl> struct TRI_vocbase_t ; <nl> <nl> namespace arangodb { <nl> - namespace application_features { <nl> - class ApplicationServer ; <nl> - } <nl> namespace httpclient { <nl> class GeneralClientConnection ; <nl> class SimpleHttpClient ; <nl> mmm a / arangod / RestHandler / RestReplicationHandler . cpp <nl> ppp b / arangod / RestHandler / RestReplicationHandler . cpp <nl> <nl> # include " Rest / HttpResponse . h " <nl> # include " RestServer / DatabaseFeature . h " <nl> # include " RestServer / QueryRegistryFeature . h " <nl> + # include " RestServer / ServerFeature . h " <nl> # include " RestServer / ServerIdFeature . h " <nl> # include " Sharding / ShardingInfo . h " <nl> # include " StorageEngine / EngineSelectorFeature . h " <nl> Result RestReplicationHandler : : processRestoreData ( std : : string const & colName ) { <nl> Result RestReplicationHandler : : parseBatch ( std : : string const & collectionName , <nl> std : : unordered_map < std : : string , VPackValueLength > & latest , <nl> VPackBuilder & allMarkers ) { <nl> - VPackOptions options = VPackOptions : : Defaults ; <nl> - options . checkAttributeUniqueness = true ; <nl> - VPackBuilder builder ( & options ) ; <nl> + VPackBuilder builder ( & basics : : VelocyPackHelper : : requestValidationOptions ) ; <nl> <nl> allMarkers . clear ( ) ; <nl> <nl> Result RestReplicationHandler : : parseBatch ( std : : string const & collectionName , <nl> _request - > contentType ( ) ! = ContentType : : DUMP ) { <nl> THROW_ARANGO_EXCEPTION_MESSAGE ( TRI_ERROR_INTERNAL , " invalid request type " ) ; <nl> } <nl> - <nl> + <nl> VPackStringRef bodyStr = _request - > rawPayload ( ) ; <nl> char const * ptr = bodyStr . data ( ) ; <nl> char const * end = ptr + bodyStr . size ( ) ; <nl> - <nl> + <nl> VPackValueLength currentPos = 0 ; <nl> <nl> / / First parse and collect all markers , we assemble everything in one <nl> Result RestReplicationHandler : : parseBatch ( std : : string const & collectionName , <nl> Result res = <nl> restoreDataParser ( ptr , pos , collectionName , line , key , builder , doc , type ) ; <nl> if ( res . fail ( ) ) { <nl> + if ( res . errorNumber ( ) = = TRI_ERROR_HTTP_CORRUPTED_JSON ) { <nl> + using namespace std : : literals : : string_literals ; <nl> + auto data = std : : string ( ptr , pos ) ; <nl> + res . appendErrorMessage ( " in message ' " s + data + " ' " ) ; <nl> + } <nl> return res ; <nl> } <nl> <nl> mmm a / arangod / RestServer / ServerFeature . cpp <nl> ppp b / arangod / RestServer / ServerFeature . cpp <nl> void ServerFeature : : collectOptions ( std : : shared_ptr < ProgramOptions > options ) { <nl> options - > addOption ( " - - server . rest - server " , " start a rest - server " , <nl> new BooleanParameter ( & _restServer ) , <nl> arangodb : : options : : makeDefaultFlags ( arangodb : : options : : Flags : : Hidden ) ) ; <nl> + <nl> + options - > addOption ( " - - server . validate - utf8 - strings " , " perform UTF - 8 string validation for incoming JSON and VelocyPack data " , <nl> + new BooleanParameter ( & _validateUtf8Strings ) , <nl> + arangodb : : options : : makeDefaultFlags ( arangodb : : options : : Flags : : Hidden ) ) . setIntroducedIn ( 30700 ) ; <nl> <nl> options - > addSection ( " javascript " , " Configure the JavaScript engine " ) ; <nl> <nl> void ServerFeature : : validateOptions ( std : : shared_ptr < ProgramOptions > options ) { <nl> } <nl> } <nl> <nl> + void ServerFeature : : prepare ( ) { <nl> + / / adjust global settings for UTF - 8 string validation <nl> + basics : : VelocyPackHelper : : requestValidationOptions . validateUtf8Strings = _validateUtf8Strings ; <nl> + } <nl> + <nl> void ServerFeature : : start ( ) { <nl> # if _WIN32 <nl> _originalCodePage = GetConsoleOutputCP ( ) ; <nl> mmm a / arangod / RestServer / ServerFeature . h <nl> ppp b / arangod / RestServer / ServerFeature . h <nl> class ServerFeature final : public application_features : : ApplicationFeature { <nl> <nl> void collectOptions ( std : : shared_ptr < options : : ProgramOptions > ) override final ; <nl> void validateOptions ( std : : shared_ptr < options : : ProgramOptions > ) override final ; <nl> + void prepare ( ) override final ; <nl> void start ( ) override final ; <nl> void stop ( ) override final ; <nl> void beginShutdown ( ) override final ; <nl> class ServerFeature final : public application_features : : ApplicationFeature { <nl> <nl> bool _console = false ; <nl> bool _restServer = true ; <nl> + bool _validateUtf8Strings = true ; <nl> + bool _isStopping = false ; <nl> std : : vector < std : : string > _scripts ; <nl> int * _result ; <nl> OperationMode _operationMode ; <nl> - bool _isStopping = false ; <nl> # if _WIN32 <nl> uint16_t _codePage ; <nl> uint16_t _originalCodePage ; <nl> mmm a / lib / Basics / VelocyPackHelper . cpp <nl> ppp b / lib / Basics / VelocyPackHelper . cpp <nl> struct DefaultCustomTypeHandler final : public VPackCustomTypeHandler { <nl> return " hello from CustomTypeHandler " ; <nl> } <nl> } ; <nl> + <nl> + / * static * / arangodb : : velocypack : : Options VelocyPackHelper : : requestValidationOptions ; <nl> <nl> / / / @ brief static initializer for all VPack values <nl> void VelocyPackHelper : : initialize ( ) { <nl> void VelocyPackHelper : : initialize ( ) { <nl> : : optionsWithUniquenessCheck = VPackOptions : : Defaults ; <nl> : : optionsWithUniquenessCheck . checkAttributeUniqueness = true ; <nl> <nl> + / / set up options for validating incoming requests <nl> + requestValidationOptions = VPackOptions : : Defaults ; <nl> + requestValidationOptions . checkAttributeUniqueness = true ; <nl> + / / note : this value may be overriden by configuration ! <nl> + requestValidationOptions . validateUtf8Strings = true ; <nl> + requestValidationOptions . disallowExternals = true ; <nl> + requestValidationOptions . disallowCustom = true ; <nl> + requestValidationOptions . disallowTags = true ; <nl> + requestValidationOptions . disallowBCD = true ; <nl> + requestValidationOptions . unsupportedTypeBehavior = VPackOptions : : FailOnUnsupportedType ; <nl> + <nl> / / run quick selfs test with the attribute translator <nl> TRI_ASSERT ( VPackSlice ( : : translator - > translate ( StaticStrings : : KeyString ) ) . getUInt ( ) = = <nl> KeyAttribute - AttributeBase ) ; <nl> mmm a / lib / Basics / VelocyPackHelper . h <nl> ppp b / lib / Basics / VelocyPackHelper . h <nl> class VelocyPackHelper { <nl> bool sanitizeExternals = true , bool sanitizeCustom = true ) ; <nl> <nl> static uint64_t extractIdValue ( VPackSlice const & slice ) ; <nl> + <nl> + static arangodb : : velocypack : : Options requestValidationOptions ; <nl> <nl> static uint8_t const KeyAttribute = 0x31 ; <nl> static uint8_t const RevAttribute = 0x32 ; <nl> mmm a / lib / Rest / GeneralRequest . h <nl> ppp b / lib / Rest / GeneralRequest . h <nl> class GeneralRequest { <nl> public : <nl> GeneralRequest ( GeneralRequest & & ) = default ; <nl> <nl> - public : <nl> - <nl> / / translate an RequestType enum value into an " HTTP method string " <nl> static std : : string translateMethod ( RequestType ) ; <nl> <nl> class GeneralRequest { <nl> _contentTypeResponse ( ContentType : : UNSET ) , <nl> _acceptEncoding ( EncodingType : : UNSET ) , <nl> _isRequestContextOwner ( false ) , <nl> - _authenticated ( false ) { } <nl> + _authenticated ( false ) { } <nl> <nl> virtual ~ GeneralRequest ( ) ; <nl> <nl> mmm a / lib / Rest / HttpRequest . cpp <nl> ppp b / lib / Rest / HttpRequest . cpp <nl> <nl> <nl> # include " Basics / StaticStrings . h " <nl> # include " Basics / StringUtils . h " <nl> + # include " Basics / VelocyPackHelper . h " <nl> # include " Basics / conversions . h " <nl> # include " Basics / debugging . h " <nl> # include " Basics / tri - strings . h " <nl> HttpRequest : : HttpRequest ( ConnectionInfo const & connectionInfo , <nl> uint64_t mid , bool allowMethodOverride ) <nl> : GeneralRequest ( connectionInfo , mid ) , <nl> _allowMethodOverride ( allowMethodOverride ) { <nl> - _contentType = ContentType : : UNSET ; <nl> - _contentTypeResponse = ContentType : : JSON ; <nl> + _contentType = ContentType : : UNSET ; <nl> + _contentTypeResponse = ContentType : : JSON ; <nl> } <nl> <nl> / / HACK HACK HACK <nl> HttpRequest : : HttpRequest ( ConnectionInfo const & connectionInfo , <nl> HttpRequest : : HttpRequest ( ContentType contentType , char const * body , int64_t contentLength , <nl> std : : unordered_map < std : : string , std : : string > const & headers ) <nl> : GeneralRequest ( ConnectionInfo ( ) , 1 ) , <nl> - _allowMethodOverride ( false ) { <nl> + _allowMethodOverride ( false ) , <nl> + _validatedPayload ( false ) { <nl> _contentType = contentType ; <nl> _contentTypeResponse = contentType ; <nl> _payload . append ( body , contentLength ) ; <nl> void HttpRequest : : parseUrl ( const char * path , size_t length ) { <nl> } <nl> } <nl> } <nl> - <nl> + <nl> const char * start = tmp . data ( ) ; <nl> const char * end = start + tmp . size ( ) ; <nl> / / look for database name in URL <nl> if ( end - start > = 5 ) { <nl> char const * q = start ; <nl> - <nl> + <nl> / / check if the prefix is " _db " <nl> if ( q [ 0 ] = = ' / ' & & q [ 1 ] = = ' _ ' & & q [ 2 ] = = ' d ' & & q [ 3 ] = = ' b ' & & q [ 4 ] = = ' / ' ) { <nl> / / request contains database name <nl> q + = 5 ; <nl> start = q ; <nl> - <nl> + <nl> / / read until end of database name <nl> while ( q < end ) { <nl> if ( * q = = ' / ' | | * q = = ' ? ' | | * q = = ' ' | | * q = = ' \ n ' | | * q = = ' \ r ' ) { <nl> void HttpRequest : : parseUrl ( const char * path , size_t length ) { <nl> } <nl> + + q ; <nl> } <nl> - <nl> + <nl> TRI_ASSERT ( q > = start ) ; <nl> _databaseName = std : : string ( start , q - start ) ; <nl> _fullUrl . assign ( q , end - q ) ; <nl> - <nl> + <nl> start = q ; <nl> } else { <nl> - _fullUrl . assign ( start , end - start ) ; <nl> + _fullUrl . assign ( start , end - start ) ; <nl> } <nl> } else { <nl> _fullUrl . assign ( start , end - start ) ; <nl> } <nl> TRI_ASSERT ( ! _fullUrl . empty ( ) ) ; <nl> - <nl> + <nl> char const * q = start ; <nl> while ( q ! = end & & * q ! = ' ? ' ) { <nl> + + q ; <nl> } <nl> - <nl> + <nl> if ( q = = end | | * q = = ' ? ' ) { <nl> _requestPath . assign ( start , q - start ) ; <nl> } <nl> if ( q = = end ) { <nl> return ; <nl> } <nl> - <nl> + <nl> bool keyPhase = true ; <nl> const char * keyBegin = + + q ; <nl> const char * keyEnd = keyBegin ; <nl> void HttpRequest : : parseUrl ( const char * path , size_t length ) { <nl> + + q ; <nl> continue ; <nl> } <nl> - <nl> + <nl> if ( q + 1 = = end | | * ( q + 1 ) = = ' & ' ) { <nl> + + q ; / / skip ahead <nl> - <nl> + <nl> std : : string val = : : url_decode ( valueBegin , q ) ; <nl> if ( keyEnd - keyBegin > 2 & & * ( keyEnd - 2 ) = = ' [ ' & & * ( keyEnd - 1 ) = = ' ] ' ) { <nl> / / found parameter xxx [ ] <nl> void HttpRequest : : parseUrl ( const char * path , size_t length ) { <nl> <nl> void HttpRequest : : setHeaderV2 ( std : : string & & key , std : : string & & value ) { <nl> StringUtils : : tolowerInPlace ( key ) ; / / always lowercase key <nl> - <nl> + <nl> if ( key = = StaticStrings : : ContentLength ) { <nl> size_t len = NumberUtils : : atoi_zero < uint64_t > ( value . c_str ( ) , value . c_str ( ) + value . size ( ) ) ; <nl> if ( _payload . capacity ( ) < len ) { <nl> void HttpRequest : : setHeaderV2 ( std : : string & & key , std : : string & & value ) { <nl> / / do not store this header <nl> return ; <nl> } <nl> - <nl> + <nl> if ( key = = StaticStrings : : Accept ) { <nl> _contentTypeResponse = rest : : stringToContentType ( value , / * default * / ContentType : : JSON ) ; <nl> return ; <nl> void HttpRequest : : setHeaderV2 ( std : : string & & key , std : : string & & value ) { <nl> _acceptEncoding = EncodingType : : DEFLATE ; <nl> } <nl> } <nl> - <nl> + <nl> if ( key = = " cookie " ) { <nl> parseCookies ( value . c_str ( ) , value . size ( ) ) ; <nl> return ; <nl> } <nl> - <nl> + <nl> if ( _allowMethodOverride & & key . size ( ) > = 13 & & key [ 0 ] = = ' x ' & & key [ 1 ] = = ' - ' ) { <nl> / / handle x - . . . headers <nl> - <nl> + <nl> / / override HTTP method ? <nl> if ( key = = " x - http - method " | | <nl> key = = " x - method - override " | | <nl> void HttpRequest : : setHeaderV2 ( std : : string & & key , std : : string & & value ) { <nl> return ; <nl> } <nl> } <nl> - <nl> + <nl> _headers [ std : : move ( key ) ] = std : : move ( value ) ; <nl> } <nl> <nl> VPackSlice HttpRequest : : payload ( VPackOptions const * options ) { <nl> if ( ( _contentType = = ContentType : : UNSET ) | | ( _contentType = = ContentType : : JSON ) ) { <nl> if ( ! _payload . empty ( ) ) { <nl> if ( ! _vpackBuilder ) { <nl> - VPackParser parser ( options ) ; <nl> + VPackParser parser ( & basics : : VelocyPackHelper : : requestValidationOptions ) ; <nl> parser . parse ( _payload . data ( ) , <nl> _payload . size ( ) ) ; <nl> _vpackBuilder = parser . steal ( ) ; <nl> VPackSlice HttpRequest : : payload ( VPackOptions const * options ) { <nl> } <nl> return VPackSlice : : noneSlice ( ) ; / / no body <nl> } else if ( _contentType = = ContentType : : VPACK ) { <nl> - VPackOptions validationOptions = * options ; / / intentional copy <nl> - validationOptions . validateUtf8Strings = true ; <nl> - validationOptions . checkAttributeUniqueness = true ; <nl> - validationOptions . disallowExternals = true ; <nl> - validationOptions . disallowCustom = true ; <nl> - VPackValidator validator ( & validationOptions ) ; <nl> - validator . validate ( _payload . data ( ) , _payload . length ( ) ) ; / / throws on error <nl> + VPackValidator validator ( & basics : : VelocyPackHelper : : requestValidationOptions ) ; <nl> + if ( ! _validatedPayload ) { <nl> + _validatedPayload = validator . validate ( _payload . data ( ) , _payload . length ( ) ) ; / / throws on error <nl> + } <nl> return VPackSlice ( reinterpret_cast < uint8_t const * > ( _payload . data ( ) ) ) ; <nl> } <nl> return VPackSlice : : noneSlice ( ) ; <nl> mmm a / lib / Rest / HttpRequest . h <nl> ppp b / lib / Rest / HttpRequest . h <nl> namespace velocypack { <nl> class Builder ; <nl> struct Options ; <nl> } / / namespace velocypack <nl> - <nl> + <nl> class HttpRequest final : public GeneralRequest { <nl> friend class RestBatchHandler ; / / TODO remove <nl> <nl> class HttpRequest final : public GeneralRequest { <nl> void setPayload ( arangodb : : velocypack : : Buffer < uint8_t > buffer ) override { <nl> _payload = std : : move ( buffer ) ; <nl> } <nl> - <nl> + <nl> arangodb : : velocypack : : Buffer < uint8_t > & body ( ) { <nl> return _payload ; <nl> } <nl> class HttpRequest final : public GeneralRequest { <nl> void setHeader ( char const * key , size_t keyLength , char const * value , size_t valueLength ) ; <nl> / / / @ brief sets a key - only header <nl> void setHeader ( char const * key , size_t keyLength ) ; <nl> - <nl> + <nl> / / / @ brief parse an existing path <nl> void parseUrl ( char const * start , size_t len ) ; <nl> void setHeaderV2 ( std : : string & & key , std : : string & & value ) ; <nl> - <nl> + <nl> static HttpRequest * createHttpRequest ( ContentType contentType , <nl> char const * body , int64_t contentLength , <nl> std : : unordered_map < std : : string , std : : string > const & headers ) ; <nl> - <nl> + <nl> protected : <nl> void setValue ( char * key , char * value ) ; <nl> void setArrayValue ( char const * key , size_t length , char const * value ) ; <nl> <nl> private : <nl> - <nl> + <nl> / / / used by RestBatchHandler ( an API straight from hell ) <nl> void parseHeader ( char * buffer , size_t length ) ; <nl> void setValues ( char * buffer , char * end ) ; <nl> void setCookie ( char * key , size_t length , char const * value ) ; <nl> - <nl> + <nl> void parseCookies ( char const * buffer , size_t length ) ; <nl> <nl> private : <nl> class HttpRequest final : public GeneralRequest { <nl> / / whether or not overriding the HTTP method via custom headers <nl> / / ( x - http - method , x - method - override or x - http - method - override ) is allowed <nl> bool const _allowMethodOverride ; <nl> + <nl> + / / / @ brief was VPack payload validated <nl> + bool _validatedPayload ; <nl> } ; <nl> } / / namespace arangodb <nl> <nl> mmm a / lib / Rest / VstRequest . cpp <nl> ppp b / lib / Rest / VstRequest . cpp <nl> <nl> / / / @ author Jan Christoph Uhde <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> - # include < string . h > <nl> # include < cstdint > <nl> # include < exception > <nl> # include < stdexcept > <nl> # include < string > <nl> - # include < unordered_map > <nl> # include < utility > <nl> # include < vector > <nl> <nl> <nl> <nl> # include " Basics / StaticStrings . h " <nl> # include " Basics / StringUtils . h " <nl> + # include " Basics / VelocyPackHelper . h " <nl> # include " Basics / debugging . h " <nl> # include " Endpoint / ConnectionInfo . h " <nl> # include " Logger / LogMacros . h " <nl> VPackSlice VstRequest : : payload ( VPackOptions const * options ) { <nl> if ( _contentType = = ContentType : : JSON ) { <nl> if ( ! _vpackBuilder & & _payload . size ( ) > _payloadOffset ) { <nl> _vpackBuilder = VPackParser : : fromJson ( _payload . data ( ) + _payloadOffset , <nl> - _payload . size ( ) - _payloadOffset ) ; <nl> + _payload . size ( ) - _payloadOffset , <nl> + & basics : : VelocyPackHelper : : requestValidationOptions ) ; <nl> } <nl> if ( _vpackBuilder ) { <nl> return _vpackBuilder - > slice ( ) ; <nl> VPackSlice VstRequest : : payload ( VPackOptions const * options ) { <nl> uint8_t const * ptr = _payload . data ( ) + _payloadOffset ; <nl> if ( ! _validatedPayload ) { <nl> / / / the header is validated in VstCommTask , the actual body is only validated on demand <nl> - VPackOptions validationOptions = * options ; / / intentional copy <nl> - validationOptions . validateUtf8Strings = true ; <nl> - validationOptions . checkAttributeUniqueness = true ; <nl> - validationOptions . disallowExternals = true ; <nl> - validationOptions . disallowCustom = true ; <nl> - VPackValidator validator ( & validationOptions ) ; <nl> + VPackValidator validator ( & basics : : VelocyPackHelper : : requestValidationOptions ) ; <nl> / / will throw on error <nl> _validatedPayload = validator . validate ( ptr , _payload . size ( ) - _payloadOffset ) ; <nl> } <nl> mmm a / tests / rb / HttpInterface / api - document - create - spec . rb <nl> ppp b / tests / rb / HttpInterface / api - document - create - spec . rb <nl> <nl> <nl> ArangoDB . drop_collection ( cn ) <nl> end <nl> + <nl> + it " returns an error if an string attribute in the JSON body is corrupted " do <nl> + cn = " UnitTestsCollectionBasics " <nl> + id = ArangoDB . create_collection ( cn ) <nl> + <nl> + cmd = " / _api / document ? collection = # { id } " <nl> + body = " { \ " foo \ " : \ " bar \ xff \ " } " <nl> + doc = ArangoDB . log_post ( " # { prefix } - bad - json " , cmd , : body = > body ) <nl> + <nl> + doc . code . should eq ( 400 ) <nl> + doc . parsed_response [ ' error ' ] . should eq ( true ) <nl> + doc . parsed_response [ ' errorNum ' ] . should eq ( 600 ) <nl> + doc . parsed_response [ ' code ' ] . should eq ( 400 ) <nl> + doc . headers [ ' content - type ' ] . should eq ( " application / json ; charset = utf - 8 " ) <nl> + <nl> + ArangoDB . size_collection ( cn ) . should eq ( 0 ) <nl> + <nl> + ArangoDB . drop_collection ( cn ) <nl> + end <nl> end <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> new file mode 100644 <nl> index 00000000000 . . 255b5b7d699 <nl> mmm / dev / null <nl> ppp b / tests / rb / HttpInterface / api - document - replication - spec . rb <nl> <nl> + # coding : utf - 8 <nl> + <nl> + require ' rspec ' <nl> + require ' arangodb . rb ' <nl> + <nl> + describe ArangoDB do <nl> + prefix = " rest - create - document " <nl> + didRegex = / ^ ( [ 0 - 9a - zA - Z ] + ) \ / ( [ 0 - 9a - zA - Z \ - _ ] + ) / <nl> + <nl> + context " creating documents via replicaiton API : " do <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # error handling <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + context " import handling : " do <nl> + it " is able to import json documents " do <nl> + cn = " UnitTestsCollectionBasics " <nl> + id = ArangoDB . create_collection ( cn ) <nl> + <nl> + cmd = " / _api / replication / restore - data ? collection = # { cn } " <nl> + body = <nl> + " { \ " type \ " : 2300 , \ " data \ " : { \ " _key \ " : \ " 1234xxx1 \ " , \ " _rev \ " : \ " _W2GDlX - - _j \ " , \ " foo \ " : \ " bar1 \ " } } \ n " \ <nl> + " { \ " type \ " : 2300 , \ " data \ " : { \ " _key \ " : \ " 1234xxx2 \ " , \ " _rev \ " : \ " _W2GDlX - - _k \ " , \ " foo \ " : \ " bar1 \ " } } " <nl> + <nl> + doc = ArangoDB . log_put ( " # { prefix } - bad - json " , cmd , : body = > body ) <nl> + <nl> + doc . code . should eq ( 200 ) <nl> + <nl> + ArangoDB . size_collection ( cn ) . should eq ( 2 ) <nl> + ArangoDB . drop_collection ( cn ) <nl> + end <nl> + <nl> + it " returns an error if an string attribute in the JSON body is corrupted " do <nl> + cn = " UnitTestsCollectionBasics " <nl> + id = ArangoDB . create_collection ( cn ) <nl> + <nl> + cmd = " / _api / replication / restore - data ? collection = # { cn } " <nl> + body = <nl> + " { \ " type \ " : 2300 , \ " data \ " : { \ " _key \ " : \ " 1234xxx1 \ " , \ " _rev \ " : \ " _W2GDlX - - _j \ " , \ " foo \ " : \ " bar1 \ " } } \ n " \ <nl> + " { \ " type \ " : 2300 , \ " data \ " : { \ " _key \ " : \ " 1234xxx2 \ " , \ " _rev \ " : \ " _W2GDlX - - _k \ " , \ " foo \ " : \ " bar1 \ " } } \ n " \ <nl> + " { \ " type \ " : 2300 , \ " data \ " : { \ " _key \ " : \ " 1234xxx3 \ " , \ " _rev \ " : \ " _W2GDlX - - _l \ " , \ " foo \ " : \ " bar \ xff \ " } } " <nl> + <nl> + doc = ArangoDB . log_put ( " # { prefix } - bad - json " , cmd , : body = > body ) <nl> + <nl> + doc . code . should eq ( 400 ) <nl> + doc . parsed_response [ ' error ' ] . should eq ( true ) <nl> + doc . parsed_response [ ' errorNum ' ] . should eq ( 600 ) <nl> + doc . parsed_response [ ' code ' ] . should eq ( 400 ) <nl> + doc . headers [ ' content - type ' ] . should eq ( " application / json ; charset = utf - 8 " ) <nl> + <nl> + ArangoDB . size_collection ( cn ) . should eq ( 0 ) <nl> + ArangoDB . drop_collection ( cn ) <nl> + end <nl> + <nl> + end # error handling <nl> + end # context - end <nl> + end # decribe - end <nl> mmm a / tests / rb / HttpInterface / api - document - update - spec . rb <nl> ppp b / tests / rb / HttpInterface / api - document - update - spec . rb <nl> <nl> <nl> ArangoDB . size_collection ( @ cid ) . should eq ( 0 ) <nl> end <nl> + <nl> + it " create a document and update it with invalid JSON " do <nl> + cmd = " / _api / document ? collection = # { @ cid } " <nl> + body = " { \ " Hallo \ " : \ " World \ " } " <nl> + doc = ArangoDB . post ( cmd , : body = > body ) <nl> + <nl> + doc . code . should eq ( 201 ) <nl> + did = doc . parsed_response [ ' _id ' ] <nl> + <nl> + # update document <nl> + cmd = " / _api / document / # { did } " <nl> + body = " { \ " World \ " : \ " Hallo \ xff \ " } " <nl> + doc = ArangoDB . log_put ( " # { prefix } " , cmd , : body = > body ) <nl> + <nl> + doc . code . should eq ( 400 ) <nl> + doc . parsed_response [ ' error ' ] . should eq ( true ) <nl> + doc . parsed_response [ ' errorNum ' ] . should eq ( 600 ) <nl> + doc . parsed_response [ ' code ' ] . should eq ( 400 ) <nl> + end <nl> end <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl>
|
Enable utf - 8 string validation . ( )
|
arangodb/arangodb
|
bc1d8e1f0895ba13aab85959f4c22f533eb598c6
|
2020-04-14T07:05:34Z
|
mmm a / cocos / editor - support / cocostudio / ActionTimeline / CCNodeReader . cpp <nl> ppp b / cocos / editor - support / cocostudio / ActionTimeline / CCNodeReader . cpp <nl> THE SOFTWARE . <nl> # include " CCActionTimelineCache . h " <nl> # include " CCActionTimeline . h " <nl> <nl> - # include " . . / CCSGUIReader . h " <nl> + # include " cocostudio / CCSGUIReader . h " <nl> <nl> using namespace cocos2d ; <nl> using namespace ui ; <nl> void NodeReader : : init ( ) <nl> _funcs . insert ( Pair ( ClassName_Widget , std : : bind ( & NodeReader : : loadWidget , this , _1 ) ) ) ; <nl> _funcs . insert ( Pair ( ClassName_Label , std : : bind ( & NodeReader : : loadWidget , this , _1 ) ) ) ; <nl> <nl> - _guiReader = new WidgetPropertiesReader0300 ( ) ; <nl> } <nl> <nl> Node * NodeReader : : createNode ( const std : : string & filename ) <nl> Node * NodeReader : : loadWidget ( const rapidjson : : Value & json ) <nl> <nl> WidgetReaderProtocol * reader = dynamic_cast < WidgetReaderProtocol * > ( ObjectFactory : : getInstance ( ) - > createObject ( readerName ) ) ; <nl> <nl> - _guiReader - > setPropsForAllWidgetFromJsonDictionary ( reader , widget , json ) ; <nl> + WidgetPropertiesReader0300 * guiReader = new WidgetPropertiesReader0300 ( ) ; <nl> + guiReader - > setPropsForAllWidgetFromJsonDictionary ( reader , widget , json ) ; <nl> + CC_SAFE_DELETE ( guiReader ) ; <nl> <nl> int actionTag = DICTOOL - > getIntValue_json ( json , ACTION_TAG ) ; <nl> widget - > setUserObject ( ActionTimelineData : : create ( actionTag ) ) ; <nl> mmm a / cocos / editor - support / cocostudio / ActionTimeline / CCNodeReader . h <nl> ppp b / cocos / editor - support / cocostudio / ActionTimeline / CCNodeReader . h <nl> THE SOFTWARE . <nl> <nl> namespace cocostudio { <nl> <nl> - class WidgetPropertiesReader0300 ; <nl> <nl> namespace timeline { <nl> <nl> class NodeReader <nl> <nl> std : : unordered_map < std : : string , NodeCreateFunc > _funcs ; <nl> <nl> - WidgetPropertiesReader0300 * _guiReader ; <nl> bool _recordJsonPath ; <nl> <nl> std : : string _jsonPath ; <nl> mmm a / cocos / editor - support / cocostudio / CCSGUIReader . h <nl> ppp b / cocos / editor - support / cocostudio / CCSGUIReader . h <nl> class WidgetPropertiesReader : public cocos2d : : Ref <nl> CocoLoader * cocoLoader , <nl> stExpCocoNode * pCocoNode ) = 0 ; <nl> <nl> - virtual void setPropsForAllCustomWidgetFromBinary ( const std : : string & classType , <nl> - cocos2d : : ui : : Widget * widget , <nl> - CocoLoader * cocoLoader , <nl> - stExpCocoNode * pCocoNode ) = 0 ; <nl> - <nl> protected : <nl> void setAnchorPointForWidget ( cocos2d : : ui : : Widget * widget , const rapidjson : : Value & options ) ; <nl> std : : string getWidgetReaderClassName ( const std : : string & classname ) ; <nl> class WidgetPropertiesReader0250 : public WidgetPropertiesReader <nl> cocos2d : : ui : : Widget * widget , <nl> CocoLoader * cocoLoader , <nl> stExpCocoNode * pCocoNode ) { } <nl> - <nl> - virtual void setPropsForAllCustomWidgetFromBinary ( const std : : string & classType , <nl> - cocos2d : : ui : : Widget * widget , <nl> - CocoLoader * cocoLoader , <nl> - stExpCocoNode * pCocoNode ) { } <nl> <nl> virtual void setPropsForWidgetFromJsonDictionary ( cocos2d : : ui : : Widget * widget , const rapidjson : : Value & options ) ; <nl> <nl> mmm a / cocos / editor - support / cocostudio / WidgetReader / WidgetReader . h <nl> ppp b / cocos / editor - support / cocostudio / WidgetReader / WidgetReader . h <nl> <nl> # define __TestCpp__WidgetReader__ <nl> <nl> # include " WidgetReaderProtocol . h " <nl> - # include " . . / CCSGUIReader . h " <nl> + # include " cocostudio / CCSGUIReader . h " <nl> # include " ui / GUIDefine . h " <nl> # include " ui / UIWidget . h " <nl> <nl> <nl> namespace cocostudio <nl> { <nl> class CocoLoader ; <nl> - class stExpCocoNode ; <nl> + struct stExpCocoNode ; <nl> <nl> class WidgetReader : public cocos2d : : Ref , public WidgetReaderProtocol <nl> { <nl> mmm a / cocos / editor - support / cocostudio / WidgetReader / WidgetReaderProtocol . h <nl> ppp b / cocos / editor - support / cocostudio / WidgetReader / WidgetReaderProtocol . h <nl> namespace cocos2d <nl> namespace cocostudio <nl> { <nl> class CocoLoader ; <nl> - class stExpCocoNode ; <nl> + struct stExpCocoNode ; <nl> <nl> class WidgetReaderProtocol <nl> { <nl>
|
fix windows compile error
|
cocos2d/cocos2d-x
|
d2680f2884341915528e99d13134d84aeca91f7e
|
2014-06-23T10:29:23Z
|
mmm a / CHANGELOG <nl> ppp b / CHANGELOG <nl> the do sort parameter . <nl> <nl> Examples : <nl> <nl> - [ 1 , 2 , 3 ] ANY IN [ 4 , 5 , 6 ] / / false <nl> - [ 1 , 2 , 3 ] ANY IN [ 1 , 42 ] / / true <nl> [ 1 , 2 , 3 ] ALL IN [ 2 , 3 , 4 ] / / false <nl> [ 1 , 2 , 3 ] ALL IN [ 1 , 2 , 3 ] / / true <nl> [ 1 , 2 , 3 ] NONE IN [ 3 ] / / false <nl> [ 1 , 2 , 3 ] NONE IN [ 23 , 42 ] / / true <nl> + [ 1 , 2 , 3 ] ANY IN [ 4 , 5 , 6 ] / / false <nl> + [ 1 , 2 , 3 ] ANY IN [ 1 , 42 ] / / true <nl> [ 1 , 2 , 3 ] ANY = = 2 / / true <nl> [ 1 , 2 , 3 ] ANY = = 4 / / false <nl> [ 1 , 2 , 3 ] ANY > 0 / / true <nl> [ 1 , 2 , 3 ] ANY < = 1 / / true <nl> + [ 1 , 2 , 3 ] NONE < 99 / / false <nl> + [ 1 , 2 , 3 ] NONE > 10 / / true <nl> [ 1 , 2 , 3 ] ALL > 2 / / false <nl> [ 1 , 2 , 3 ] ALL > 0 / / true <nl> [ 1 , 2 , 3 ] ALL > = 3 / / false <nl> - [ 1 , 2 , 3 ] NONE < 99 / / false <nl> - [ 1 , 2 , 3 ] NONE > 10 / / true <nl> [ " foo " , " bar " ] ALL ! = " moo " / / true <nl> [ " foo " , " bar " ] NONE = = " bar " / / false <nl> + [ " foo " , " bar " ] ANY = = " foo " / / true <nl> <nl> * improved AQL optimizer to remove unnecessary sort operations in more cases <nl> <nl>
|
Minor change to changelog
|
arangodb/arangodb
|
189256dcadd9f2187f482d509ed81a89baef7942
|
2016-02-29T21:28:24Z
|
mmm a / xbmc / video / VideoInfoTag . cpp <nl> ppp b / xbmc / video / VideoInfoTag . cpp <nl> void CVideoInfoTag : : Serialize ( CVariant & value ) <nl> value [ " album " ] = m_strAlbum ; <nl> value [ " artist " ] = m_strArtist ; <nl> value [ " playcount " ] = m_playCount ; <nl> - value [ " lastPlayed " ] = m_lastPlayed ; <nl> + value [ " lastplayed " ] = m_lastPlayed ; <nl> value [ " top250 " ] = m_iTop250 ; <nl> value [ " year " ] = m_iYear ; <nl> value [ " season " ] = m_iSeason ; <nl>
|
jsonrpc : fix retrieval of " lastplayed " for video items
|
xbmc/xbmc
|
1409e7872e551d71f4c6d2d166bbadded3b68ead
|
2011-10-31T17:08:16Z
|
diff - - git a / Linked List . cpp b / Linked List . cpp <nl> deleted file mode 100644 <nl> index 9319249fd5 . . 0000000000 <nl> mmm a / Linked List . cpp <nl> ppp / dev / null <nl> <nl> - # include < iostream > <nl> - using namespace std ; <nl> - <nl> - struct node <nl> - { <nl> - int val ; <nl> - node * next ; <nl> - } ; <nl> - <nl> - node * start ; <nl> - <nl> - void insert ( int x ) <nl> - { <nl> - node * t = start ; <nl> - if ( start ! = NULL ) <nl> - { <nl> - while ( t - > next ! = NULL ) <nl> - { <nl> - t = t - > next ; <nl> - } <nl> - node * n = new node ; <nl> - t - > next = n ; <nl> - n - > val = x ; <nl> - n - > next = NULL ; <nl> - } <nl> - else <nl> - { <nl> - node * n = new node ; <nl> - n - > val = x ; <nl> - n - > next = NULL ; <nl> - start = n ; <nl> - } <nl> - } <nl> - <nl> - void remove ( int x ) <nl> - { <nl> - node * t = start ; <nl> - node * p ; <nl> - while ( t - > val ! = x ) <nl> - { <nl> - p = t ; <nl> - t = t - > next ; <nl> - } <nl> - p - > next = t - > next ; <nl> - delete t ; <nl> - } <nl> - <nl> - void search ( int x ) <nl> - { <nl> - node * t = start ; <nl> - int found = 0 ; <nl> - while ( t ! = NULL ) <nl> - { <nl> - if ( t - > val = = x ) <nl> - { <nl> - cout < < " \ nFound " ; <nl> - found = 1 ; <nl> - break ; <nl> - } <nl> - t = t - > next ; <nl> - } <nl> - if ( found = = 0 ) <nl> - { <nl> - cout < < " \ nNot Found " ; <nl> - } <nl> - } <nl> - <nl> - void show ( ) <nl> - { <nl> - node * t = start ; <nl> - while ( t ! = NULL ) <nl> - { <nl> - cout < < t - > val < < " \ t " ; <nl> - t = t - > next ; <nl> - } <nl> - <nl> - } <nl> - <nl> - int main ( ) <nl> - { <nl> - int choice , x ; <nl> - do <nl> - { <nl> - cout < < " \ n1 . Insert " ; <nl> - cout < < " \ n2 . Delete " ; <nl> - cout < < " \ n3 . Search " ; <nl> - cout < < " \ n4 . Print " ; <nl> - cout < < " \ n \ nEnter you choice : " ; <nl> - cin > > choice ; <nl> - switch ( choice ) <nl> - { <nl> - case 1 : cout < < " \ nEnter the element to be inserted : " ; <nl> - cin > > x ; ; <nl> - insert ( x ) ; break ; <nl> - case 2 : cout < < " \ nEnter the element to be removed : " ; <nl> - cin > > x ; <nl> - remove ( x ) ; break ; <nl> - case 3 : cout < < " \ nEnter the element to be searched : " ; <nl> - cin > > x ; <nl> - search ( x ) ; break ; <nl> - case 4 : show ( ) ; break ; <nl> - } <nl> - } <nl> - while ( choice ! = 0 ) ; <nl> - <nl> - return 0 ; <nl> - } <nl>
|
Removed Linked List . cpp
|
TheAlgorithms/C-Plus-Plus
|
b93e42bfe7be5cf1d4947d53fdd9836b5c6be340
|
2019-02-12T13:17:19Z
|
mmm a / . gitignore <nl> ppp b / . gitignore <nl> arangod / Ahuacatl / ahuacatl - grammar . output <nl> arangod / Ahuacatl / ahuacatl - tokens . c <nl> bin / <nl> etc / arangodb / arangob . conf <nl> - etc / arangodb / arangod - uid . conf <nl> - etc / arangodb / arangod - arm . conf <nl> - etc / arangodb / arangod - uid - arm . conf <nl> etc / arangodb / arangod . conf <nl> etc / arangodb / arangodump . conf <nl> etc / arangodb / arangoimp . conf <nl> etc / arangodb / arangoirb . conf <nl> etc / arangodb / arangorestore . conf <nl> etc / arangodb / arangosh . conf <nl> + etc / arangodb / foxx - manager . conf <nl> + etc / arangodb / arango - dfdb . conf <nl> js / common / bootstrap / errors . js <nl> lib / BasicsC / local - configuration . h <nl> lib / BasicsC / stamp - h2 <nl> mmm a / CHANGELOG <nl> ppp b / CHANGELOG <nl> v1 . 5 . x ( XXXX - XX - XX ) <nl> currently only implemented for hash indices and skiplist indices . <nl> <nl> <nl> - v1 . 4 . x ( XXXX - XX - XX ) <nl> + v1 . 4 . 4 ( 2013 - 12 - 24 ) <nl> mmmmmmmmmmmmmmmmmm - <nl> <nl> + * uid and gid are now set in the scripts , there is no longer a separate config file for <nl> + arangod when started from a script <nl> + <nl> + * foxx - manager is now an alias for arangosh <nl> + <nl> + * arango - dfdb is now an alias for arangod , moved from bin to sbin <nl> + <nl> + * changed from readline to linenoise for Windows <nl> + <nl> + * added - - install - service and - - uninstall - service for Windows <nl> + <nl> + * removed - - daemon and - - supervisor for Windows <nl> + <nl> + * arangosh and arangod now uses the config - file which maps the binary name , i . e . if you <nl> + rename arangosh to foxx - manager it will use the config file foxx - manager . conf <nl> + <nl> + * fixed lock file for Windows <nl> + <nl> * fixed issue # 711 , # 687 : foxx - manager throws internal errors <nl> <nl> * added ` - - server . ssl - protocol ` option for client tools <nl> mmm a / CMakeLists . txt <nl> ppp b / CMakeLists . txt <nl> <nl> # # - - SECTION - - COMMON DEFINES <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief required cmake version <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> cmake_minimum_required ( VERSION 2 . 6 ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief cmake build types <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> if ( NOT CMAKE_BUILD_TYPE ) <nl> set ( CMAKE_BUILD_TYPE Release CACHE string " Choose the type of build , options are : None Debug Release RelWithDebInfo MinSizeRel . " FORCE ) <nl> endif ( ) <nl> set ( SCRIPT_FOXX_MANAGER foxx - manager ) <nl> set ( TEST_BASICS_SUITE basics_suite ) <nl> set ( TEST_GEO_SUITE geo_suite ) <nl> <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief threads <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - <nl> - find_package ( Threads ) <nl> - <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief GNU C / C + + compiler <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> if ( APPLE ) <nl> add_definitions ( " - Wno - deprecated - declarations " ) <nl> endif ( ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief Visual Studio Compiler <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + if ( MSVC ) <nl> + add_definitions ( " - D_CRT_SECURE_NO_WARNINGS = 1 " ) <nl> + add_definitions ( " - DFD_SETSIZE = 2048 " ) <nl> + <nl> + add_definitions ( " - DUSE_REGEX_STATIC = 1 " ) <nl> + add_definitions ( " - DU_STATIC_IMPLEMENTATION = 1 " ) <nl> + <nl> + foreach ( flag_var <nl> + CMAKE_C_FLAGS <nl> + CMAKE_C_FLAGS_DEBUG <nl> + CMAKE_C_FLAGS_RELEASE <nl> + CMAKE_C_FLAGS_MINSIZEREL <nl> + CMAKE_C_FLAGS_RELWITHDEBINFO <nl> + CMAKE_CXX_FLAGS <nl> + CMAKE_CXX_FLAGS_DEBUG <nl> + CMAKE_CXX_FLAGS_RELEASE <nl> + CMAKE_CXX_FLAGS_MINSIZEREL <nl> + CMAKE_CXX_FLAGS_RELWITHDEBINFO ) <nl> + if ( $ { flag_var } MATCHES " / MD " ) <nl> + string ( REGEX REPLACE " / MDd ? " " " $ { flag_var } " $ { $ { flag_var } } " ) <nl> + endif ( ) <nl> + <nl> + if ( flag_var MATCHES " DEBUG " ) <nl> + set ( $ { flag_var } " $ { $ { flag_var } } / MTd " ) <nl> + else ( ) <nl> + set ( $ { flag_var } " $ { $ { flag_var } } / MT " ) <nl> + endif ( ) <nl> + endforeach ( ) <nl> + <nl> + set ( MSVC_LIBS crypt32 . lib ; WINMM . LIB ; Ws2_32 . lib ; getopt ; regex ) <nl> + <nl> + set ( CMAKE_EXE_LINKER_FLAGS " $ { CMAKE_EXE_LINKER_FLAGS } / SUBSYSTEM : CONSOLE / LTCG / SAFESEH : NO " ) <nl> + endif ( ) <nl> + <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief TRI_BITS <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> if ( USE_MRUBY ) <nl> add_definitions ( " - DTRI_ENABLE_MRUBY = 1 " ) <nl> endif ( ) <nl> <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief RAW_CONFIG <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - <nl> - option ( USE_RAW_CONFIG " Do you want to install configuration files with variables " OFF ) <nl> - <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief SYSTEM CONFIGURATION DIRECTORY ( / etc ) <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> else ( ) <nl> endif ( ) <nl> <nl> file ( TO_NATIVE_PATH " $ { ETCDIR_NATIVE } " ETCDIR_NATIVE ) <nl> + STRING ( REGEX REPLACE " \ \ \ \ " " \ \ \ \ \ \ \ \ " ETCDIR_ESCAPED " $ { ETCDIR_NATIVE } " ) <nl> <nl> - add_definitions ( " - D_SYSCONFDIR_ = \ " $ { ETCDIR_NATIVE } \ " " ) <nl> + add_definitions ( " - D_SYSCONFDIR_ = \ " $ { ETCDIR_ESCAPED } \ " " ) <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief DATA DIRECTORY ( / var ) <nl> endif ( ) <nl> <nl> file ( TO_NATIVE_PATH " $ { VARDIR_NATIVE } " VARDIR_NATIVE ) <nl> <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief TRI_BINDIR <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + FILE ( MAKE_DIRECTORY " $ { PROJECT_BINARY_DIR } / var / lib / arangodb " ) <nl> + FILE ( MAKE_DIRECTORY " $ { PROJECT_BINARY_DIR } / var / lib / arangodb - apps " ) <nl> <nl> - set ( TRI_BINDIR " $ { CMAKE_INSTALL_PREFIX } / bin " ) <nl> + # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + # # - - SECTION - - DIRECTORIES <nl> + # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief database directory <nl> FILE ( MAKE_DIRECTORY " $ { PROJECT_BINARY_DIR } / var / log / arangodb " ) <nl> <nl> set ( TRI_PKGDATADIR " $ { CMAKE_INSTALL_PREFIX } / share / arangodb " ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief TRI_BINDIR <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + if ( MSVC ) <nl> + set ( TRI_BINDIR_INSTALL " bin " ) <nl> + set ( TRI_BINDIR " $ { CMAKE_INSTALL_PREFIX } / bin " ) <nl> + else ( ) <nl> + set ( TRI_BINDIR_INSTALL " bin " ) <nl> + set ( TRI_BINDIR " $ { CMAKE_INSTALL_PREFIX } / bin " ) <nl> + endif ( ) <nl> + <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief TRI_SBINDIR <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - set ( TRI_SBINDIR " $ { CMAKE_INSTALL_PREFIX } / sbin " ) <nl> + if ( MSVC ) <nl> + set ( TRI_SBINDIR_INSTALL " bin " ) <nl> + set ( TRI_SBINDIR " $ { CMAKE_INSTALL_PREFIX } / bin " ) <nl> + else ( ) <nl> + set ( TRI_SBINDIR_INSTALL " sbin " ) <nl> + set ( TRI_SBINDIR " $ { CMAKE_INSTALL_PREFIX } / sbin " ) <nl> + endif ( ) <nl> <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> # # - - SECTION - - COMMON INCLUDES <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief project source <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> include_directories ( $ { PROJECT_SOURCE_DIR } ) <nl> <nl> + # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + # # - - SECTION - - COMMON MACROS <nl> + # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief generates config file using ROOTDIR <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + macro ( generate_root_config name ) <nl> + FILE ( READ $ { PROJECT_SOURCE_DIR } / etc / arangodb / $ { name } . conf . in FileContent ) <nl> + <nl> + STRING ( REPLACE " @ PKGDATADIR @ " " @ ROOTDIR @ / share / arangodb " <nl> + FileContent " $ { FileContent } " ) <nl> + <nl> + STRING ( REPLACE " @ LOCALSTATEDIR @ " " @ ROOTDIR @ / var " <nl> + FileContent " $ { FileContent } " ) <nl> + <nl> + if ( MSVC ) <nl> + STRING ( REGEX REPLACE " [ \ r \ n ] file = " " \ n # file = " <nl> + FileContent " $ { FileContent } " ) <nl> + endif ( ) <nl> + <nl> + FILE ( WRITE $ { PROJECT_BINARY_DIR } / etc / arangodb / $ { name } . conf " $ { FileContent } " ) <nl> + endmacro ( ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief generates config file using the configured paths <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + macro ( generate_path_config name ) <nl> + FILE ( READ $ { PROJECT_SOURCE_DIR } / etc / arangodb / $ { name } . conf . in FileContent ) <nl> + <nl> + STRING ( REPLACE " @ PKGDATADIR @ " " $ { TRI_PKGDATADIR } " <nl> + FileContent " $ { FileContent } " ) <nl> + <nl> + STRING ( REPLACE " @ LOCALSTATEDIR @ " " $ { VARDIR_NATIVE } " <nl> + FileContent " $ { FileContent } " ) <nl> + <nl> + if ( ( $ { name } STREQUAL " arangod " ) AND ( BUILD_PACKAGE STREQUAL " raspbian " ) ) <nl> + STRING ( REGEX REPLACE " [ \ r \ n ] threads = [ ^ \ r \ n ] * " " \ nthreads = 1 " <nl> + FileContent " $ { FileContent } " ) <nl> + endif ( ) <nl> + <nl> + FILE ( WRITE $ { PROJECT_BINARY_DIR } / etc / arangodb / $ { name } . conf " $ { FileContent } " ) <nl> + endmacro ( ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief installs a config file <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + macro ( install_config name ) <nl> + if ( MSVC OR ( BUILD_PACKAGE STREQUAL " dmg - cli " ) ) <nl> + generate_root_config ( $ { name } ) <nl> + else ( ) <nl> + generate_path_config ( $ { name } ) <nl> + endif ( ) <nl> + <nl> + install ( <nl> + FILES $ { PROJECT_BINARY_DIR } / etc / arangodb / $ { name } . conf <nl> + DESTINATION $ { ETCDIR_INSTALL } ) <nl> + endmacro ( ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief installs a readme file converting EOL <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + macro ( install_readme input where output ) <nl> + FILE ( READ $ { PROJECT_SOURCE_DIR } / $ { input } FileContent ) <nl> + <nl> + STRING ( REPLACE " \ r " " " FileContent " $ { FileContent } " ) <nl> + <nl> + if ( MSVC ) <nl> + STRING ( REPLACE " \ n " " \ r \ n " FileContent " $ { FileContent } " ) <nl> + endif ( ) <nl> + <nl> + FILE ( WRITE $ { PROJECT_BINARY_DIR } / $ { output } " $ { FileContent } " ) <nl> + <nl> + install ( <nl> + FILES $ { PROJECT_BINARY_DIR } / $ { output } <nl> + DESTINATION $ { where } ) <nl> + endmacro ( ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief installs a link to an executable <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + macro ( install_command_alias name where alias ) <nl> + if ( MSVC ) <nl> + <nl> + add_custom_command ( <nl> + TARGET $ { name } <nl> + POST_BUILD <nl> + COMMAND <nl> + $ { CMAKE_COMMAND } - E copy <nl> + $ < TARGET_FILE : $ { name } > <nl> + $ { CMAKE_RUNTIME_OUTPUT_DIRECTORY } / $ { alias } . exe ) <nl> + <nl> + install ( <nl> + PROGRAMS $ { CMAKE_RUNTIME_OUTPUT_DIRECTORY } / $ { alias } . exe <nl> + DESTINATION $ { where } ) <nl> + <nl> + else ( ) <nl> + <nl> + add_custom_command ( <nl> + TARGET $ { name } <nl> + POST_BUILD <nl> + COMMAND <nl> + $ { CMAKE_COMMAND } - E create_symlink <nl> + $ { name } <nl> + $ { CMAKE_RUNTIME_OUTPUT_DIRECTORY } / $ { alias } ) <nl> + <nl> + install ( <nl> + PROGRAMS $ { CMAKE_RUNTIME_OUTPUT_DIRECTORY } / $ { alias } <nl> + DESTINATION $ { where } ) <nl> + <nl> + endif ( ) <nl> + endmacro ( ) <nl> + <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> # # - - SECTION - - EXTERNAL LIBRARIES <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief threads <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + find_package ( Threads ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief windows <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + if ( MSVC ) <nl> + set ( MSVC_INCLUDE $ { PROJECT_SOURCE_DIR } / 3rdParty - Windows / $ { BITS } / include CACHE path " MSVC 3rd party include path " ) <nl> + set ( MSVC_LIB_PATH $ { PROJECT_SOURCE_DIR } / 3rdParty - Windows / $ { BITS } / lib CACHE path " MSVC 3rd party library path " ) <nl> + endif ( ) <nl> + <nl> + if ( MSVC_INCLUDE ) <nl> + include_directories ( $ { MSVC_INCLUDE } ) <nl> + endif ( ) <nl> + <nl> + if ( MSVC_LIB_PATH ) <nl> + link_directories ( $ { MSVC_LIB_PATH } ) <nl> + endif ( ) <nl> + <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief ICU <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - set ( ICU_INCLUDE $ { PROJECT_SOURCE_DIR } / 3rdParty / icu / BUILD / include CACHE path " ICU include path " ) <nl> - set ( ICU_LIB_PATH $ { PROJECT_SOURCE_DIR } / 3rdParty / icu / BUILD / libs CACHE path " ICU library path " ) <nl> - set ( ICU_LIBS icui18n ; icuuc ; icudata ; pthread ; m CACHE path " ICU libraries " ) <nl> - set ( ICU_VERSION " 52 . 1 " CACHE string " ICU version " ) <nl> + if ( MSVC ) <nl> + set ( ICU_LIBS " sicudt ; sicuin ; sicuio ; sicule ; siculx ; sicutu ; sicuuc " CACHE path " ICU libraries " ) <nl> + set ( ICU_VERSION " 52 . 1 " CACHE string " ICU version " ) <nl> + <nl> + add_definitions ( " - DU_STATIC_IMPLEMENTATION = 1 " ) <nl> + else ( ) <nl> + set ( ICU_INCLUDE $ { PROJECT_SOURCE_DIR } / 3rdParty / icu / BUILD / include CACHE path " ICU include path " ) <nl> + set ( ICU_LIB_PATH $ { PROJECT_SOURCE_DIR } / 3rdParty / icu / BUILD / libs CACHE path " ICU library path " ) <nl> + set ( ICU_LIBS icui18n ; icuuc ; icudata ; pthread ; m CACHE path " ICU libraries " ) <nl> + set ( ICU_VERSION " 52 . 1 " CACHE string " ICU version " ) <nl> + endif ( ) <nl> <nl> if ( ICU_INCLUDE ) <nl> include_directories ( $ { ICU_INCLUDE } ) <nl> add_definitions ( " - DTRI_ICU_VERSION = \ " $ { ICU_VERSION } \ " " ) <nl> # # # @ brief LIBEV <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - set ( LIBEV_INCLUDE $ { PROJECT_SOURCE_DIR } / 3rdParty / libev CACHE path " LIBEV include path " ) <nl> - set ( LIBEV_LIB_PATH $ { PROJECT_SOURCE_DIR } / 3rdParty / libev / BUILD / . libs CACHE path " LIBEV library path " ) <nl> - set ( LIBEV_LIBS ev CACHE string " LIBEV libraries " ) <nl> - set ( LIBEV_VERSION " 4 . 11 " CACHE string " LIBEV version " ) <nl> + if ( MSVC ) <nl> + set ( LIBEV_LIBS ev CACHE string " LIBEV libraries " ) <nl> + set ( LIBEV_VERSION " 4 . 11 " CACHE string " LIBEV version " ) <nl> + else ( ) <nl> + set ( LIBEV_INCLUDE $ { PROJECT_SOURCE_DIR } / 3rdParty / libev CACHE path " LIBEV include path " ) <nl> + set ( LIBEV_LIB_PATH $ { PROJECT_SOURCE_DIR } / 3rdParty / libev / BUILD / . libs CACHE path " LIBEV library path " ) <nl> + set ( LIBEV_LIBS ev CACHE string " LIBEV libraries " ) <nl> + set ( LIBEV_VERSION " 4 . 11 " CACHE string " LIBEV version " ) <nl> + endif ( ) <nl> <nl> if ( LIBEV_INCLUDE ) <nl> include_directories ( $ { LIBEV_INCLUDE } ) <nl> add_definitions ( " - DTRI_LIBEV_VERSION = \ " $ { LIBEV_VERSION } \ " " ) <nl> # # # @ brief MRUBY <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - set ( MRUBY_INCLUDE $ { PROJECT_SOURCE_DIR } / 3rdParty / mruby / include CACHE path " MRUBY include path " ) <nl> - set ( MRUBY_LIB_PATH $ { PROJECT_SOURCE_DIR } / 3rdParty / mruby / build / host / lib CACHE path " MRUBY library path " ) <nl> - set ( MRUBY_LIBS mruby CACHE string " MRUBY libraries " ) <nl> - set ( MRUBY_VERSION " 2013 - 08 - 22 ( aa099f7f7d1f8c61db936fb7c39a3c734175af16 ) " CACHE string " MRUBY version " ) <nl> - <nl> - if ( MRUBY_INCLUDE ) <nl> - include_directories ( $ { MRUBY_INCLUDE } ) <nl> + if ( MSVC ) <nl> + else ( ) <nl> + set ( MRUBY_INCLUDE $ { PROJECT_SOURCE_DIR } / 3rdParty / mruby / include CACHE path " MRUBY include path " ) <nl> + set ( MRUBY_LIB_PATH $ { PROJECT_SOURCE_DIR } / 3rdParty / mruby / build / host / lib CACHE path " MRUBY library path " ) <nl> + set ( MRUBY_LIBS mruby CACHE string " MRUBY libraries " ) <nl> + set ( MRUBY_VERSION " 2013 - 08 - 22 ( aa099f7f7d1f8c61db936fb7c39a3c734175af16 ) " CACHE string " MRUBY version " ) <nl> endif ( ) <nl> <nl> - if ( MRUBY_LIB_PATH ) <nl> - link_directories ( $ { MRUBY_LIB_PATH } ) <nl> - endif ( ) <nl> + if ( USE_MRUBY ) <nl> + if ( MRUBY_INCLUDE ) <nl> + include_directories ( $ { MRUBY_INCLUDE } ) <nl> + endif ( ) <nl> <nl> - add_definitions ( " - DTRI_MRUBY_VERSION = \ " $ { MRUBY_VERSION } \ " " ) <nl> + if ( MRUBY_LIB_PATH ) <nl> + link_directories ( $ { MRUBY_LIB_PATH } ) <nl> + endif ( ) <nl> + <nl> + add_definitions ( " - DTRI_MRUBY_VERSION = \ " $ { MRUBY_VERSION } \ " " ) <nl> + endif ( ) <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief OPENSSL <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - set ( OPENSSL_INCLUDE " " CACHE path " OPENSSL include path " ) <nl> - set ( OPENSSL_LIB_PATH " " CACHE path " OPENSSL library path " ) <nl> - set ( OPENSSL_LIBS ssl ; crypto CACHE string " OPENSSL libraries " ) <nl> - set ( OPENSSL_VERSION " OpenSSL 0 . 9 . 8r 8 Feb 2011 " CACHE string " OPENSSL version " ) <nl> + if ( MSVC ) <nl> + set ( OPENSSL_LIBS ssleay ; libeay CACHE string " OPENSSL libraries " ) <nl> + set ( OPENSSL_VERSION " OpenSSL 1 . 0 . 1e " CACHE string " OPENSSL version " ) <nl> + else ( ) <nl> + set ( OPENSSL_INCLUDE " " CACHE path " OPENSSL include path " ) <nl> + set ( OPENSSL_LIB_PATH " " CACHE path " OPENSSL library path " ) <nl> + set ( OPENSSL_LIBS ssl ; crypto CACHE string " OPENSSL libraries " ) <nl> + set ( OPENSSL_VERSION " OpenSSL 0 . 9 . 8r 8 Feb 2011 " CACHE string " OPENSSL version " ) <nl> + endif ( ) <nl> <nl> if ( OPENSSL_INCLUDE ) <nl> include_directories ( $ { OPENSSL_INCLUDE } ) <nl> endif ( ) <nl> add_definitions ( " - DTRI_OPENSSL_VERSION = \ " $ { OPENSSL_VERSION } \ " " ) <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief READLINE <nl> + # # # @ brief READLINE or LINENOISE <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - set ( READLINE_INCLUDE " " CACHE path " READLINE include path " ) <nl> - set ( READLINE_LIB_PATH " " CACHE path " READLINE library path " ) <nl> - set ( READLINE_LIBS readline CACHE string " READLINE libraries " ) <nl> - set ( READLINE_VERSION " 0x0402 . hex " CACHE string " READLINE version " ) <nl> + if ( MSVC ) <nl> + set ( READLINE_LIBS linenoise CACHE string " LINENOISE libraries " ) <nl> + set ( READLINE_VERSION " linenoise " CACHE string " LINENOISE version " ) <nl> + <nl> + add_definitions ( " - DREADLINE_STATIC = 1 " ) <nl> + else ( ) <nl> + set ( READLINE_INCLUDE " " CACHE path " READLINE include path " ) <nl> + set ( READLINE_LIB_PATH " " CACHE path " READLINE library path " ) <nl> + set ( READLINE_LIBS readline CACHE string " READLINE libraries " ) <nl> + set ( READLINE_VERSION " 0x0402 . hex " CACHE string " READLINE version " ) <nl> + endif ( ) <nl> <nl> if ( READLINE_INCLUDE ) <nl> include_directories ( $ { READLINE_INCLUDE } ) <nl> add_definitions ( " - DTRI_READLINE_VERSION = \ " $ { READLINE_VERSION } \ " " ) <nl> # # # @ brief V8 <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - set ( V8_INCLUDE $ { PROJECT_SOURCE_DIR } / 3rdParty / V8 / include CACHE path " V8 include path " ) <nl> - set ( V8_LIB_PATH $ { PROJECT_SOURCE_DIR } / 3rdParty / V8 / out / x64 . release CACHE path " V8 library path " ) <nl> - set ( V8_LIBS v8_base v8_nosnapshot CACHE string " V8 libraries " ) <nl> - set ( V8_VERSION " 3 . 16 . 14 " CACHE string " V8 version " ) <nl> + if ( MSVC ) <nl> + set ( V8_LIBS v8_base v8_nosnapshot CACHE string " V8 libraries " ) <nl> + set ( V8_VERSION " 3 . 16 . 14 " CACHE string " V8 version " ) <nl> + else ( ) <nl> + set ( V8_INCLUDE $ { PROJECT_SOURCE_DIR } / 3rdParty / V8 / include CACHE path " V8 include path " ) <nl> + set ( V8_LIB_PATH $ { PROJECT_SOURCE_DIR } / 3rdParty / V8 / out / x64 . release CACHE path " V8 library path " ) <nl> + set ( V8_LIBS v8_base v8_nosnapshot CACHE string " V8 libraries " ) <nl> + set ( V8_VERSION " 3 . 16 . 14 " CACHE string " V8 version " ) <nl> + endif ( ) <nl> <nl> if ( V8_INCLUDE ) <nl> include_directories ( $ { V8_INCLUDE } ) <nl> add_definitions ( " - DTRI_V8_VERSION = \ " $ { V8_VERSION } \ " " ) <nl> # # # @ brief ZLIB <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - set ( ZLIB_INCLUDE $ { PROJECT_SOURCE_DIR } / 3rdParty / zlib - 1 . 2 . 7 CACHE path " ZLIB include path " ) <nl> - set ( ZLIB_LIB_PATH $ { PROJECT_SOURCE_DIR } / 3rdParty / zlib - 1 . 2 . 7 CACHE path " ZLIB library path " ) <nl> - set ( ZLIB_LIBS z CACHE string " ZLIB libraries " ) <nl> - set ( ZLIB_VERSION " 1 . 2 . 7 " CACHE string " ZLIB version " ) <nl> + if ( MSVC ) <nl> + set ( ZLIB_LIBS z CACHE string " ZLIB libraries " ) <nl> + set ( ZLIB_VERSION " 1 . 2 . 7 " CACHE string " ZLIB version " ) <nl> + else ( ) <nl> + set ( ZLIB_INCLUDE $ { PROJECT_SOURCE_DIR } / 3rdParty / zlib - 1 . 2 . 7 CACHE path " ZLIB include path " ) <nl> + set ( ZLIB_LIB_PATH $ { PROJECT_SOURCE_DIR } / 3rdParty / zlib - 1 . 2 . 7 CACHE path " ZLIB library path " ) <nl> + set ( ZLIB_LIBS z CACHE string " ZLIB libraries " ) <nl> + set ( ZLIB_VERSION " 1 . 2 . 7 " CACHE string " ZLIB version " ) <nl> + endif ( ) <nl> <nl> if ( ZLIB_INCLUDE ) <nl> include_directories ( $ { ZLIB_INCLUDE } ) <nl> add_definitions ( " - DTRI_ZLIB_VERSION = \ " $ { ZLIB_VERSION } \ " " ) <nl> # # - - SECTION - - SUB - PROJECTS <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief lib <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> add_subdirectory ( lib ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief arangosh <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> add_subdirectory ( arangosh ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief arangod <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> add_subdirectory ( arangod ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief arangoirb <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> if ( USE_MRUBY ) <nl> add_subdirectory ( arangoirb ) <nl> endif ( ) <nl> <nl> - add_subdirectory ( utils ) <nl> - <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> # # - - SECTION - - DOCUMENTATIONS <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - INSTALL ( DIRECTORY $ { PROJECT_SOURCE_DIR } / Documentation / man / <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install manual <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + install ( DIRECTORY $ { PROJECT_SOURCE_DIR } / Documentation / man / <nl> DESTINATION share / man ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arangod readme <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + if ( MSVC ) <nl> + install_readme ( README . README . txt ) <nl> + install_readme ( README . md . README . md ) <nl> + install_readme ( README . windows . README . windows . txt ) <nl> + endif ( ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arangod license <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + if ( MSVC ) <nl> + install_readme ( LICENSE . LICENSE . txt ) <nl> + endif ( ) <nl> + <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> # # - - SECTION - - TESTS <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief enable testing <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> enable_testing ( ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief load test definition <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> add_subdirectory ( UnitTests ) <nl> <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> add_subdirectory ( UnitTests ) <nl> # # # @ brief general information <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - set ( CPACK_SET_DESTDIR ON ) <nl> - <nl> - <nl> - if ( BUILD_PACKAGE STREQUAL " dmg - cli " ) <nl> - set ( CPACK_PACKAGE_NAME " ArangoDB - CLI " ) <nl> - elseif ( BUILD_PACKAGE STREQUAL " raspbian " ) <nl> - set ( CPACK_PACKAGE_NAME " arangodb " ) <nl> - elseif ( BUILD_PACKAGE STREQUAL " debian " ) <nl> - set ( CPACK_PACKAGE_NAME " arangodb " ) <nl> + if ( MSVC ) <nl> + else ( ) <nl> + set ( CPACK_SET_DESTDIR ON ) <nl> endif ( ) <nl> <nl> - <nl> set ( CPACK_PACKAGE_VENDOR " triAGENS GmbH " ) <nl> set ( CPACK_PACKAGE_CONTACT " info @ arangodb . org " ) <nl> set ( CPACK_PACKAGE_VERSION " $ { ARANGODB_VERSION } " ) <nl> <nl> + set ( CPACK_RESOURCE_FILE_LICENSE " $ { PROJECT_SOURCE_DIR } / LICENSE " ) <nl> <nl> set ( CPACK_STRIP_FILES " ON " ) <nl> <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief MacOSX bundle <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - <nl> if ( BUILD_PACKAGE STREQUAL " dmg - cli " ) <nl> - set ( CPACK_BUNDLE_NAME " $ { CPACK_PACKAGE_NAME } " ) <nl> - set ( CPACK_BUNDLE_PLIST " $ { PROJECT_SOURCE_DIR } / Installation / MacOSX / Bundle / Info . plist " ) <nl> - set ( CPACK_BUNDLE_ICON " $ { PROJECT_SOURCE_DIR } / Installation / MacOSX / Bundle / icon . icns " ) <nl> - set ( CPACK_BUNDLE_STARTUP_COMMAND " $ { PROJECT_SOURCE_DIR } / Installation / MacOSX / Bundle / arangodb - cli . sh " ) <nl> + set ( CPACK_PACKAGE_NAME " ArangoDB - CLI " ) <nl> + elseif ( BUILD_PACKAGE STREQUAL " raspbian " ) <nl> + set ( CPACK_PACKAGE_NAME " arangodb " ) <nl> + elseif ( BUILD_PACKAGE STREQUAL " debian " ) <nl> + set ( CPACK_PACKAGE_NAME " arangodb " ) <nl> + elseif ( MSVC ) <nl> + set ( CPACK_PACKAGE_NAME " ArangoDB " ) <nl> endif ( ) <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> if ( ( BUILD_PACKAGE STREQUAL " debian " ) OR ( BUILD_PACKAGE STREQUAL " raspbian " ) ) <nl> " EXECUTE_PROCESS ( COMMAND $ { CMAKE_COMMAND } - E create_symlink / var / lib / arangodb - apps \ $ ENV { DESTDIR } / $ { CMAKE_INSTALL_PREFIX } / share / arangodb / js / apps / databases ) " ) <nl> endif ( ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief MacOSX bundle <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + if ( BUILD_PACKAGE STREQUAL " dmg - cli " ) <nl> + set ( CPACK_BUNDLE_NAME " $ { CPACK_PACKAGE_NAME } " ) <nl> + set ( CPACK_BUNDLE_PLIST " $ { PROJECT_SOURCE_DIR } / Installation / MacOSX / Bundle / Info . plist " ) <nl> + set ( CPACK_BUNDLE_ICON " $ { PROJECT_SOURCE_DIR } / Installation / MacOSX / Bundle / icon . icns " ) <nl> + set ( CPACK_BUNDLE_STARTUP_COMMAND " $ { PROJECT_SOURCE_DIR } / Installation / MacOSX / Bundle / arangodb - cli . sh " ) <nl> + endif ( ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief Micrsoft Installer <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + if ( MSVC ) <nl> + file ( TO_NATIVE_PATH " $ { PROJECT_SOURCE_DIR } / Installation / Windows / arangodb . bmp " ARANGO_IMG ) <nl> + file ( TO_NATIVE_PATH " $ { PROJECT_SOURCE_DIR } / Installation / Windows / arangodb . ico " ARANGO_ICON ) <nl> + <nl> + STRING ( REGEX REPLACE " \ \ \ \ " " \ \ \ \ \ \ \ \ " ARANGO_IMG " $ { ARANGO_IMG } " ) <nl> + STRING ( REGEX REPLACE " \ \ \ \ " " \ \ \ \ \ \ \ \ " ARANGO_ICON " $ { ARANGO_ICON } " ) <nl> + <nl> + message ( STATUS " ARANGO_IMG : $ { ARANGO_IMG } " ) <nl> + message ( STATUS " ARANGO_ICON : $ { ARANGO_ICON } " ) <nl> + <nl> + set ( CPACK_PACKAGE_ICON $ { ARANGO_IMG } ) <nl> + <nl> + set ( CPACK_NSIS_MODIFY_PATH ON ) <nl> + set ( CPACK_NSIS_MUI_ICON $ { ARANGO_ICON } ) <nl> + set ( CPACK_NSIS_MUI_UNIICON $ { ARANGO_ICON } ) <nl> + <nl> + set ( CPACK_NSIS_HELP_LINK " http : / / www . arangodb . org " ) <nl> + set ( CPACK_NSIS_URL_INFO_ABOUT " http : / / www . arangodb . org " ) <nl> + set ( CPACK_NSIS_CONTACT " hackers @ arangodb . org " ) <nl> + endif ( ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief use CPack <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> include ( CPack ) <nl> <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> include ( CPack ) <nl> <nl> # # Local Variables : <nl> # # mode : outline - minor <nl> - # # outline - regexp : " ^ \ \ ( # # # @ brief \ \ | # # - - SECTION - - \ \ | # - \ \ * - \ \ ) " <nl> + # # outline - regexp : " # # # @ brief \ \ | # # - - SECTION - - \ \ | # - \ \ * - " <nl> # # End : <nl> mmm a / Documentation / Examples / graph - vertex - get - out - edges <nl> ppp b / Documentation / Examples / graph - vertex - get - out - edges <nl> Edge ( 3 ) <nl> arango > e2 = g . addEdge ( v1 , v2 , 4 , " hates " ) ; <nl> Edge ( 4 ) <nl> <nl> - arango > v1 . getInEdges ( ) ; <nl> + arango > v1 . getOutEdges ( ) ; <nl> [ Edge ( 3 ) , Edge ( 4 ) ] <nl> <nl> arango > v1 . getOutEdges ( " knows " ) ; <nl> mmm a / Documentation / Makefile . files <nl> ppp b / Documentation / Makefile . files <nl> DOXYGEN = \ <nl> Doxygen / js / common / bootstrap / modules . c \ <nl> Doxygen / js / common / modules / jsunity . c \ <nl> Doxygen / js / common / modules / org / arangodb / aql / functions . c \ <nl> + Doxygen / js / common / modules / org / arangodb / graph / algorithms - common . c \ <nl> Doxygen / js / common / modules / org / arangodb / arango - collection - common . c \ <nl> Doxygen / js / common / modules / org / arangodb / arango - statement - common . c \ <nl> Doxygen / js / common / modules / org / arangodb / graph - common . c \ <nl> doxygen - create - directories : <nl> @ test - d Doxygen / js / actions | | mkdir - p Doxygen / js / actions <nl> @ test - d Doxygen / js / common / bootstrap | | mkdir - p Doxygen / js / common / bootstrap <nl> @ test - d Doxygen / js / common / modules / org / arangodb / aql | | mkdir - p Doxygen / js / common / modules / org / arangodb / aql <nl> - @ test - d Doxygen / js / common / modules / org / aragndob / graph | | mkdir - p Doxygen / js / common / modules / org / arangodb / graph <nl> + @ test - d Doxygen / js / common / modules / org / arangodb / graph | | mkdir - p Doxygen / js / common / modules / org / arangodb / graph <nl> @ test - d Doxygen / js / server / modules / org / arangodb / foxx | | mkdir - p Doxygen / js / server / modules / org / arangodb / foxx <nl> @ test - d Doxygen / js / server / modules / org / arangodb / graph | | mkdir - p Doxygen / js / server / modules / org / arangodb / graph <nl> @ test - d Doxygen / js / client | | mkdir - p Doxygen / js / client <nl> mmm a / GNUmakefile <nl> ppp b / GNUmakefile <nl> <nl> # - * - mode : Makefile ; - * - <nl> <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> - # # - - SECTION - - SPECIAL TARGETS <nl> + # # - - SECTION - - COMMON VARIABLES <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - include Makefile <nl> <nl> + VERSION_MAJOR : = $ ( wordlist 1 , 1 , $ ( subst . , , $ ( VERSION ) ) ) <nl> + VERSION_MINOR : = $ ( wordlist 2 , 2 , $ ( subst . , , $ ( VERSION ) ) ) <nl> + VERSION_PATCH : = $ ( wordlist 3 , 3 , $ ( subst . , , $ ( VERSION ) ) ) <nl> + <nl> + # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + # # - - SECTION - - SPECIAL TARGETS <nl> + # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief setup <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> pack - dmg - cmake : <nl> - D " BUILD_PACKAGE = dmg - cli " \ <nl> - D " CMAKE_INSTALL_PREFIX = $ { prefix } " \ <nl> - D " USE_MRUBY = ON " \ <nl> - - D " USE_RAW_CONFIG = ON " \ <nl> - D " ARANGODB_VERSION = $ { VERSION } " \ <nl> - D " CPACK_PACKAGE_VERSION_MAJOR = $ { VERSION_MAJOR } " \ <nl> - D " CPACK_PACKAGE_VERSION_MINOR = $ { VERSION_MINOR } " \ <nl> pack - macosx - cmake : <nl> - D " BUILD_PACKAGE = dmg - cli " \ <nl> - D " CMAKE_INSTALL_PREFIX = $ { prefix } " \ <nl> - D " USE_MRUBY = ON " \ <nl> - - D " USE_RAW_CONFIG = ON " \ <nl> - D " ARANGODB_VERSION = $ { VERSION } " \ <nl> - D " CPACK_PACKAGE_VERSION_MAJOR = $ { VERSION_MAJOR } " \ <nl> - D " CPACK_PACKAGE_VERSION_MINOR = $ { VERSION_MINOR } " \ <nl> pack - arm - cmake : <nl> - D " ETCDIR = $ { sysconfdir } " \ <nl> - D " VARDIR = $ { localstatedir } " \ <nl> - D " USE_MRUBY = OFF " \ <nl> - - D " USE_RAW_CONFIG = OFF " \ <nl> - D " ARANGODB_VERSION = $ { VERSION } " \ <nl> - D " CPACK_PACKAGE_VERSION_MAJOR = $ { VERSION_MAJOR } " \ <nl> - D " CPACK_PACKAGE_VERSION_MINOR = $ { VERSION_MINOR } " \ <nl> pack - arm - cmake : <nl> cd Build & & cpack \ <nl> - G DEB <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief Windows 64 - bit bundle <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + . PHONY : pack - win32 pack - winXX pack - winXX - cmake <nl> + <nl> + pack - win32 : <nl> + $ ( MAKE ) pack - winXX BITS = 32 TARGET = " Visual Studio 12 " <nl> + <nl> + pack - win64 : <nl> + $ ( MAKE ) pack - winXX BITS = 64 TARGET = " Visual Studio 12 Win64 " <nl> + <nl> + pack - winXX : <nl> + rm - rf Build $ ( BITS ) & & mkdir Build $ ( BITS ) <nl> + <nl> + $ { MAKE } pack - winXX - cmake BITS = " $ ( BITS ) " TARGET = " $ ( TARGET ) " VERSION = " ` awk ' { print substr ( $ $ 3 , 2 , length ( $ $ 3 ) - 2 ) ; } ' build . h ` " <nl> + <nl> + pack - winXX - cmake : <nl> + cd Build $ ( BITS ) & & cmake \ <nl> + - G " $ ( TARGET ) " \ <nl> + - D " USE_MRUBY = OFF " \ <nl> + - D " ARANGODB_VERSION = $ { VERSION } " \ <nl> + - D " CPACK_PACKAGE_VERSION_MAJOR = $ { VERSION_MAJOR } " \ <nl> + - D " CPACK_PACKAGE_VERSION_MINOR = $ { VERSION_MINOR } " \ <nl> + - D " CPACK_PACKAGE_VERSION_PATCH = $ { VERSION_PATCH } " \ <nl> + . . <nl> + <nl> + cd Build $ ( BITS ) & & cmake - - build . - - config Release <nl> + <nl> + cd Build $ ( BITS ) & & cpack - G NSIS <nl> + <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> # # - - SECTION - - END - OF - FILE <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> # # Local Variables : <nl> # # mode : outline - minor <nl> - # # outline - regexp : " ^ \ \ ( # # # @ brief \ \ | # # - - SECTION - - \ \ | # - \ \ * - \ \ ) " <nl> + # # outline - regexp : " # # # @ brief \ \ | # # - - SECTION - - \ \ | # - \ \ * - " <nl> # # End : <nl> mmm a / Installation / Debian / postinst <nl> ppp b / Installation / Debian / postinst <nl> Upgrading ArangoDB database files : <nl> > / etc / init . d / arangodb upgrade <nl> <nl> Configuration file : <nl> - / etc / arangodb / arangod - uid . conf <nl> + / etc / arangodb / arangod . conf <nl> <nl> Start ArangoDB shell client : <nl> > / usr / bin / arangosh <nl> mmm a / Installation / Debian / rc . arangodb <nl> ppp b / Installation / Debian / rc . arangodb <nl> DESC = " arango database server " <nl> NAME = " arangod " <nl> PIDDIR = / var / run / arangodb <nl> PIDFILE = / var / run / arangodb / arangod . pid <nl> - CONF = / etc / arangodb / arangod - uid . conf <nl> + CONF = / etc / arangodb / arangod . conf <nl> <nl> test - x $ DAEMON | | exit 0 <nl> <nl> start ( ) { <nl> fi <nl> <nl> if [ " $ 1 " = " - - upgrade " ] ; then <nl> - $ DAEMON - c $ CONF $ @ <nl> + $ DAEMON - c $ CONF - - uid arangodb - - gid arangodb $ @ <nl> else <nl> - $ DAEMON - c $ CONF - - pid - file " $ PIDFILE " - - temp - path " / var / tmp / arangod " - - supervisor $ @ <nl> + $ DAEMON - c $ CONF - - uid arangodb - - gid arangodb - - pid - file " $ PIDFILE " - - temp - path " / var / tmp / arangod " - - supervisor $ @ <nl> fi <nl> <nl> RETVAL = $ ? <nl> mmm a / Installation / Linux / rc . arangod . Centos <nl> ppp b / Installation / Linux / rc . arangod . Centos <nl> <nl> ARANGO_BIN = / usr / sbin / arangod <nl> test - x $ ARANGO_BIN | | exit 5 <nl> <nl> - ARANGO_SYSCONFIG = / etc / arangodb / arangod - uid . conf <nl> + ARANGO_SYSCONFIG = / etc / arangodb / arangod . conf <nl> test - r $ ARANGO_SYSCONFIG | | exit 6 <nl> <nl> pidfile = / var / run / arangodb / arangod . pid <nl> start ( ) { <nl> fi <nl> <nl> if [ " $ 1 " = " - - upgrade " ] ; then <nl> - $ ARANGO_BIN - c $ ARANGO_SYSCONFIG $ @ <nl> + $ ARANGO_BIN - c $ ARANGO_SYSCONFIG - - uid arangodb - - gid arangodb $ @ <nl> else <nl> - $ ARANGO_BIN - c $ ARANGO_SYSCONFIG - - pid - file " $ pidfile " - - temp - path " / var / tmp / arangod " - - supervisor $ @ <nl> + $ ARANGO_BIN - c $ ARANGO_SYSCONFIG - - uid arangodb - - gid arangodb - - pid - file " $ pidfile " - - temp - path " / var / tmp / arangod " - - supervisor $ @ <nl> fi <nl> <nl> RETVAL = $ ? <nl> mmm a / Installation / Linux / rc . arangod . OpenSuSE <nl> ppp b / Installation / Linux / rc . arangod . OpenSuSE <nl> <nl> ARANGO_BIN = / usr / sbin / arangod <nl> test - x $ ARANGO_BIN | | exit 5 <nl> <nl> - ARANGO_SYSCONFIG = / etc / arangodb / arangod - uid . conf <nl> + ARANGO_SYSCONFIG = / etc / arangodb / arangod . conf <nl> test - r $ ARANGO_SYSCONFIG | | exit 6 <nl> <nl> <nl> start ( ) { <nl> fi <nl> <nl> if [ " $ 1 " = " - - upgrade " ] ; then <nl> - $ ARANGO_BIN - c $ ARANGO_SYSCONFIG $ @ <nl> + $ ARANGO_BIN - c $ ARANGO_SYSCONFIG - - uid arangodb - - gid arangodb $ @ <nl> else <nl> - startproc $ ARANGO_BIN - c $ ARANGO_SYSCONFIG - - pid - file " $ ARANGO_PIDFILE " - - temp - path " / var / tmp / arangod " - - supervisor $ @ <nl> + startproc $ ARANGO_BIN - c $ ARANGO_SYSCONFIG - - uid arangodb - - gid arangodb - - pid - file " $ ARANGO_PIDFILE " - - temp - path " / var / tmp / arangod " - - supervisor $ @ <nl> fi <nl> <nl> # Remember status and be verbose <nl> mmm a / Installation / Linux / rc . arangod . Ubuntu <nl> ppp b / Installation / Linux / rc . arangod . Ubuntu <nl> DESC = " ArangoDB " <nl> NAME = " arangod " <nl> PIDDIR = / var / run / arangodb <nl> PIDFILE = $ { PIDDIR } / arangod . pid <nl> - CONF = / etc / arangodb / arangod - uid . conf <nl> + CONF = / etc / arangodb / arangod . conf <nl> <nl> test - x $ DAEMON | | exit 0 <nl> <nl> start ( ) { <nl> fi <nl> <nl> if [ " $ 1 " = " - - upgrade " ] ; then <nl> - $ DAEMON - c $ CONF $ @ <nl> + $ DAEMON - c $ CONF - - uid arangodb - - gid arangodb $ @ <nl> else <nl> - $ DAEMON - c $ CONF - - pid - file " $ PIDFILE " - - temp - path " / var / tmp / arangod " - - supervisor $ @ <nl> + $ DAEMON - c $ CONF - - uid arangodb - - gid arangodb - - pid - file " $ PIDFILE " - - temp - path " / var / tmp / arangod " - - supervisor $ @ <nl> fi <nl> <nl> RETVAL = $ ? <nl> mmm a / Installation / MacOSX / Bundle / arangodb - cli . sh <nl> ppp b / Installation / MacOSX / Bundle / arangodb - cli . sh <nl> <nl> # ! / bin / bash <nl> <nl> - ARANGODB_ROOT = " ` echo $ 0 | sed - e ' s / \ / Contents \ / MacOS \ / ArangoDB - CLI / / ' ` / " <nl> + ROOTDIR = " ` echo $ 0 | sed - e ' s : / Contents / MacOS / ArangoDB - CLI : : ' ` " <nl> <nl> # create start script <nl> <nl> - SCRIPTS = " ` ( cd $ { ARANGODB_ROOT } Contents / MacOS / opt / arangodb & & ls - 1 { bin , sbin } / * ) ` " <nl> + SCRIPTS = " ` ( cd $ { ROOTDIR } / Contents / MacOS / opt / arangodb & & ls - 1 { bin , sbin } / * ) ` " <nl> <nl> for script in $ SCRIPTS ; do <nl> base = " ` basename $ script ` " <nl> for script in $ SCRIPTS ; do <nl> ( <nl> echo " # ! / bin / bash " <nl> echo <nl> - echo " export ARANGODB_ROOT = \ " $ { ARANGODB_ROOT } Contents / MacOS / \ " " <nl> - echo " export DATABASEDIR = \ " \ $ { ARANGODB_ROOT } opt / arangodb / var / lib / arangodb \ " " <nl> - echo " export LOGDIR = \ " \ $ { ARANGODB_ROOT } opt / arangodb / var / log / arangodb \ " " <nl> - echo " export PKGDATADIR = \ " \ $ { ARANGODB_ROOT } opt / arangodb / share / arangodb \ " " <nl> + echo " export ROOTDIR = \ " $ { ROOTDIR } / Contents / MacOS / opt / arangodb \ " " <nl> echo <nl> - if [ " $ base " = = " arango - dfdb " ] ; then <nl> - echo " exec \ " \ $ { ARANGODB_ROOT } opt / arangodb / $ script \ " \ $ * " <nl> - elif [ " $ base " = = " foxx - manager " ] ; then <nl> - echo " exec \ " \ $ { ARANGODB_ROOT } opt / arangodb / $ script \ " - c \ " \ $ { ARANGODB_ROOT } opt / arangodb / etc / arangodb / arangosh - relative . conf \ " \ $ * " <nl> - else <nl> - echo " exec \ " \ $ { ARANGODB_ROOT } opt / arangodb / $ script \ " - c \ " \ $ { ARANGODB_ROOT } opt / arangodb / etc / arangodb / $ { base } - relative . conf \ " \ $ * " <nl> - fi <nl> - ) > $ { ARANGODB_ROOT } Contents / MacOS / $ base . $ $ <nl> - <nl> - chmod 755 $ { ARANGODB_ROOT } Contents / MacOS / $ base . $ $ <nl> - mv $ { ARANGODB_ROOT } Contents / MacOS / $ base . $ $ $ { ARANGODB_ROOT } Contents / MacOS / $ base <nl> + <nl> + echo " exec \ " \ $ { ROOTDIR } / $ script \ " - c \ " \ $ { ROOTDIR } / etc / arangodb / $ { base } . conf \ " \ $ * " <nl> + ) > $ { ROOTDIR } / Contents / MacOS / $ base . $ $ <nl> + <nl> + chmod 755 $ { ROOTDIR } / Contents / MacOS / $ base . $ $ <nl> + mv $ { ROOTDIR } / Contents / MacOS / $ base . $ $ $ { ROOTDIR } / Contents / MacOS / $ base <nl> done <nl> <nl> # start the server <nl> <nl> - PIDFILE = " $ { ARANGODB_ROOT } Contents / MacOS / opt / arangodb / var / run / arangod . pid " <nl> + PIDFILE = " $ { ROOTDIR } / Contents / MacOS / opt / arangodb / var / run / arangod . pid " <nl> <nl> if [ - f " $ { PIDFILE } " ] ; then <nl> result = ` <nl> EOF <nl> fi <nl> fi <nl> <nl> - test - d " $ { ARANGODB_ROOT } Contents / MacOS / opt / arangodb / var / run " | | mkdir " $ { ARANGODB_ROOT } Contents / MacOS / opt / arangodb / var / run " <nl> - $ { ARANGODB_ROOT } Contents / MacOS / arangod - - daemon - - pid - file " $ { PIDFILE } " <nl> + test - d " $ { ROOTDIR } / Contents / MacOS / opt / arangodb / var / run " | | mkdir " $ { ROOTDIR } / Contents / MacOS / opt / arangodb / var / run " <nl> + $ { ROOTDIR } / Contents / MacOS / arangod - - daemon - - pid - file " $ { PIDFILE } " <nl> <nl> # create some information for the user <nl> <nl> INFOFILE = " / tmp / ArangoDB - CLI . info . $ $ " <nl> echo " ArangoDB server has been started " <nl> echo " " <nl> echo " The database directory is located at " <nl> - echo " ' $ { ARANGODB_ROOT } Contents / MacOS / opt / arangodb / var / lib / arangodb ' " <nl> + echo " ' $ { ROOTDIR } / Contents / MacOS / opt / arangodb / var / lib / arangodb ' " <nl> echo " " <nl> echo " The log file is located at " <nl> - echo " ' $ { ARANGODB_ROOT } Contents / MacOS / opt / arangodb / var / log / arangodb / arangod . log ' " <nl> + echo " ' $ { ROOTDIR } / Contents / MacOS / opt / arangodb / var / log / arangodb / arangod . log ' " <nl> echo " " <nl> echo " You can access the server using a browser at ' http : / / 127 . 0 . 0 . 1 : 8529 / ' " <nl> echo " or start the ArangoDB shell " <nl> - echo " ' $ { ARANGODB_ROOT } Contents / MacOS / arangosh ' " <nl> + echo " ' $ { ROOTDIR } / Contents / MacOS / arangosh ' " <nl> echo " " <nl> echo " Switching to log - file now , killing this windows will NOT stop the server . " <nl> echo " " <nl> INFOFILE = " / tmp / ArangoDB - CLI . info . $ $ " <nl> / usr / bin / osascript < < - EOF <nl> tell application " Terminal " <nl> activate <nl> - do script " clear & & cat $ INFOFILE & & rm $ INFOFILE & & sleep 20 & & exec tail - 1 - f $ { ARANGODB_ROOT } Contents / MacOS / opt / arangodb / var / log / arangodb / arangod . log " <nl> + do script " clear & & cat $ INFOFILE & & rm $ INFOFILE & & sleep 20 & & exec tail - 1 - f $ { ROOTDIR } / Contents / MacOS / opt / arangodb / var / log / arangodb / arangod . log " <nl> end tell <nl> EOF <nl> new file mode 100755 <nl> index 00000000000 . . 2d685a58645 <nl> Binary files / dev / null and b / Installation / Windows / arangodb . bmp differ <nl> new file mode 100755 <nl> index 00000000000 . . 75000cd9107 <nl> Binary files / dev / null and b / Installation / Windows / arangodb . ico differ <nl> mmm a / Installation / epm / arangodb . list <nl> ppp b / Installation / epm / arangodb . list <nl> EOF <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> % else <nl> - c 0644 $ { susr } $ { sgrp } / etc / arangodb / arangod . conf $ { project_dir } / etc / arangodb / arangod - uid . conf <nl> + c 0644 $ { susr } $ { sgrp } / etc / arangodb / arangod . conf $ { project_dir } / etc / arangodb / arangod . conf <nl> % preinstall < < EOF <nl> getent group arangodb > / dev / null | | groupadd - r arangodb <nl> getent passwd arangodb > / dev / null | | useradd - r - g arangodb - d $ { static_dir } / arangodb - s / bin / false - c " ArangoDB Application User " arangodb <nl> mmm a / Makefile . am <nl> ppp b / Makefile . am <nl> comma : = , <nl> empty : = <nl> space : = $ ( empty ) $ ( empty ) <nl> MAJOR_MINOR : = $ ( subst $ ( space ) , . , $ ( wordlist 1 , 2 , $ ( subst . , , $ ( VERSION ) ) ) ) <nl> - VERSION_MAJOR : = $ ( wordlist 1 , 1 , $ ( subst . , , $ ( VERSION ) ) ) <nl> - VERSION_MINOR : = $ ( wordlist 2 , 2 , $ ( subst . , , $ ( VERSION ) ) ) <nl> - VERSION_PATCH : = $ ( wordlist 3 , 3 , $ ( subst . , , $ ( VERSION ) ) ) <nl> <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> # # - - SECTION - - FILES <nl> BISON_FILES = <nl> <nl> BISONXX_FILES = <nl> <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief configuration files <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - <nl> - BUILT_SOURCES + = etc / arangodb / arangod - uid . conf <nl> - <nl> - etc / arangodb / arangod - uid . conf : @ srcdir @ / etc / arangodb / arangod . conf <nl> - sed - e ' s : ^ # \ ( [ ug ] id \ ) : \ 1 : ' $ < > $ @ <nl> - <nl> - BUILT_SOURCES + = etc / arangodb / arangod - arm . conf <nl> - <nl> - etc / arangodb / arangod - arm . conf : @ srcdir @ / etc / arangodb / arangod . conf <nl> - sed - e ' / ^ \ [ server \ ] / , / ^ \ [ / s : ^ threads . * : threads = 1 : ' $ < > $ @ <nl> - <nl> - BUILT_SOURCES + = etc / arangodb / arangod - uid - arm . conf <nl> - <nl> - etc / arangodb / arangod - uid - arm . conf : @ srcdir @ / etc / arangodb / arangod . conf <nl> - sed - e ' s : ^ # \ ( [ ug ] id \ ) : \ 1 : ' $ < \ <nl> - | sed - e ' / ^ \ [ server \ ] / , / ^ \ [ / s : ^ threads . * : threads = 1 : ' > $ @ <nl> - <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> # # - - SECTION - - PATHS <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> noinst_LIBRARIES = \ <nl> lib / libarango_fe . a \ <nl> lib / libarango_client . a <nl> <nl> + if ENABLE_MRUBY <nl> + noinst_LIBRARIES + = lib / libarango_mruby . a <nl> + endif <nl> + <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief / bin programs <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> bin_PROGRAMS = \ <nl> bin / arangodump \ <nl> bin / arangorestore \ <nl> bin / arangosh \ <nl> - bin / arangoimp <nl> + bin / arangoimp <nl> + <nl> + if ENABLE_MRUBY <nl> + bin_PROGRAMS + = bin / arangoirb <nl> + endif <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief / sbin programs <nl> bin_SCRIPTS = <nl> noinst_PROGRAMS = \ <nl> bin / check - server <nl> <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief ruby additions <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - <nl> - if ENABLE_MRUBY <nl> - <nl> - noinst_LIBRARIES + = lib / libarango_mruby . a <nl> - bin_PROGRAMS + = bin / arangoirb <nl> - <nl> - endif <nl> - <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief / etc data <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> install - data - local : <nl> <nl> # endif <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief symbolic links <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + install - exec - hook : <nl> + rm - f $ ( DESTDIR ) $ ( bindir ) / ` echo foxx - manager | sed ' $ ( program_transform_name ) ' ` <nl> + $ ( LN_S ) ` echo arangosh | sed ' $ ( program_transform_name ) ' ` $ ( DESTDIR ) $ ( bindir ) / ` echo foxx - manager | sed ' $ ( program_transform_name ) ' ` <nl> + <nl> + rm - f $ ( DESTDIR ) $ ( sbindir ) / ` echo arango - dfdb | sed ' $ ( program_transform_name ) ' ` <nl> + $ ( LN_S ) ` echo arangod | sed ' $ ( program_transform_name ) ' ` $ ( DESTDIR ) $ ( sbindir ) / ` echo arango - dfdb | sed ' $ ( program_transform_name ) ' ` <nl> + <nl> + <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> # # - - SECTION - - TARGETS <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> include lib / Makefile . files <nl> include arangod / Makefile . files <nl> include arangosh / Makefile . files <nl> include etc / Makefile . files <nl> - include utils / Makefile . files <nl> <nl> if ENABLE_MRUBY <nl> include arangoirb / Makefile . files <nl> endif <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief zlib <nl> + # # # @ brief ICU <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - include 3rdParty / Makefile . zlib <nl> + if ENABLE_ALL_IN_ONE_ICU <nl> + include 3rdParty / Makefile . all - in - one - icu <nl> + endif <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief libev <nl> include 3rdParty / Makefile . all - in - one - libev <nl> endif <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief V8 <nl> + # # # @ brief mruby <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - if ENABLE_ALL_IN_ONE_V8 <nl> - include 3rdParty / Makefile . all - in - one - v8 <nl> + if ENABLE_MRUBY <nl> + include 3rdParty / Makefile . all - in - one - mruby <nl> endif <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief mruby <nl> + # # # @ brief V8 <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - if ENABLE_MRUBY <nl> - include 3rdParty / Makefile . all - in - one - mruby <nl> + if ENABLE_ALL_IN_ONE_V8 <nl> + include 3rdParty / Makefile . all - in - one - v8 <nl> endif <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief ICU <nl> + # # # @ brief zlib <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - if ENABLE_ALL_IN_ONE_ICU <nl> - include 3rdParty / Makefile . all - in - one - icu <nl> - endif <nl> + include 3rdParty / Makefile . zlib <nl> <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> # # - - SECTION - - END - OF - FILE <nl> mmm a / README <nl> ppp b / README <nl> <nl> ArangoDB <nl> <nl> ArangoDB is a multi - purpose open - source database with flexible data models for <nl> - documents , graphs , and key - values . Build high performance application using a <nl> - convenient sql - like query language or JavaScript / Ruby extensions . <nl> + documents , graphs , and key - values . Build high performance applications using a <nl> + convenient SQL - like query language or JavaScript / Ruby extensions . <nl> <nl> Key features include : <nl> <nl> Key features include : <nl> * No - nonsense storage : ArangoDB uses all of the power of modern storage <nl> hardware , like SSD and large caches <nl> * Powerful query language ( AQL ) to retrieve data <nl> - * Transactions : run queries on multiple documents or collections with optional <nl> + * Transactions : run queries on multiple documents or collections with optional <nl> transactional consistency and isolation <nl> * Replication : set up the database in a master - slave configuration <nl> * It is open source ( Apache Licence 2 . 0 ) <nl> You can use the Google group for improvements , feature requests , comments <nl> <nl> http : / / www . arangodb . org / connect <nl> <nl> + <nl> + Citing ArangoDB <nl> + <nl> + Please kindly cite ArangoDB in your publications if it helps your research : <nl> + bibtex @ misc { ArangoDB2013 , Author = { ArangoDB } , Title = { { ArangoDB } : An Open <nl> + Source multi - purpose database supporting flexible data models for documents , <nl> + graphs , and key - values . } , Year = { 2013 } , Howpublished = { \ url { http : / / <nl> + arangodb . org / } } <nl> new file mode 100755 <nl> index 00000000000 . . 287a25d1497 <nl> mmm / dev / null <nl> ppp b / README . windows <nl> <nl> + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> + - - Full documentation is available online at : - - <nl> + - - http : / / www . arangodb . org / start / windows - - <nl> + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> + <nl> + <nl> + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + * * * * Please read sections 5 & 6 below if you have an existing database * * * * <nl> + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + <nl> + 1 ) The default installation directory is " c : \ Program Files \ ArangoDB - 1 . x . y " . During the <nl> + installation process you may change this . In the following description we will assume <nl> + that ArangoDB has been installed in the location < ROOTDIR > . <nl> + <nl> + You have to be careful when choosing an installation directory . You need either <nl> + write permission to this directoy or you need to modify the config file for the <nl> + server process . In the latter case the database directory and the Foxx directory <nl> + should must be writable by the user . <nl> + <nl> + Installating for a single user : <nl> + <nl> + Select a different directory during installation . For example <nl> + " C : / Users / < username > / arangodb " or " C : / ArangoDB " . <nl> + <nl> + Installating for multiple users : <nl> + <nl> + Keep the default directory . After the installation edit the file <nl> + " < ROOTDIR > / etc / arangodb / arangod . conf " . Adjust the " directory " and " app - path " <nl> + so that these paths point into your home directory . <nl> + <nl> + [ database ] <nl> + directory = @ HOMEDRIVE @ / @ HOMEPATH @ / arangodb / databases <nl> + <nl> + [ javascript ] <nl> + app - path = @ HOMEDRIVE @ / @ HOMEPATH @ / arangodb / apps <nl> + <nl> + Create the directories for each user that wants to use ArangoDB . <nl> + <nl> + Installating as Service <nl> + <nl> + Keep the default directory . After the installation open a command line <nl> + as administrator ( search for " cmd " and right click " run as administrator " ) <nl> + <nl> + cmd > arangod - - install - service <nl> + INFO : adding service ' ArangoDB - the multi - purpose database ' ( internal ' ArangoDB ' ) <nl> + INFO : added service with command line ' " C : \ Program Files ( x86 ) \ ArangoDB 1 . 4 . 4 \ bin \ arangod . exe " - - start - service ' <nl> + <nl> + Open the service manager and start ArangoDB . In order to enable logging <nl> + edit the file " < ROOTDIR > / etc / arangodb / arangod . conf " and uncomment the file <nl> + option . <nl> + <nl> + [ log ] <nl> + file = @ ROOTDIR @ / var / log / arangodb / arangod . log <nl> + <nl> + 2 ) Please note that ArangoDB consists of a database server and client tools . If you <nl> + start the server , it will place a ( read - only ) lock file to prevent accidental <nl> + access to the data . The server will attempt to remove this lock file when it <nl> + is started to see if the lock is still valid - this is in case the <nl> + installation did not proceed correctly or if the server terminated <nl> + unexpectedly . <nl> + <nl> + 3 ) To start an ArangoDB server instance with networking enabled , use the executable <nl> + " arangod . exe " located in " < ROOTDIR > / bin " . This will use the configuration <nl> + file " arangod . conf " located in " < ROOTDIR > / etc / arangodb " , which you can adjust <nl> + to your needs and use the data directory " < ROOTDIR > / var / lib / arangodb " . This <nl> + is the place where all your data ( databases and collections ) will be stored <nl> + by default . <nl> + <nl> + Please check the output of the " arangod . exe " executable before going on . If <nl> + the server started successully , you should see a line " ArangoDB is ready for <nl> + business . Have fun ! " at the end of its output . <nl> + <nl> + We now wish to check that the installation is working correctly and to do <nl> + this we will be using the administration web interface . Execute " arangod . exe " <nl> + if you have not already done so , then open up your web browser and point it <nl> + to the page : http : / / 127 . 0 . 0 . 1 : 8529 / <nl> + <nl> + To check if your installation was successful , click the " Collection " tab and <nl> + open the configutation . Select the " System " TYPE . If the installation was <nl> + successful , then the page should display a few system collections . <nl> + <nl> + Try to add a new collection and then add some documents to this new <nl> + collection . If you have succeeded in creating a new collection and inserting <nl> + one or more documents , then your installation is working correctly . <nl> + <nl> + 4 ) To connect to an already running ArangoDB server instance , there is a shell <nl> + " arangosh . exe " located in " < ROOTDIR > / bin " . This starts a shell which can be <nl> + used ( amongst other things ) to administer and query a local or remote <nl> + ArangoDB server . <nl> + <nl> + Note that " arangosh . exe " does NOT start a separate server , it only starts the <nl> + shell . To use it , you must have a server running somewhere , e . g . by using <nl> + the " arangod . exe " executable . <nl> + <nl> + " arangosh . exe " uses configuration from the file " arangosh . conf " located in <nl> + " < ROOTDIR > / etc / arangodb / " . Please adjust this to your needs if you want to <nl> + use different connection settings etc . <nl> + <nl> + 5 ) If you have an EXISTING database , then please note that currently a 32 bit <nl> + version of ArangoDB is NOT compatible with a 64 bit version . This means that <nl> + if you have a database created with a 32 bit version of ArangoDB it may <nl> + become corrupted if you execute a 64 bit version of ArangoDB against the same <nl> + database , and vice versa . <nl> + <nl> + 6 ) To upgrade an EXISTING database created with a previous version of ArangoDB , <nl> + please execute the server " arangod . exe " with the option <nl> + " - - upgrade " . Otherwise starting ArangoDB may fail with errors . <nl> + <nl> + Note that there is no harm in running the upgrade . So you should run this <nl> + batch file if you are unsure of the database version you are using . <nl> + <nl> + You should always check the output for errors to see if the upgrade was <nl> + completed successfully . <nl> + <nl> + 7 ) To uninstall the Arango server application you can use the windows control panel <nl> + ( as you would normally uninstall an application ) . Note however , that any data <nl> + files created by the Arango server will remain as well as the < ROOTDIR > <nl> + directory . To complete the uninstallation process , remove the data files and <nl> + the < ROOTDIR > directory manually . <nl> + <nl> + If you have any questions regarding the installation or other matters please use <nl> + <nl> + http : / / groups . google . com / group / arangodb <nl> + <nl> + For bug reports please use <nl> + <nl> + https : / / github . com / triAGENS / ArangoDB / issues <nl> + <nl> + To obtain the version of the currently installed ArangoDB instance , execute the <nl> + following on a Command Prompt : <nl> + <nl> + arangod . exe - - version <nl> + <nl> + Thanks for choosing ArangoDB ! <nl> mmm a / UnitTests / Makefile . unittests <nl> ppp b / UnitTests / Makefile . unittests <nl> unittests - dfdb : <nl> @ mkdir - p " $ ( VOCDIR ) / databases " <nl> @ test - d " $ ( VOCDIR ) " <nl> <nl> - echo - e " \ x04 " | ( $ ( VALGRIND ) @ builddir @ / bin / arango - dfdb - - relative - - database " $ ( VOCDIR ) " | | test " x $ ( FORCE ) " = = " x1 " ) <nl> + echo - e " \ x04 " | ( $ ( VALGRIND ) @ builddir @ / bin / arangod - c etc / relative / arango - dfdb . conf - - database . directory " $ ( VOCDIR ) " | | test " x $ ( FORCE ) " = = " x1 " ) <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief FOXX MANAGER TESTS <nl> unittests - foxx - manager : <nl> @ echo " = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = " <nl> @ echo <nl> <nl> - $ ( VALGRIND ) @ builddir @ / bin / foxx - manager - - relative $ ( CLIENT_OPT ) - - server . username " $ ( USERNAME ) " - - server . password " $ ( PASSWORD ) " - - server . endpoint tcp : / / $ ( VOCHOST ) : $ ( VOCPORT ) update | | test " x $ ( FORCE ) " = = " x1 " <nl> - $ ( VALGRIND ) @ builddir @ / bin / foxx - manager - - relative $ ( CLIENT_OPT ) - - server . username " $ ( USERNAME ) " - - server . password " $ ( PASSWORD ) " - - server . endpoint tcp : / / $ ( VOCHOST ) : $ ( VOCPORT ) search " itzpapalotl " | | test " x $ ( FORCE ) " = = " x1 " <nl> + $ ( VALGRIND ) @ builddir @ / bin / arangosh - c etc / relative / foxx - manager . conf $ ( CLIENT_OPT ) - - server . username " $ ( USERNAME ) " - - server . password " $ ( PASSWORD ) " - - server . endpoint tcp : / / $ ( VOCHOST ) : $ ( VOCPORT ) update | | test " x $ ( FORCE ) " = = " x1 " <nl> + $ ( VALGRIND ) @ builddir @ / bin / arangosh - c etc / relative / foxx - manager . conf $ ( CLIENT_OPT ) - - server . username " $ ( USERNAME ) " - - server . password " $ ( PASSWORD ) " - - server . endpoint tcp : / / $ ( VOCHOST ) : $ ( VOCPORT ) search " itzpapalotl " | | test " x $ ( FORCE ) " = = " x1 " <nl> sleep 2 <nl> kill ` cat $ ( PIDFILE ) ` <nl> <nl> mmm a / VERSION <nl> ppp b / VERSION <nl> @ @ - 1 + 1 @ @ <nl> - 1 . 4 . 0 <nl> + 1 . 5 . devel <nl> diff - - git a / VS2012 / Arango Client Library / Arango Client Library . vcxproj b / VS2012 / Arango Client Library / Arango Client Library . vcxproj <nl> deleted file mode 100644 <nl> index f482ee920dc . . 00000000000 <nl> mmm a / VS2012 / Arango Client Library / Arango Client Library . vcxproj <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project DefaultTargets = " Build " ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup Label = " ProjectConfigurations " > <nl> - < ProjectConfiguration Include = " Debug | Win32 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Debug | x64 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | Win32 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | x64 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < / ItemGroup > <nl> - < PropertyGroup Label = " Globals " > <nl> - < ProjectGuid > { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } < / ProjectGuid > <nl> - < Keyword > Win32Proj < / Keyword > <nl> - < RootNamespace > ArangoClientLibrary < / RootNamespace > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . Default . props " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . props " / > <nl> - < ImportGroup Label = " ExtensionSettings " > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < PropertyGroup Label = " UserMacros " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < TargetName > arango_client < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < TargetName > arango_client < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < TargetName > arango_client < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < TargetName > arango_client < / TargetName > <nl> - < / PropertyGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; WIN32 ; TRI_BITS = 32 ; _DEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < OmitFramePointers > <nl> - < / OmitFramePointers > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; TRI_BITS = 64 ; FD_SETSIZE = 2048 ; WIN32 ; _DEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; WIN32 ; TRI_BITS = 32 ; NDEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; TRI_BITS = 64 ; FD_SETSIZE = 2048 ; WIN32 ; NDEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemGroup > <nl> - < None Include = " ReadMe . txt " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ ClientConnection . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ GeneralClientConnection . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpClient . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpResult . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ SslClientConnection . h " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ ClientConnection . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ GeneralClientConnection . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpClient . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpResult . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ SslClientConnection . cpp " / > <nl> - < / ItemGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . targets " / > <nl> - < ImportGroup Label = " ExtensionTargets " > <nl> - < / ImportGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango Client Library / Arango Client Library . vcxproj . filters b / VS2012 / Arango Client Library / Arango Client Library . vcxproj . filters <nl> deleted file mode 100644 <nl> index da6c1ecf250 . . 00000000000 <nl> mmm a / VS2012 / Arango Client Library / Arango Client Library . vcxproj . filters <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup > <nl> - < Filter Include = " SimpleHttpClient Header " > <nl> - < UniqueIdentifier > { 93995380 - 89BD - 4b04 - 88EB - 625FBE52EBFB } < / UniqueIdentifier > <nl> - < Extensions > h ; hpp ; hxx ; hm ; inl ; inc ; xsd < / Extensions > <nl> - < / Filter > <nl> - < Filter Include = " SimpleHttpClient Source " > <nl> - < UniqueIdentifier > { 4FC737F1 - C7A5 - 4376 - A066 - 2A32D752A2FF } < / UniqueIdentifier > <nl> - < Extensions > cpp ; c ; cc ; cxx ; def ; odl ; idl ; hpj ; bat ; asm ; asmx < / Extensions > <nl> - < / Filter > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < None Include = " ReadMe . txt " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ ClientConnection . h " > <nl> - < Filter > SimpleHttpClient Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ GeneralClientConnection . h " > <nl> - < Filter > SimpleHttpClient Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpClient . h " > <nl> - < Filter > SimpleHttpClient Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpResult . h " > <nl> - < Filter > SimpleHttpClient Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ SslClientConnection . h " > <nl> - < Filter > SimpleHttpClient Header < / Filter > <nl> - < / ClInclude > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ ClientConnection . cpp " > <nl> - < Filter > SimpleHttpClient Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ GeneralClientConnection . cpp " > <nl> - < Filter > SimpleHttpClient Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpClient . cpp " > <nl> - < Filter > SimpleHttpClient Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpResult . cpp " > <nl> - < Filter > SimpleHttpClient Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ SslClientConnection . cpp " > <nl> - < Filter > SimpleHttpClient Source < / Filter > <nl> - < / ClCompile > <nl> - < / ItemGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango Client Library / Arango Client Library . vcxproj . user b / VS2012 / Arango Client Library / Arango Client Library . vcxproj . user <nl> deleted file mode 100644 <nl> index 695b5c78b91 . . 00000000000 <nl> mmm a / VS2012 / Arango Client Library / Arango Client Library . vcxproj . user <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango Client Library / ReadMe . txt b / VS2012 / Arango Client Library / ReadMe . txt <nl> deleted file mode 100644 <nl> index e8438112107 . . 00000000000 <nl> mmm a / VS2012 / Arango Client Library / ReadMe . txt <nl> ppp / dev / null <nl> <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - STATIC LIBRARY : Arango Client Library Project Overview <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - <nl> - AppWizard has created this Arango Client Library library project for you . <nl> - <nl> - No source files were created as part of your project . <nl> - <nl> - <nl> - Arango Client Library . vcxproj <nl> - This is the main project file for VC + + projects generated using an Application Wizard . <nl> - It contains information about the version of Visual C + + that generated the file , and <nl> - information about the platforms , configurations , and project features selected with the <nl> - Application Wizard . <nl> - <nl> - Arango Client Library . vcxproj . filters <nl> - This is the filters file for VC + + projects generated using an Application Wizard . <nl> - It contains information about the association between the files in your project <nl> - and the filters . This association is used in the IDE to show grouping of files with <nl> - similar extensions under a specific node ( for e . g . " . cpp " files are associated with the <nl> - " Source Files " filter ) . <nl> - <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - Other notes : <nl> - <nl> - AppWizard uses " TODO : " comments to indicate parts of the source code you <nl> - should add to or customize . <nl> - <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> diff - - git a / VS2012 / Arango Front End Library / Arango Front End Library . vcxproj b / VS2012 / Arango Front End Library / Arango Front End Library . vcxproj <nl> deleted file mode 100644 <nl> index c1ad9ecbd4a . . 00000000000 <nl> mmm a / VS2012 / Arango Front End Library / Arango Front End Library . vcxproj <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project DefaultTargets = " Build " ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup Label = " ProjectConfigurations " > <nl> - < ProjectConfiguration Include = " Debug | Win32 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Debug | x64 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | Win32 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | x64 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < / ItemGroup > <nl> - < PropertyGroup Label = " Globals " > <nl> - < ProjectGuid > { 4E48A2A8 - 9F42 - 41DA - 8DEF - 6548198E8964 } < / ProjectGuid > <nl> - < Keyword > Win32Proj < / Keyword > <nl> - < RootNamespace > ArangoFrontEndLibrary < / RootNamespace > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . Default . props " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . props " / > <nl> - < ImportGroup Label = " ExtensionSettings " > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < PropertyGroup Label = " UserMacros " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < TargetName > arango_fe < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < TargetName > arango_fe < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < TargetName > arango_fe < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < TargetName > arango_fe < / TargetName > <nl> - < / PropertyGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; WIN32 ; TRI_BITS = 32 ; _DEBUG ; _LIB ; TRI_OPENSSL_VERSION ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ libev ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < OmitFramePointers > <nl> - < / OmitFramePointers > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; TRI_BITS = 64 ; FD_SETSIZE = 2048 ; WIN32 ; _DEBUG ; _LIB ; TRI_OPENSSL_VERSION ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ libev ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; WIN32 ; TRI_BITS = 32 ; NDEBUG ; _LIB ; TRI_OPENSSL_VERSION ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ libev ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; TRI_BITS = 64 ; FD_SETSIZE = 2048 ; WIN32 ; NDEBUG ; _LIB ; TRI_OPENSSL_VERSION ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ libev ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemGroup > <nl> - < None Include = " ReadMe . txt " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ libev - 4 . 01 \ ev_wrap . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Admin \ ApplicationAdminServer . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Admin \ RestAdminBaseHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Admin \ RestAdminLogHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Admin \ RestBaseHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Admin \ RestHandlerCreator . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Admin \ RestJobHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Admin \ RestVersionHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ ApplicationServer \ ApplicationFeature . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ ApplicationServer \ ApplicationServer . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Dispatcher \ ApplicationDispatcher . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Dispatcher \ Dispatcher . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Dispatcher \ DispatcherQueue . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Dispatcher \ DispatcherThread . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Dispatcher \ Job . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Dispatcher \ JobObserver . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ EndpointServer . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ GeneralAsyncCommTask . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ GeneralCommTask . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ GeneralListenTask . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ GeneralServer . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ GeneralServerDispatcher . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ GeneralServerJob . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ GeneralSslServer . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ SpecificCommTask . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ SslAsyncCommTask . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ ApplicationEndpointServer . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ AsyncJobManager . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ GeneralHttpServer . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ HttpCommTask . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ HttpHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ HttpHandlerFactory . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ HttpServer . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ HttpsServer . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ PathHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ ServiceUnavailableHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ ApplicationScheduler . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ AsyncTask . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ events . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ ListenTask . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ PeriodicTask . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ Scheduler . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ SchedulerLibev . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ SchedulerThread . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ SignalTask . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ SocketTask . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ Task . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ TaskManager . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ TimerTask . h " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ libev \ evwrap . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Admin \ ApplicationAdminServer . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Admin \ RestAdminBaseHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Admin \ RestAdminLogHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Admin \ RestBaseHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Admin \ RestJobHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Admin \ RestVersionHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ ApplicationServer \ ApplicationFeature . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ ApplicationServer \ ApplicationServer . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Dispatcher \ ApplicationDispatcher . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Dispatcher \ Dispatcher . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Dispatcher \ DispatcherQueue . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Dispatcher \ DispatcherThread . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Dispatcher \ Job . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ HttpServer \ ApplicationEndpointServer . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ HttpServer \ HttpHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ HttpServer \ HttpHandlerFactory . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ HttpServer \ PathHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ HttpServer \ ServiceUnavailableHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ ApplicationScheduler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ AsyncTask . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ ListenTask . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ PeriodicTask . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ Scheduler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ SchedulerLibev . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ SchedulerThread . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ SignalTask . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ SocketTask . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ Task . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ TaskManager . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ TimerTask . cpp " / > <nl> - < / ItemGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . targets " / > <nl> - < ImportGroup Label = " ExtensionTargets " > <nl> - < / ImportGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango Front End Library / Arango Front End Library . vcxproj . filters b / VS2012 / Arango Front End Library / Arango Front End Library . vcxproj . filters <nl> deleted file mode 100644 <nl> index 4ba3511351e . . 00000000000 <nl> mmm a / VS2012 / Arango Front End Library / Arango Front End Library . vcxproj . filters <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup > <nl> - < Filter Include = " Admin Source " > <nl> - < UniqueIdentifier > { 4FC737F1 - C7A5 - 4376 - A066 - 2A32D752A2FF } < / UniqueIdentifier > <nl> - < Extensions > cpp ; c ; cc ; cxx ; def ; odl ; idl ; hpj ; bat ; asm ; asmx < / Extensions > <nl> - < / Filter > <nl> - < Filter Include = " Admin Header " > <nl> - < UniqueIdentifier > { 93995380 - 89BD - 4b04 - 88EB - 625FBE52EBFB } < / UniqueIdentifier > <nl> - < Extensions > h ; hpp ; hxx ; hm ; inl ; inc ; xsd < / Extensions > <nl> - < / Filter > <nl> - < Filter Include = " App Server Source " > <nl> - < UniqueIdentifier > { e2280a22 - c4c5 - 4009 - 8e14 - 9c47d27aa4da } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " App Server Header " > <nl> - < UniqueIdentifier > { 993b8d0b - 0429 - 4e09 - 8a72 - 6e57d4fa7f0d } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Dispatcher Source " > <nl> - < UniqueIdentifier > { ea3091f3 - e0c6 - 42f2 - ac50 - 47a3afb06060 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Dispatcher Header " > <nl> - < UniqueIdentifier > { 6864000c - 6aec - 4d23 - 912f - cc413d696a83 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Http Server Source " > <nl> - < UniqueIdentifier > { 67b74899 - 011b - 4254 - a82d - 86cf442a25d5 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Http Server Header " > <nl> - < UniqueIdentifier > { 77913628 - 8193 - 462a - 9f10 - d49158efad9c } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Scheduler Source " > <nl> - < UniqueIdentifier > { 4735afb3 - 3596 - 4d17 - b779 - d0a524afecbd } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Scheduler Header " > <nl> - < UniqueIdentifier > { 5bcf4578 - d074 - 498d - 99fe - b604c78fd975 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Libev header " > <nl> - < UniqueIdentifier > { 067753ed - 09a5 - 4aea - b88f - 4d6494535b08 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Libev source " > <nl> - < UniqueIdentifier > { cf6a3132 - a919 - 4092 - 8c66 - faaf035c29df } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < None Include = " ReadMe . txt " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ lib \ Admin \ ApplicationAdminServer . h " > <nl> - < Filter > Admin Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Admin \ RestAdminBaseHandler . h " > <nl> - < Filter > Admin Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Admin \ RestAdminLogHandler . h " > <nl> - < Filter > Admin Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Admin \ RestBaseHandler . h " > <nl> - < Filter > Admin Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Admin \ RestHandlerCreator . h " > <nl> - < Filter > Admin Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Admin \ RestVersionHandler . h " > <nl> - < Filter > Admin Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ ApplicationServer \ ApplicationFeature . h " > <nl> - < Filter > App Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ ApplicationServer \ ApplicationServer . h " > <nl> - < Filter > App Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Dispatcher \ ApplicationDispatcher . h " > <nl> - < Filter > Dispatcher Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Dispatcher \ Dispatcher . h " > <nl> - < Filter > Dispatcher Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Dispatcher \ DispatcherQueue . h " > <nl> - < Filter > Dispatcher Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Dispatcher \ DispatcherThread . h " > <nl> - < Filter > Dispatcher Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Dispatcher \ Job . h " > <nl> - < Filter > Dispatcher Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Dispatcher \ JobObserver . h " > <nl> - < Filter > Dispatcher Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ ApplicationEndpointServer . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ GeneralHttpServer . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ HttpCommTask . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ HttpHandler . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ HttpHandlerFactory . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ HttpServer . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ HttpsServer . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ PathHandler . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ ServiceUnavailableHandler . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ ApplicationScheduler . h " > <nl> - < Filter > Scheduler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ AsyncTask . h " > <nl> - < Filter > Scheduler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ events . h " > <nl> - < Filter > Scheduler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ ListenTask . h " > <nl> - < Filter > Scheduler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ PeriodicTask . h " > <nl> - < Filter > Scheduler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ Scheduler . h " > <nl> - < Filter > Scheduler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ SchedulerLibev . h " > <nl> - < Filter > Scheduler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ SchedulerThread . h " > <nl> - < Filter > Scheduler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ SignalTask . h " > <nl> - < Filter > Scheduler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ SocketTask . h " > <nl> - < Filter > Scheduler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ Task . h " > <nl> - < Filter > Scheduler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ TaskManager . h " > <nl> - < Filter > Scheduler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Scheduler \ TimerTask . h " > <nl> - < Filter > Scheduler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ libev - 4 . 01 \ ev_wrap . h " > <nl> - < Filter > Libev header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ EndpointServer . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ GeneralAsyncCommTask . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ GeneralCommTask . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ GeneralListenTask . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ GeneralServer . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ GeneralServerDispatcher . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ GeneralServerJob . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ GeneralSslServer . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ SpecificCommTask . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ GeneralServer \ SslAsyncCommTask . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ HttpServer \ AsyncJobManager . h " > <nl> - < Filter > Http Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Admin \ RestJobHandler . h " > <nl> - < Filter > Admin Header < / Filter > <nl> - < / ClInclude > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ lib \ Admin \ ApplicationAdminServer . cpp " > <nl> - < Filter > Admin Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Admin \ RestAdminBaseHandler . cpp " > <nl> - < Filter > Admin Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Admin \ RestAdminLogHandler . cpp " > <nl> - < Filter > Admin Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Admin \ RestBaseHandler . cpp " > <nl> - < Filter > Admin Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Admin \ RestVersionHandler . cpp " > <nl> - < Filter > Admin Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ ApplicationServer \ ApplicationFeature . cpp " > <nl> - < Filter > App Server Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ ApplicationServer \ ApplicationServer . cpp " > <nl> - < Filter > App Server Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Dispatcher \ ApplicationDispatcher . cpp " > <nl> - < Filter > Dispatcher Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Dispatcher \ Dispatcher . cpp " > <nl> - < Filter > Dispatcher Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Dispatcher \ DispatcherQueue . cpp " > <nl> - < Filter > Dispatcher Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Dispatcher \ DispatcherThread . cpp " > <nl> - < Filter > Dispatcher Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Dispatcher \ Job . cpp " > <nl> - < Filter > Dispatcher Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ HttpServer \ ApplicationEndpointServer . cpp " > <nl> - < Filter > Http Server Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ HttpServer \ HttpHandler . cpp " > <nl> - < Filter > Http Server Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ HttpServer \ HttpHandlerFactory . cpp " > <nl> - < Filter > Http Server Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ HttpServer \ PathHandler . cpp " > <nl> - < Filter > Http Server Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ HttpServer \ ServiceUnavailableHandler . cpp " > <nl> - < Filter > Http Server Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ ApplicationScheduler . cpp " > <nl> - < Filter > Scheduler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ AsyncTask . cpp " > <nl> - < Filter > Scheduler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ ListenTask . cpp " > <nl> - < Filter > Scheduler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ PeriodicTask . cpp " > <nl> - < Filter > Scheduler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ Scheduler . cpp " > <nl> - < Filter > Scheduler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ SchedulerLibev . cpp " > <nl> - < Filter > Scheduler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ SchedulerThread . cpp " > <nl> - < Filter > Scheduler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ SignalTask . cpp " > <nl> - < Filter > Scheduler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ SocketTask . cpp " > <nl> - < Filter > Scheduler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ TaskManager . cpp " > <nl> - < Filter > Scheduler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ TimerTask . cpp " > <nl> - < Filter > Scheduler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Scheduler \ Task . cpp " > <nl> - < Filter > Scheduler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ libev \ evwrap . c " > <nl> - < Filter > Libev source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Admin \ RestJobHandler . cpp " > <nl> - < Filter > Admin Source < / Filter > <nl> - < / ClCompile > <nl> - < / ItemGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango Front End Library / Arango Front End Library . vcxproj . user b / VS2012 / Arango Front End Library / Arango Front End Library . vcxproj . user <nl> deleted file mode 100644 <nl> index 695b5c78b91 . . 00000000000 <nl> mmm a / VS2012 / Arango Front End Library / Arango Front End Library . vcxproj . user <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango Front End Library / ReadMe . txt b / VS2012 / Arango Front End Library / ReadMe . txt <nl> deleted file mode 100644 <nl> index b8dac934c13 . . 00000000000 <nl> mmm a / VS2012 / Arango Front End Library / ReadMe . txt <nl> ppp / dev / null <nl> <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - STATIC LIBRARY : Arango Front End Library Project Overview <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - <nl> - AppWizard has created this Arango Front End Library library project for you . <nl> - <nl> - No source files were created as part of your project . <nl> - <nl> - <nl> - Arango Front End Library . vcxproj <nl> - This is the main project file for VC + + projects generated using an Application Wizard . <nl> - It contains information about the version of Visual C + + that generated the file , and <nl> - information about the platforms , configurations , and project features selected with the <nl> - Application Wizard . <nl> - <nl> - Arango Front End Library . vcxproj . filters <nl> - This is the filters file for VC + + projects generated using an Application Wizard . <nl> - It contains information about the association between the files in your project <nl> - and the filters . This association is used in the IDE to show grouping of files with <nl> - similar extensions under a specific node ( for e . g . " . cpp " files are associated with the <nl> - " Source Files " filter ) . <nl> - <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - Other notes : <nl> - <nl> - AppWizard uses " TODO : " comments to indicate parts of the source code you <nl> - should add to or customize . <nl> - <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> diff - - git a / VS2012 / Arango MRuby Library / Arango MRuby Library . vcxproj b / VS2012 / Arango MRuby Library / Arango MRuby Library . vcxproj <nl> deleted file mode 100644 <nl> index b4aca6501b3 . . 00000000000 <nl> mmm a / VS2012 / Arango MRuby Library / Arango MRuby Library . vcxproj <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project DefaultTargets = " Build " ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup Label = " ProjectConfigurations " > <nl> - < ProjectConfiguration Include = " Debug | Win32 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Debug | x64 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | Win32 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | x64 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < / ItemGroup > <nl> - < PropertyGroup Label = " Globals " > <nl> - < ProjectGuid > { 13A4B4F9 - 4D59 - 4F4C - 8B14 - AFFCCDA5002B } < / ProjectGuid > <nl> - < Keyword > Win32Proj < / Keyword > <nl> - < RootNamespace > ArangoMRubyLibrary < / RootNamespace > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . Default . props " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . props " / > <nl> - < ImportGroup Label = " ExtensionSettings " > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < PropertyGroup Label = " UserMacros " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < TargetName > arango_ruby < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < TargetName > arango_ruby < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < TargetName > arango_ruby < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < TargetName > arango_ruby < / TargetName > <nl> - < / PropertyGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; WIN32 ; _DEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . \ ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mruby \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < OmitFramePointers > <nl> - < / OmitFramePointers > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; FD_SETSIZE = 2048 ; WIN32 ; _DEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . \ ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mruby \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; WIN32 ; NDEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . \ ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mruby \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; FD_SETSIZE = 2048 ; WIN32 ; NDEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . \ ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mruby \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemGroup > <nl> - < None Include = " ReadMe . txt " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ lib \ MRuby \ mr - utils . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ MRuby \ MRLineEditor . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ MRuby \ MRLoader . cpp " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ lib \ MRuby \ mr - utils . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ MRuby \ MRLineEditor . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ MRuby \ MRLoader . h " / > <nl> - < / ItemGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . targets " / > <nl> - < ImportGroup Label = " ExtensionTargets " > <nl> - < / ImportGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango MRuby Library / Arango MRuby Library . vcxproj . filters b / VS2012 / Arango MRuby Library / Arango MRuby Library . vcxproj . filters <nl> deleted file mode 100644 <nl> index c0d14d059c8 . . 00000000000 <nl> mmm a / VS2012 / Arango MRuby Library / Arango MRuby Library . vcxproj . filters <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup > <nl> - < None Include = " ReadMe . txt " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < Filter Include = " MRuby Source " > <nl> - < UniqueIdentifier > { 33309e72 - f098 - 4ff7 - a820 - 9c92baeec58e } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " MRuby Header " > <nl> - < UniqueIdentifier > { c5b908b0 - 941e - 42e6 - a218 - 5ff978dc07e5 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ lib \ MRuby \ MRLineEditor . cpp " > <nl> - < Filter > MRuby Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ MRuby \ MRLoader . cpp " > <nl> - < Filter > MRuby Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ MRuby \ mr - utils . c " > <nl> - < Filter > MRuby Source < / Filter > <nl> - < / ClCompile > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ lib \ MRuby \ MRLineEditor . h " > <nl> - < Filter > MRuby Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ MRuby \ MRLoader . h " > <nl> - < Filter > MRuby Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ MRuby \ mr - utils . h " > <nl> - < Filter > MRuby Header < / Filter > <nl> - < / ClInclude > <nl> - < / ItemGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango MRuby Library / Arango MRuby Library . vcxproj . user b / VS2012 / Arango MRuby Library / Arango MRuby Library . vcxproj . user <nl> deleted file mode 100644 <nl> index 695b5c78b91 . . 00000000000 <nl> mmm a / VS2012 / Arango MRuby Library / Arango MRuby Library . vcxproj . user <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango MRuby Library / ReadMe . txt b / VS2012 / Arango MRuby Library / ReadMe . txt <nl> deleted file mode 100644 <nl> index fe29703fefd . . 00000000000 <nl> mmm a / VS2012 / Arango MRuby Library / ReadMe . txt <nl> ppp / dev / null <nl> <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - STATIC LIBRARY : Arango MRuby Library Project Overview <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - <nl> - AppWizard has created this Arango MRuby Library library project for you . <nl> - <nl> - No source files were created as part of your project . <nl> - <nl> - <nl> - Arango MRuby Library . vcxproj <nl> - This is the main project file for VC + + projects generated using an Application Wizard . <nl> - It contains information about the version of Visual C + + that generated the file , and <nl> - information about the platforms , configurations , and project features selected with the <nl> - Application Wizard . <nl> - <nl> - Arango MRuby Library . vcxproj . filters <nl> - This is the filters file for VC + + projects generated using an Application Wizard . <nl> - It contains information about the association between the files in your project <nl> - and the filters . This association is used in the IDE to show grouping of files with <nl> - similar extensions under a specific node ( for e . g . " . cpp " files are associated with the <nl> - " Source Files " filter ) . <nl> - <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - Other notes : <nl> - <nl> - AppWizard uses " TODO : " comments to indicate parts of the source code you <nl> - should add to or customize . <nl> - <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> diff - - git a / VS2012 / Arango Readline Library / ReadMe . txt b / VS2012 / Arango Readline Library / ReadMe . txt <nl> deleted file mode 100644 <nl> index ac7e7e693c1 . . 00000000000 <nl> mmm a / VS2012 / Arango Readline Library / ReadMe . txt <nl> ppp / dev / null <nl> <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - STATIC LIBRARY : readline Project Overview <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - <nl> - AppWizard has created this readline library project for you . <nl> - <nl> - No source files were created as part of your project . <nl> - <nl> - <nl> - readline . vcxproj <nl> - This is the main project file for VC + + projects generated using an Application Wizard . <nl> - It contains information about the version of Visual C + + that generated the file , and <nl> - information about the platforms , configurations , and project features selected with the <nl> - Application Wizard . <nl> - <nl> - readline . vcxproj . filters <nl> - This is the filters file for VC + + projects generated using an Application Wizard . <nl> - It contains information about the association between the files in your project <nl> - and the filters . This association is used in the IDE to show grouping of files with <nl> - similar extensions under a specific node ( for e . g . " . cpp " files are associated with the <nl> - " Source Files " filter ) . <nl> - <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - Other notes : <nl> - <nl> - AppWizard uses " TODO : " comments to indicate parts of the source code you <nl> - should add to or customize . <nl> - <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> diff - - git a / VS2012 / Arango Readline Library / readline . vcxproj b / VS2012 / Arango Readline Library / readline . vcxproj <nl> deleted file mode 100644 <nl> index 1863e43237b . . 00000000000 <nl> mmm a / VS2012 / Arango Readline Library / readline . vcxproj <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project DefaultTargets = " Build " ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup Label = " ProjectConfigurations " > <nl> - < ProjectConfiguration Include = " Debug | Win32 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Debug | x64 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | Win32 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | x64 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < / ItemGroup > <nl> - < PropertyGroup Label = " Globals " > <nl> - < ProjectGuid > { 756B37DA - 7F72 - 4D5C - 83C3 - F54815AC304F } < / ProjectGuid > <nl> - < Keyword > Win32Proj < / Keyword > <nl> - < RootNamespace > readline < / RootNamespace > <nl> - < ProjectName > Arango Readline Library < / ProjectName > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . Default . props " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . props " / > <nl> - < ImportGroup Label = " ExtensionSettings " > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < PropertyGroup Label = " UserMacros " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < TargetName > readline < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < TargetName > readline < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < TargetName > readline < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < TargetName > readline < / TargetName > <nl> - < / PropertyGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; _WIN32 ; WIN32 ; _DEBUG ; _LIB ; READLINE_STATIC = 1 ; HAVE_STRING_H = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; HAVE_STDLIB_H = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < OmitFramePointers > <nl> - < / OmitFramePointers > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; FD_SETSIZE = 2048 ; _WIN32 ; WIN32 ; _DEBUG ; _LIB ; READLINE_STATIC = 1 ; HAVE_STRING_H = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; HAVE_STDLIB_H = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; _WIN32 ; WIN32 ; _LIB ; READLINE_STATIC = 1 ; HAVE_STRING_H = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; HAVE_STDLIB_H = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; FD_SETSIZE = 2048 ; _WIN32 ; WIN32 ; _LIB ; READLINE_STATIC = 1 ; HAVE_STRING_H = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; HAVE_STDLIB_H = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemGroup > <nl> - < None Include = " ReadMe . txt " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ bind . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ callback . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ compat . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ complete . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ display . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ funmap . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ histexpand . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ histfile . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ history . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ histsearch . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ input . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ isearch . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ keymaps . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ kill . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ macro . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ mbutil . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ misc . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ nls . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ parens . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ readline . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rltty . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ savestring . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ search . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ shell . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ signals . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ terminal . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ text . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ tilde . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ undo . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ util . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ vi_mode . c " / > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ xmalloc . c " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ ansi_stdlib . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ chardefs . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ histlib . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ history . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ keymaps . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ posixdir . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ posixjmp . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ posixstat . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ readline . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rlconf . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rldefs . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rlmbutil . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rlprivate . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rlshell . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rlstdc . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rltty . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rltypedefs . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rlwinsize . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ tcap . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ tilde . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ xmalloc . h " / > <nl> - < / ItemGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . targets " / > <nl> - < ImportGroup Label = " ExtensionTargets " > <nl> - < / ImportGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango Readline Library / readline . vcxproj . filters b / VS2012 / Arango Readline Library / readline . vcxproj . filters <nl> deleted file mode 100644 <nl> index 9e0bee2b8da . . 00000000000 <nl> mmm a / VS2012 / Arango Readline Library / readline . vcxproj . filters <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup > <nl> - < Filter Include = " Source Files " > <nl> - < UniqueIdentifier > { 4FC737F1 - C7A5 - 4376 - A066 - 2A32D752A2FF } < / UniqueIdentifier > <nl> - < Extensions > cpp ; c ; cc ; cxx ; def ; odl ; idl ; hpj ; bat ; asm ; asmx < / Extensions > <nl> - < / Filter > <nl> - < Filter Include = " Header Files " > <nl> - < UniqueIdentifier > { 93995380 - 89BD - 4b04 - 88EB - 625FBE52EBFB } < / UniqueIdentifier > <nl> - < Extensions > h ; hpp ; hxx ; hm ; inl ; inc ; xsd < / Extensions > <nl> - < / Filter > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < None Include = " ReadMe . txt " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ bind . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ callback . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ compat . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ complete . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ display . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ funmap . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ histexpand . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ histfile . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ history . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ histsearch . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ input . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ isearch . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ keymaps . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ kill . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ macro . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ mbutil . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ misc . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ nls . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ parens . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ readline . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rltty . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ savestring . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ search . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ shell . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ signals . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ terminal . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ text . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ tilde . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ undo . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ util . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ vi_mode . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ xmalloc . c " > <nl> - < Filter > Source Files < / Filter > <nl> - < / ClCompile > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ ansi_stdlib . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ chardefs . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ histlib . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ history . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ keymaps . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ posixdir . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ posixjmp . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ posixstat . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ readline . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rlconf . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rldefs . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rlmbutil . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rlprivate . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rlshell . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rlstdc . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rltty . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rltypedefs . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ rlwinsize . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ tcap . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ tilde . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ readline \ xmalloc . h " > <nl> - < Filter > Header Files < / Filter > <nl> - < / ClInclude > <nl> - < / ItemGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango Readline Library / readline . vcxproj . user b / VS2012 / Arango Readline Library / readline . vcxproj . user <nl> deleted file mode 100644 <nl> index 695b5c78b91 . . 00000000000 <nl> mmm a / VS2012 / Arango Readline Library / readline . vcxproj . user <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango Regex Library / regex - 2 . 7 . vcxproj b / VS2012 / Arango Regex Library / regex - 2 . 7 . vcxproj <nl> deleted file mode 100644 <nl> index d1798953292 . . 00000000000 <nl> mmm a / VS2012 / Arango Regex Library / regex - 2 . 7 . vcxproj <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project DefaultTargets = " Build " ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup Label = " ProjectConfigurations " > <nl> - < ProjectConfiguration Include = " Debug | Win32 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Debug | x64 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | Win32 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | x64 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ regex \ src \ regex . c " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ regex \ src \ regex . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ regex \ src \ regex_internal . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ regex \ src \ re_comp . h " / > <nl> - < / ItemGroup > <nl> - < PropertyGroup Label = " Globals " > <nl> - < ProjectGuid > { 23313837 - C0F8 - 46E2 - 8F16 - 6396D72FBF08 } < / ProjectGuid > <nl> - < RootNamespace > regex27 < / RootNamespace > <nl> - < ProjectName > Arango Regex Library < / ProjectName > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . Default . props " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . props " / > <nl> - < ImportGroup Label = " ExtensionSettings " > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < PropertyGroup Label = " UserMacros " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < TargetName > regex < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < TargetName > regex < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < TargetName > regex < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < TargetName > regex < / TargetName > <nl> - < OutDir > $ ( SolutionDir ) $ ( Platform ) \ $ ( Configuration ) \ < / OutDir > <nl> - < / PropertyGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; % ( AdditionalIncludeDirectories ) < / AdditionalIncludeDirectories > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; % ( PreprocessorDefinitions ) ; REGEX_STATIC = 1 < / PreprocessorDefinitions > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < OmitFramePointers > <nl> - < / OmitFramePointers > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > Disabled < / Optimization > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; % ( AdditionalIncludeDirectories ) < / AdditionalIncludeDirectories > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; FD_SETSIZE = 2048 ; % ( PreprocessorDefinitions ) ; REGEX_STATIC = 1 < / PreprocessorDefinitions > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; % ( AdditionalIncludeDirectories ) < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; _UNICODE ; UNICODE ; % ( PreprocessorDefinitions ) ; REGEX_STATIC = 1 < / PreprocessorDefinitions > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < Link > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; % ( AdditionalIncludeDirectories ) < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; FD_SETSIZE = 2048 ; _UNICODE ; UNICODE ; % ( PreprocessorDefinitions ) ; REGEX_STATIC = 1 < / PreprocessorDefinitions > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < Link > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . targets " / > <nl> - < ImportGroup Label = " ExtensionTargets " > <nl> - < / ImportGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango Regex Library / regex - 2 . 7 . vcxproj . filters b / VS2012 / Arango Regex Library / regex - 2 . 7 . vcxproj . filters <nl> deleted file mode 100644 <nl> index 9064a0a9987 . . 00000000000 <nl> mmm a / VS2012 / Arango Regex Library / regex - 2 . 7 . vcxproj . filters <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup > <nl> - < Filter Include = " Regex Header " > <nl> - < UniqueIdentifier > { 93995380 - 89BD - 4b04 - 88EB - 625FBE52EBFB } < / UniqueIdentifier > <nl> - < Extensions > h ; hpp ; hxx ; hm ; inl ; inc ; xsd < / Extensions > <nl> - < / Filter > <nl> - < Filter Include = " Regex Source " > <nl> - < UniqueIdentifier > { 4FC737F1 - C7A5 - 4376 - A066 - 2A32D752A2FF } < / UniqueIdentifier > <nl> - < Extensions > cpp ; c ; cc ; cxx ; def ; odl ; idl ; hpj ; bat ; asm ; asmx < / Extensions > <nl> - < / Filter > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ regex \ src \ regex . c " > <nl> - < Filter > Regex Source < / Filter > <nl> - < / ClCompile > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ regex \ src \ re_comp . h " > <nl> - < Filter > Regex Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ regex \ src \ regex . h " > <nl> - < Filter > Regex Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ regex \ src \ regex_internal . h " > <nl> - < Filter > Regex Header < / Filter > <nl> - < / ClInclude > <nl> - < / ItemGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango Regex Library / regex - 2 . 7 . vcxproj . user b / VS2012 / Arango Regex Library / regex - 2 . 7 . vcxproj . user <nl> deleted file mode 100644 <nl> index 695b5c78b91 . . 00000000000 <nl> mmm a / VS2012 / Arango Regex Library / regex - 2 . 7 . vcxproj . user <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango V8 Library / Arango V8 Library . vcxproj b / VS2012 / Arango V8 Library / Arango V8 Library . vcxproj <nl> deleted file mode 100644 <nl> index 87e8784c86a . . 00000000000 <nl> mmm a / VS2012 / Arango V8 Library / Arango V8 Library . vcxproj <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project DefaultTargets = " Build " ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup Label = " ProjectConfigurations " > <nl> - < ProjectConfiguration Include = " Debug | Win32 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Debug | x64 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | Win32 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | x64 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < / ItemGroup > <nl> - < PropertyGroup Label = " Globals " > <nl> - < ProjectGuid > { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } < / ProjectGuid > <nl> - < Keyword > Win32Proj < / Keyword > <nl> - < RootNamespace > ArangoV8Library < / RootNamespace > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . Default . props " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . props " / > <nl> - < ImportGroup Label = " ExtensionSettings " > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < PropertyGroup Label = " UserMacros " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < TargetName > arango_v8 < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < TargetName > arango_v8 < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < TargetName > arango_v8 < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < TargetName > arango_v8 < / TargetName > <nl> - < / PropertyGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; WIN32 ; TRI_BITS = 32 ; _DEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; YY_NO_UNISTD_H ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < OmitFramePointers > <nl> - < / OmitFramePointers > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; TRI_BITS = 64 ; FD_SETSIZE = 2048 ; WIN32 ; _DEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; YY_NO_UNISTD_H ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; WIN32 ; TRI_BITS = 32 ; NDEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; YY_NO_UNISTD_H ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; TRI_BITS = 64 ; FD_SETSIZE = 2048 ; WIN32 ; NDEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; YY_NO_UNISTD_H ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Windows < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemGroup > <nl> - < None Include = " ReadMe . txt " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ ClientConnection . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ GeneralClientConnection . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpClient . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpResult . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ SslClientConnection . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ JSLoader . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ v8 - buffer . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ v8 - conv . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ v8 - execution . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ v8 - globals . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ v8 - json . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ v8 - shell . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ v8 - utils . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ V8LineEditor . cpp " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ ClientConnection . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ GeneralClientConnection . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpClient . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpResult . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ SslClientConnection . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ JSLoader . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ v8 - buffer . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ v8 - conv . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ v8 - execution . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ v8 - globals . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ v8 - json . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ v8 - shell . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ v8 - utils . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ V8LineEditor . h " / > <nl> - < / ItemGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . targets " / > <nl> - < ImportGroup Label = " ExtensionTargets " > <nl> - < / ImportGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango V8 Library / Arango V8 Library . vcxproj . filters b / VS2012 / Arango V8 Library / Arango V8 Library . vcxproj . filters <nl> deleted file mode 100644 <nl> index 8ddc6c002d9 . . 00000000000 <nl> mmm a / VS2012 / Arango V8 Library / Arango V8 Library . vcxproj . filters <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup > <nl> - < None Include = " ReadMe . txt " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < Filter Include = " V8 Source " > <nl> - < UniqueIdentifier > { 5f61dead - 1e38 - 47d7 - b610 - 6226a4dd2980 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " V8 Header " > <nl> - < UniqueIdentifier > { 96aaec03 - 439d - 49b0 - a2a8 - 4413b23226dd } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " SimpleHttpClient Source " > <nl> - < UniqueIdentifier > { e3839bb0 - 7128 - 49e6 - 8202 - 6d5347187ffb } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " SimpleHttpClient Header " > <nl> - < UniqueIdentifier > { 988cb65f - d9cb - 4c77 - b753 - 9c637a4eca41 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ JSLoader . cpp " > <nl> - < Filter > V8 Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ v8 - conv . cpp " > <nl> - < Filter > V8 Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ v8 - execution . cpp " > <nl> - < Filter > V8 Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ v8 - json . cpp " > <nl> - < Filter > V8 Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ v8 - shell . cpp " > <nl> - < Filter > V8 Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ v8 - utils . cpp " > <nl> - < Filter > V8 Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ V8LineEditor . cpp " > <nl> - < Filter > V8 Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ v8 - globals . cpp " > <nl> - < Filter > V8 Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ V8 \ v8 - buffer . cpp " > <nl> - < Filter > V8 Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ ClientConnection . cpp " > <nl> - < Filter > SimpleHttpClient Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ GeneralClientConnection . cpp " > <nl> - < Filter > SimpleHttpClient Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpClient . cpp " > <nl> - < Filter > SimpleHttpClient Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpResult . cpp " > <nl> - < Filter > SimpleHttpClient Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ SimpleHttpClient \ SslClientConnection . cpp " > <nl> - < Filter > SimpleHttpClient Source < / Filter > <nl> - < / ClCompile > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ JSLoader . h " > <nl> - < Filter > V8 Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ v8 - conv . h " > <nl> - < Filter > V8 Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ v8 - execution . h " > <nl> - < Filter > V8 Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ v8 - globals . h " > <nl> - < Filter > V8 Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ v8 - json . h " > <nl> - < Filter > V8 Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ V8LineEditor . h " > <nl> - < Filter > V8 Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ v8 - shell . h " > <nl> - < Filter > V8 Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ v8 - utils . h " > <nl> - < Filter > V8 Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ V8 \ v8 - buffer . h " > <nl> - < Filter > V8 Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ ClientConnection . h " > <nl> - < Filter > SimpleHttpClient Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ GeneralClientConnection . h " > <nl> - < Filter > SimpleHttpClient Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpClient . h " > <nl> - < Filter > SimpleHttpClient Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ SimpleHttpResult . h " > <nl> - < Filter > SimpleHttpClient Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ SimpleHttpClient \ SslClientConnection . h " > <nl> - < Filter > SimpleHttpClient Header < / Filter > <nl> - < / ClInclude > <nl> - < / ItemGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango V8 Library / Arango V8 Library . vcxproj . user b / VS2012 / Arango V8 Library / Arango V8 Library . vcxproj . user <nl> deleted file mode 100644 <nl> index 695b5c78b91 . . 00000000000 <nl> mmm a / VS2012 / Arango V8 Library / Arango V8 Library . vcxproj . user <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arango V8 Library / ReadMe . txt b / VS2012 / Arango V8 Library / ReadMe . txt <nl> deleted file mode 100644 <nl> index ef2919b168b . . 00000000000 <nl> mmm a / VS2012 / Arango V8 Library / ReadMe . txt <nl> ppp / dev / null <nl> <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - STATIC LIBRARY : Arango V8 Library Project Overview <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - <nl> - AppWizard has created this Arango V8 Library library project for you . <nl> - <nl> - No source files were created as part of your project . <nl> - <nl> - <nl> - Arango V8 Library . vcxproj <nl> - This is the main project file for VC + + projects generated using an Application Wizard . <nl> - It contains information about the version of Visual C + + that generated the file , and <nl> - information about the platforms , configurations , and project features selected with the <nl> - Application Wizard . <nl> - <nl> - Arango V8 Library . vcxproj . filters <nl> - This is the filters file for VC + + projects generated using an Application Wizard . <nl> - It contains information about the association between the files in your project <nl> - and the filters . This association is used in the IDE to show grouping of files with <nl> - similar extensions under a specific node ( for e . g . " . cpp " files are associated with the <nl> - " Source Files " filter ) . <nl> - <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - Other notes : <nl> - <nl> - AppWizard uses " TODO : " comments to indicate parts of the source code you <nl> - should add to or customize . <nl> - <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> diff - - git a / VS2012 / ArangoDB Library / ArangoDB . vcxproj b / VS2012 / ArangoDB Library / ArangoDB . vcxproj <nl> deleted file mode 100644 <nl> index 237579e18fe . . 00000000000 <nl> mmm a / VS2012 / ArangoDB Library / ArangoDB . vcxproj <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project DefaultTargets = " Build " ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup Label = " ProjectConfigurations " > <nl> - < ProjectConfiguration Include = " Debug | Win32 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Debug | x64 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | Win32 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | x64 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < / ItemGroup > <nl> - < PropertyGroup Label = " Globals " > <nl> - < ProjectGuid > { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } < / ProjectGuid > <nl> - < RootNamespace > ArangoDB < / RootNamespace > <nl> - < ProjectName > ArangoDB Library < / ProjectName > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . Default . props " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > StaticLibrary < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . props " / > <nl> - < ImportGroup Label = " ExtensionSettings " > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < PropertyGroup Label = " UserMacros " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < TargetName > arango < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < TargetName > arango < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < TargetName > arango < / TargetName > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < TargetName > arango < / TargetName > <nl> - < / PropertyGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; WIN32 ; TRI_BITS = 32 ; _DEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; TRI_MISSING_MEMRCHR = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < OmitFramePointers > <nl> - < / OmitFramePointers > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; TRI_BITS = 64 ; FD_SETSIZE = 2048 ; WIN32 ; _DEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; TRI_MISSING_MEMRCHR = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; WIN32 ; TRI_BITS = 32 ; NDEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; TRI_MISSING_MEMRCHR = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < Link > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; TRI_BITS = 64 ; FD_SETSIZE = 2048 ; WIN32 ; NDEBUG ; _LIB ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; TRI_MISSING_MEMRCHR = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < Link > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ mygetopt \ getopt . h " / > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ mygetopt \ mygetopt . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ application - exit . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ associative - multi . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ associative . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ common . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ conversions . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ csv . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ debugging . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ error . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ files . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ hashes . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ init . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ json - utilities . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ json . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ linked - list . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ local - configuration . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ locks - macos . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ locks - win32 . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ locks . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ logging . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ memory - map - win32 . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ memory - map . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ memory . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ mersenne . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ messages . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ operating - system . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ process - utils . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ random . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ skip - list . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ socket - utils . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ string - buffer . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ strings . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ structures . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ system - compiler . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ system - functions . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ terminal - utils . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ threads - win32 . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ threads . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ tri - zip . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ utf8 - helper . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ vector . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ voc - errors . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ win - utils . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ AssociativeArray . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Common . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ ConditionLocker . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ ConditionVariable . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ delete_object . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Dictionary . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Exceptions . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ FileUtils . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Functor . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ InitialiseBasics . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ JsonHelper . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ LibraryLoader . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Mutex . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ MutexLocker . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Nonce . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ ProgramOptions . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ RandomGenerator . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ RandomHeap . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ ReadLocker . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ ReadUnlocker . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ ReadWriteLock . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ safe_cast . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ ssl - helper . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ StringBuffer . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ StringUtils . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Thread . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Timing . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Utf8Helper . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ WriteLocker . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ WriteUnlocker . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ ProgramOptions \ program - options . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ AnyServer . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ AsyncJobServer . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ ConnectionInfo . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ Endpoint . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ EndpointIp . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ EndpointList . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ Handler . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ HttpRequest . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ HttpResponse . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ InitialiseRest . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ LineRequest . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ LineResponse . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ MaintenanceCallback . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ OperationMode . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ SslInterface . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ Url . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ Version . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ ShapedJson \ json - shaper . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ ShapedJson \ shape - accessor . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ ShapedJson \ shaped - json . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Statistics \ RoundRobinFigures . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Statistics \ statistics . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Statistics \ StatisticsAgent . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Utilities \ LineEditor . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Utilities \ ScriptLoader . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Zip \ ioapi . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Zip \ iowin32 . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Zip \ unzip . h " / > <nl> - < ClInclude Include = " . . \ . . \ lib \ Zip \ zip . h " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ mygetopt \ mygetopt . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ application - exit . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ associative - multi . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ associative . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ conversions . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ csv . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ debugging . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ error . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ files . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ hashes . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ init . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ json - utilities . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ json . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ linked - list . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ locks - win32 . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ logging . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ memory - map - win32 . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ memory . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ mersenne . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ mimetypes . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ process - utils . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ random . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ skip - list . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ socket - utils . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ string - buffer . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ structures . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ system - functions . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ terminal - utils - win32 . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ terminal - utils . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ threads - win32 . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ tri - strings . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ tri - zip . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ utf8 - helper . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ vector . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ voc - errors . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ voc - mimetypes . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ win - utils . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ConditionLocker . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ConditionVariable . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ Exceptions . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ FileUtils . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ InitialiseBasics . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ JsonHelper . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ LibraryLoader . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ Mutex . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ MutexLocker . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ Nonce . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ProgramOptions . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ProgramOptionsDescription . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ RandomGenerator . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ReadLocker . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ReadUnlocker . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ReadWriteLock . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ssl - helper . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ StringUtils . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ Thread . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ Timing . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ Utf8Helper . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ WriteLocker . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ WriteUnlocker . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ JsonParser \ json - parser . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ ProgramOptions \ program - options . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ AnyServer . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ Endpoint . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ EndpointIp . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ EndpointIpV4 . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ EndpointIpV6 . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ EndpointList . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ Handler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ HttpRequest . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ HttpResponse . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ InitialiseRest . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ SslInterface . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ Url . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ Version . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ ShapedJson \ json - shaper . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ ShapedJson \ shape - accessor . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ ShapedJson \ shaped - json . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Statistics \ statistics . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Utilities \ LineEditor . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Utilities \ ScriptLoader . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Zip \ ioapi . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Zip \ iowin32 . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Zip \ unzip . c " / > <nl> - < ClCompile Include = " . . \ . . \ lib \ Zip \ zip . c " / > <nl> - < / ItemGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . targets " / > <nl> - < ImportGroup Label = " ExtensionTargets " > <nl> - < / ImportGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / ArangoDB Library / ArangoDB . vcxproj . filters b / VS2012 / ArangoDB Library / ArangoDB . vcxproj . filters <nl> deleted file mode 100644 <nl> index 399d70461a1 . . 00000000000 <nl> mmm a / VS2012 / ArangoDB Library / ArangoDB . vcxproj . filters <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup > <nl> - < Filter Include = " BasicsSource " > <nl> - < UniqueIdentifier > { 53a4d6cc - 67a7 - 4d40 - 9be3 - 9253d711f472 } < / UniqueIdentifier > <nl> - < Extensions > * . cpp < / Extensions > <nl> - < / Filter > <nl> - < Filter Include = " BasicsHeader " > <nl> - < UniqueIdentifier > { ae34757c - 5ba9 - 4c8a - bada - cf8624cbfd6f } < / UniqueIdentifier > <nl> - < Extensions > * . h < / Extensions > <nl> - < / Filter > <nl> - < Filter Include = " BasicsCSource " > <nl> - < UniqueIdentifier > { 4FC737F1 - C7A5 - 4376 - A066 - 2A32D752A2FF } < / UniqueIdentifier > <nl> - < Extensions > cpp ; c ; cc ; cxx ; def ; odl ; idl ; hpj ; bat ; asm ; asmx < / Extensions > <nl> - < / Filter > <nl> - < Filter Include = " BasicsCHeader " > <nl> - < UniqueIdentifier > { 93995380 - 89BD - 4b04 - 88EB - 625FBE52EBFB } < / UniqueIdentifier > <nl> - < Extensions > h ; hpp ; hxx ; hm ; inl ; inc ; xsd < / Extensions > <nl> - < / Filter > <nl> - < Filter Include = " JsonParserSource " > <nl> - < UniqueIdentifier > { 28ae53c5 - 3ac5 - 49b5 - abf4 - ec2321f41c8f } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " ProgramOptionsHeader " > <nl> - < UniqueIdentifier > { 56012718 - 9628 - 4580 - bc19 - 92871477432f } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " ProgramOptionsSource " > <nl> - < UniqueIdentifier > { 7b32781c - 5d64 - 4c21 - ad79 - e33d9c3e2b38 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " ShapedJsonSource " > <nl> - < UniqueIdentifier > { 3321fbe1 - 28e3 - 4ab9 - 9a81 - 0bb5435edd68 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " ShapedJsonHeader " > <nl> - < UniqueIdentifier > { 4e9d39ca - 3c05 - 4cf6 - 9056 - d8ab6f13ee64 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " StatisticsSource " > <nl> - < UniqueIdentifier > { bbf414b5 - 5c1e - 4a33 - bd44 - 31038a405c1c } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " StatisticsHeader " > <nl> - < UniqueIdentifier > { 69b9c270 - 7609 - 4618 - 96ab - 66ff0de38660 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " UtilitiesSource " > <nl> - < UniqueIdentifier > { a540a2d9 - 91ef - 4965 - a778 - b2308c020177 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " UtilitiesHeader " > <nl> - < UniqueIdentifier > { 8af0e8a0 - 812e - 46db - 871a - 570053b35d33 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " RestSource " > <nl> - < UniqueIdentifier > { d1e17e7c - ac46 - 4988 - b16e - 517eb1a6636b } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " RestHeader " > <nl> - < UniqueIdentifier > { 61bb5eec - 939f - 46c6 - bf8e - aed922fa0297 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " ZipHeader " > <nl> - < UniqueIdentifier > { abf44e06 - 5cb6 - 4382 - 8b4a - 97dfce728dd8 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " ZipSource " > <nl> - < UniqueIdentifier > { d757b218 - fa98 - 41d3 - bed8 - c550d2903e66 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ associative . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ associative - multi . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ common . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ conversions . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ csv . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ error . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ files . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ hashes . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ init . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ json . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ json - utilities . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ linked - list . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ locks . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ locks - macos . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ locks - win32 . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ logging . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ memory . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ operating - system . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ process - utils . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ random . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ socket - utils . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ string - buffer . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ strings . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ structures . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ system - compiler . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ system - functions . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ terminal - utils . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ threads . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ threads - win32 . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ vector . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ voc - errors . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ StringUtils . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ AssociativeArray . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Common . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ ConditionLocker . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ ConditionVariable . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ delete_object . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Dictionary . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Exceptions . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ FileUtils . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Functor . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ LibraryLoader . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Mutex . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ MutexLocker . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ ProgramOptions . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ RandomHeap . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ ReadLocker . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ ReadUnlocker . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ ReadWriteLock . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ StringBuffer . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Thread . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Timing . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Utf8Helper . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ WriteLocker . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ WriteUnlocker . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ safe_cast . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ ssl - helper . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ ProgramOptions \ program - options . h " > <nl> - < Filter > ProgramOptionsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ ShapedJson \ json - shaper . h " > <nl> - < Filter > ShapedJsonHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ ShapedJson \ shape - accessor . h " > <nl> - < Filter > ShapedJsonHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ ShapedJson \ shaped - json . h " > <nl> - < Filter > ShapedJsonHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Statistics \ RoundRobinFigures . h " > <nl> - < Filter > StatisticsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Statistics \ statistics . h " > <nl> - < Filter > StatisticsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Statistics \ StatisticsAgent . h " > <nl> - < Filter > StatisticsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Utilities \ LineEditor . h " > <nl> - < Filter > UtilitiesHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Utilities \ ScriptLoader . h " > <nl> - < Filter > UtilitiesHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ AnyServer . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ AsyncJobServer . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ ConnectionInfo . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ Endpoint . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ EndpointList . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ Handler . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ HttpRequest . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ HttpResponse . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ LineRequest . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ LineResponse . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ MaintenanceCallback . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ OperationMode . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ SslInterface . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ Url . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ mersenne . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ win - utils . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ memory - map . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ memory - map - win32 . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ RandomGenerator . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ InitialiseBasics . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ InitialiseRest . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ mygetopt \ getopt . h " > <nl> - < Filter > ProgramOptionsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ 3rdParty \ VisualStudio \ mygetopt \ mygetopt . h " > <nl> - < Filter > ProgramOptionsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ messages . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ utf8 - helper . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ local - configuration . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ application - exit . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ EndpointIp . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ Nonce . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Rest \ Version . h " > <nl> - < Filter > RestHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ skip - list . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Zip \ ioapi . h " > <nl> - < Filter > ZipHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Zip \ iowin32 . h " > <nl> - < Filter > ZipHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Zip \ unzip . h " > <nl> - < Filter > ZipHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Zip \ zip . h " > <nl> - < Filter > ZipHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ tri - zip . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ BasicsC \ debugging . h " > <nl> - < Filter > BasicsCHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ lib \ Basics \ JsonHelper . h " > <nl> - < Filter > BasicsHeader < / Filter > <nl> - < / ClInclude > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ associative . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ associative - multi . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ conversions . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ csv . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ error . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ files . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ hashes . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ init . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ json . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ json - utilities . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ linked - list . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ locks - win32 . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ logging . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ memory . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ process - utils . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ random . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ socket - utils . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ string - buffer . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ structures . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ system - functions . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ terminal - utils . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ terminal - utils - win32 . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ threads - win32 . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ vector . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ voc - errors . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ConditionLocker . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ConditionVariable . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ Exceptions . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ FileUtils . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ LibraryLoader . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ Mutex . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ MutexLocker . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ProgramOptions . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ProgramOptionsDescription . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ReadLocker . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ReadUnlocker . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ReadWriteLock . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ ssl - helper . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ StringUtils . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ Thread . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ Timing . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ Utf8Helper . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ WriteLocker . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ WriteUnlocker . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ JsonParser \ json - parser . c " > <nl> - < Filter > JsonParserSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ ProgramOptions \ program - options . c " > <nl> - < Filter > ProgramOptionsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ ShapedJson \ json - shaper . c " > <nl> - < Filter > ShapedJsonSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ ShapedJson \ shape - accessor . c " > <nl> - < Filter > ShapedJsonSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ ShapedJson \ shaped - json . c " > <nl> - < Filter > ShapedJsonSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Statistics \ statistics . cpp " > <nl> - < Filter > StatisticsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Utilities \ ScriptLoader . cpp " > <nl> - < Filter > UtilitiesSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ AnyServer . cpp " > <nl> - < Filter > RestSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ Endpoint . cpp " > <nl> - < Filter > RestSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ EndpointList . cpp " > <nl> - < Filter > RestSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ Handler . cpp " > <nl> - < Filter > RestSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ HttpRequest . cpp " > <nl> - < Filter > RestSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ HttpResponse . cpp " > <nl> - < Filter > RestSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ SslInterface . cpp " > <nl> - < Filter > RestSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ Url . cpp " > <nl> - < Filter > RestSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ mersenne . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ win - utils . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ memory - map - win32 . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ RandomGenerator . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ InitialiseBasics . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ InitialiseRest . cpp " > <nl> - < Filter > RestSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ 3rdParty \ VisualStudio \ mygetopt \ mygetopt . c " > <nl> - < Filter > ProgramOptionsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ EndpointIp . cpp " > <nl> - < Filter > RestSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ EndpointIpV4 . cpp " > <nl> - < Filter > RestSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ EndpointIpV6 . cpp " > <nl> - < Filter > RestSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Utilities \ LineEditor . cpp " > <nl> - < Filter > UtilitiesSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ utf8 - helper . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ application - exit . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ Nonce . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Rest \ Version . cpp " > <nl> - < Filter > RestSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ skip - list . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Zip \ ioapi . c " > <nl> - < Filter > ZipSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Zip \ iowin32 . c " > <nl> - < Filter > ZipSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Zip \ unzip . c " > <nl> - < Filter > ZipSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Zip \ zip . c " > <nl> - < Filter > ZipSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ tri - strings . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ mimetypes . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ voc - mimetypes . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ tri - zip . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ BasicsC \ debugging . c " > <nl> - < Filter > BasicsCSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ lib \ Basics \ JsonHelper . cpp " > <nl> - < Filter > BasicsSource < / Filter > <nl> - < / ClCompile > <nl> - < / ItemGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / ArangoDB Library / Readme . txt b / VS2012 / ArangoDB Library / Readme . txt <nl> deleted file mode 100644 <nl> index e69de29bb2d . . 00000000000 <nl> diff - - git a / VS2012 / Arangod Binary / Arangod Binary . vcxproj b / VS2012 / Arangod Binary / Arangod Binary . vcxproj <nl> deleted file mode 100644 <nl> index 7f9b2bab36b . . 00000000000 <nl> mmm a / VS2012 / Arangod Binary / Arangod Binary . vcxproj <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project DefaultTargets = " Build " ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup Label = " ProjectConfigurations " > <nl> - < ProjectConfiguration Include = " Debug | Win32 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Debug | x64 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | Win32 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | x64 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < / ItemGroup > <nl> - < PropertyGroup Label = " Globals " > <nl> - < ProjectGuid > { 00364934 - E6C8 - 44F2 - 957C - 0E71383504D0 } < / ProjectGuid > <nl> - < Keyword > Win32Proj < / Keyword > <nl> - < RootNamespace > ArangodBinary < / RootNamespace > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . Default . props " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > Application < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < UseOfMfc > false < / UseOfMfc > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > Application < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < UseOfMfc > false < / UseOfMfc > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > Application < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > Application < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . props " / > <nl> - < ImportGroup Label = " ExtensionSettings " > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < PropertyGroup Label = " UserMacros " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < LinkIncremental > false < / LinkIncremental > <nl> - < TargetName > arangod32d < / TargetName > <nl> - < OutDir > c : \ local2 \ arango - triagens \ dev \ < / OutDir > <nl> - < LibraryPath > $ ( SolutionDir ) Debug ; $ ( LibraryPath ) < / LibraryPath > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < LinkIncremental > false < / LinkIncremental > <nl> - < TargetName > arangod64d < / TargetName > <nl> - < OutDir > c : \ local2 \ arango - triagens \ dev \ < / OutDir > <nl> - < LibraryPath > $ ( SolutionDir ) x64 \ Debug ; $ ( LibraryPath ) < / LibraryPath > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < LinkIncremental > false < / LinkIncremental > <nl> - < TargetName > arangod32 < / TargetName > <nl> - < LibraryPath > $ ( SolutionDir ) Release ; $ ( LibraryPath ) < / LibraryPath > <nl> - < OutDir > $ ( OutDir ) \ Exe \ < / OutDir > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < LinkIncremental > false < / LinkIncremental > <nl> - < TargetName > arangod64 < / TargetName > <nl> - < LibraryPath > $ ( SolutionDir ) x64 \ Release ; $ ( LibraryPath ) < / LibraryPath > <nl> - < OutDir > $ ( OutDir ) \ Exe \ < / OutDir > <nl> - < / PropertyGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; TRI_MISSING_MEMRCHR = 1 ; FD_SETSIZE = 2048 ; WIN32 ; TRI_BITS = 32 ; _DEBUG ; _CONSOLE ; _WIN32 ; YY_NO_UNISTD_H ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < OmitFramePointers > <nl> - < / OmitFramePointers > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Console < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < AdditionalLibraryDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ lib32 \ ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ lib \ static \ ; $ ( SolutionDir ) Debug ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ lib32 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ lib ; % ( AdditionalLibraryDirectories ) < / AdditionalLibraryDirectories > <nl> - < AdditionalDependencies > WINMM . LIB ; Ws2_32 . lib ; readline . lib ; libeay32d . lib ; ssleay32d . lib ; arango_fe . lib ; arango_v8 . lib ; arango . lib ; regex . lib ; v8_base_MTd . lib ; v8_nosnapshot_MTd . lib ; common_icu32d . lib ; i18n_icu32d . lib ; icudt51_icu32 . lib ; io_icu32d . lib ; layout_icu32d . lib ; layoutex_icu32d . lib ; stubdata_icu32d . lib ; toolutil_icu32d . lib ; zlibstat_MTd . lib ; % ( AdditionalDependencies ) < / AdditionalDependencies > <nl> - < EntryPointSymbol > <nl> - < / EntryPointSymbol > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; TRI_MISSING_MEMRCHR = 1 ; _WIN64 ; TRI_BITS = 64 ; FD_SETSIZE = 2048 ; WIN32 ; _DEBUG ; _CONSOLE ; _WIN32 ; YY_NO_UNISTD_H ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; . . \ . . \ 3rdParty \ VisualStudio \ getopt_mb_uni_vc10 \ src ; . . \ . . \ 3rdParty \ VisualStudio \ regex - 2 . 7 \ src ; . . \ . . \ 3rdParty \ VisualStudio \ readline ; . . \ . . \ arangod ; . . \ . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Console < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < AdditionalLibraryDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ lib64 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ lib \ static ; $ ( SolutionDir ) x64 \ Debug ; % ( AdditionalLibraryDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ lib64 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ lib < / AdditionalLibraryDirectories > <nl> - < AdditionalDependencies > WINMM . LIB ; Ws2_32 . lib ; readline . lib ; libeay64d . lib ; ssleay64d . lib ; arango_fe . lib ; arango_v8 . lib ; arango . lib ; regex . lib ; v8_base_MTd . lib ; v8_nosnapshot_MTd . lib ; common_icu64d . lib ; i18n_icu64d . lib ; icudt51_icu64d . lib ; io_icu64d . lib ; layout_icu64d . lib ; layoutex_icu64d . lib ; stubdata_icu64d . lib ; toolutil_icu64d . lib ; % ( AdditionalDependencies ) ; zlibstat_MTd . lib < / AdditionalDependencies > <nl> - < EntryPointSymbol > <nl> - < / EntryPointSymbol > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; TRI_MISSING_MEMRCHR = 1 ; FD_SETSIZE = 2048 ; WIN32 ; TRI_BITS = 32 ; NDEBUG ; _CONSOLE ; _WIN32 ; YY_NO_UNISTD_H ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; . . \ . . \ arangod ; . . \ . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < CompileAs > Default < / CompileAs > <nl> - < DisableLanguageExtensions > false < / DisableLanguageExtensions > <nl> - < TreatWChar_tAsBuiltInType > true < / TreatWChar_tAsBuiltInType > <nl> - < StructMemberAlignment > Default < / StructMemberAlignment > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Console < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < AdditionalDependencies > crypt32 . lib ; WINMM . LIB ; Ws2_32 . lib ; readline . lib ; libeay32 . lib ; ssleay32 . lib ; arango_fe . lib ; arango_v8 . lib ; arango . lib ; regex . lib ; v8_base . lib ; v8_nosnapshot . lib ; common_icu32 . lib ; i18n_icu32 . lib ; icudt51_icu32 . lib ; io_icu32 . lib ; layout_icu32 . lib ; layoutex_icu32 . lib ; stubdata_icu32 . lib ; toolutil_icu32 . lib ; zlibstat . lib ; % ( AdditionalDependencies ) < / AdditionalDependencies > <nl> - < AdditionalLibraryDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ lib32 \ ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ lib \ static \ ; $ ( SolutionDir ) Release ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ lib32 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ lib ; % ( AdditionalLibraryDirectories ) < / AdditionalLibraryDirectories > <nl> - < ShowProgress > NotSet < / ShowProgress > <nl> - < ImageHasSafeExceptionHandlers > false < / ImageHasSafeExceptionHandlers > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; TRI_MISSING_MEMRCHR = 1 ; _WIN64 ; TRI_BITS = 64 ; FD_SETSIZE = 2048 ; WIN32 ; NDEBUG ; _CONSOLE ; _WIN32 ; YY_NO_UNISTD_H ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; . . \ . . \ 3rdParty \ VisualStudio \ getopt_mb_uni_vc10 \ src ; . . \ . . \ 3rdParty \ VisualStudio \ regex - 2 . 7 \ src ; . . \ . . \ 3rdParty \ VisualStudio \ readline ; . . \ . . \ arangod ; . . \ . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < CompileAs > Default < / CompileAs > <nl> - < DisableLanguageExtensions > false < / DisableLanguageExtensions > <nl> - < TreatWChar_tAsBuiltInType > true < / TreatWChar_tAsBuiltInType > <nl> - < StructMemberAlignment > Default < / StructMemberAlignment > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Console < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < AdditionalDependencies > crypt32 . lib ; WINMM . LIB ; Ws2_32 . lib ; readline . lib ; libeay64 . lib ; ssleay64 . lib ; arango_fe . lib ; arango_v8 . lib ; arango . lib ; regex . lib ; v8_base . lib ; v8_nosnapshot . lib ; common_icu64 . lib ; i18n_icu64 . lib ; icudt51_icu64 . lib ; io_icu64 . lib ; layout_icu64 . lib ; layoutex_icu64 . lib ; stubdata_icu64 . lib ; toolutil_icu64 . lib ; % ( AdditionalDependencies ) ; zlibstat . lib < / AdditionalDependencies > <nl> - < AdditionalLibraryDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ lib64 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ lib \ static ; $ ( SolutionDir ) x64 \ Release ; % ( AdditionalLibraryDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ lib64 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ lib < / AdditionalLibraryDirectories > <nl> - < ShowProgress > NotSet < / ShowProgress > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemGroup > <nl> - < None Include = " ReadMe . txt " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Actions \ actions . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Actions \ RestActionHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - access - optimiser . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - ast - node . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - bind - parameter . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - codegen . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - collections . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - context . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - conversions . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - error . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - explain . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - functions . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - grammar . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - index . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - node . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - optimiser . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - parser - functions . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - parser . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - result . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - scope . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - statement - dump . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - statement - walker . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - statementlist . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - tokens . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - variable . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ BitIndexes \ bitarray . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ BitIndexes \ bitarrayIndex . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ CapConstraint \ cap - constraint . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - handles . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - index . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - list . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - query . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - result . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - wordlist . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ GeoIndex \ geo - index . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ GeoIndex \ GeoIndex . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ HashIndex \ hash - array . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ HashIndex \ hash - index . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ IndexIterators \ index - iterator . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ IndexOperators \ index - operator . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Replication \ ContinuousSyncer . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Replication \ InitialSyncer . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Replication \ replication - static . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Replication \ Syncer . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestHandler \ RestBatchHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestHandler \ RestDocumentHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestHandler \ RestEdgeHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestHandler \ RestImportHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestHandler \ RestReplicationHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestHandler \ RestUploadHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestHandler \ RestVocbaseBaseHandler . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestServer \ arango . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestServer \ ArangoServer . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestServer \ VocbaseContext . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ SkipListsEx \ skiplistEx . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ SkipListsEx \ skiplistExIndex . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ SkipLists \ skiplist . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ SkipLists \ skiplistIndex . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Utils \ DocumentHelper . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ V8Server \ ApplicationV8 . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ V8Server \ v8 - actions . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ V8Server \ v8 - query . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ V8Server \ v8 - vocbase . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ auth . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ barrier . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ cleanup . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ collection . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ compactor . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ datafile . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ document - collection . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ edge - collection . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ general - cursor . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ headers . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ index - garbage - collector . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ index . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ key - generator . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ marker . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ primary - collection . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ replication - applier . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ replication - common . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ replication - dump . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ replication - logger . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ replication - master . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ server . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ synchroniser . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ transaction . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ update - policy . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ voc - shaper . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ vocbase - defaults . c " / > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ vocbase . c " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Actions \ actions . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Actions \ RestActionHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - access - optimiser . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - ast - node . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - bind - parameter . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - codegen . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - collections . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - context . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - conversions . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - error . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - explain . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - functions . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - grammar . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - index . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - node . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - optimiser . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - parser - functions . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - parser . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - result . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - scope . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - statement - dump . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - statement - walker . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - statementlist . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - variable . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ BitIndexes \ bitarray . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ BitIndexes \ bitarrayIndex . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ BitIndexes \ masterblocktable . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ CapConstraint \ cap - constraint . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - common . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - handles . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - index . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - list . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - query . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - result . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - wordlist . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ GeoIndex \ geo - index . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ GeoIndex \ GeoIndex . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ HashIndex \ hash - array . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ HashIndex \ hash - index . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ IndexIterators \ index - iterator . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ IndexOperators \ index - operator . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Replication \ ContinuousSyncer . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Replication \ InitialSyncer . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Replication \ replication - static . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Replication \ Syncer . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestHandler \ RestBatchHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestHandler \ RestDocumentHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestHandler \ RestEdgeHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestHandler \ RestImportHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestHandler \ RestReplicationHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestHandler \ RestUploadHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestHandler \ RestVocbaseBaseHandler . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestServer \ ArangoServer . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestServer \ VocbaseContext . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ SkipListsEx \ compareEx . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ SkipListsEx \ skiplistEx . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ SkipListsEx \ skiplistExIndex . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ SkipLists \ skiplist . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ SkipLists \ skiplistIndex . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ AhuacatlGuard . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ AhuacatlTransaction . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ Barrier . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ CollectionNameResolver . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ DocumentHelper . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ EmbeddableTransaction . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ RestTransactionContext . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ SingleCollectionReadOnlyTransaction . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ SingleCollectionTransaction . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ SingleCollectionWriteTransaction . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ StandaloneTransaction . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ Transaction . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ UserTransaction . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ V8TransactionContext . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ V8Server \ ApplicationV8 . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ V8Server \ v8 - actions . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ V8Server \ v8 - query . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ V8Server \ v8 - vocbase . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ auth . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ barrier . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ cleanup . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ collection . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ compactor . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ datafile . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ durham . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ general - cursor . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ headers . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ index - garbage - collector . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ index . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ key - generator . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ marker . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ primary - collection . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ replication - applier . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ replication - common . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ replication - dump . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ replication - logger . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ replication - master . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ server . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ synchroniser . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ transaction . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ update - policy . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ voc - shaper . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ vocbase - defaults . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ vocbase . h " / > <nl> - < / ItemGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . targets " / > <nl> - < ImportGroup Label = " ExtensionTargets " > <nl> - < / ImportGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arangod Binary / Arangod Binary . vcxproj . filters b / VS2012 / Arangod Binary / Arangod Binary . vcxproj . filters <nl> deleted file mode 100644 <nl> index 02bcec9af63 . . 00000000000 <nl> mmm a / VS2012 / Arangod Binary / Arangod Binary . vcxproj . filters <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup > <nl> - < Filter Include = " Actions Source " > <nl> - < UniqueIdentifier > { 4d0aac9e - c4d6 - 4790 - 9eae - 6aad33978c55 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Actions Header " > <nl> - < UniqueIdentifier > { 9f596846 - dfe9 - 49b0 - 8b57 - 0451c8398502 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Ahuacatl Source " > <nl> - < UniqueIdentifier > { de4b5058 - 06f7 - 4230 - adcd - d6c609f0ee2c } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Ahuacatl Header " > <nl> - < UniqueIdentifier > { d8461072 - d6e5 - 454c - b77f - ea6c4d650fac } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " BitIndexes Source " > <nl> - < UniqueIdentifier > { 40bbef2d - 19c6 - 433a - 9cad - e919cb6dd132 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " BitIndexes Header " > <nl> - < UniqueIdentifier > { 1713e7fc - 574a - 4100 - bbfc - beff7fb49dc3 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " GeoIndex Source " > <nl> - < UniqueIdentifier > { 41fe3a51 - 4a8c - 4a14 - 94cb - 5cbbcf3b2902 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " GeoIndex Header " > <nl> - < UniqueIdentifier > { 4d3a6783 - ec18 - 4c63 - acf6 - f1541fa23363 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " HashIndex Source " > <nl> - < UniqueIdentifier > { d8d44f40 - a4de - 476e - 9683 - 9f5e93a09975 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " HashIndex Header " > <nl> - < UniqueIdentifier > { 88208861 - 586b - 43e0 - 97ec - 29516d6ac060 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " IndexIterators Source " > <nl> - < UniqueIdentifier > { 75063e47 - 2ac3 - 4673 - 9df1 - 4c0be6c20cdd } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " IndexIterators Header " > <nl> - < UniqueIdentifier > { b0dd276d - 71b6 - 4991 - a4b2 - 5524256eb6e5 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " RestHandler Header " > <nl> - < UniqueIdentifier > { bdf04799 - 3349 - 4e2d - 8270 - 9e3b17a27613 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Skiplists Source " > <nl> - < UniqueIdentifier > { 4be54c70 - 3f61 - 43c0 - a86a - 9be4848363e6 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Skiplists Header " > <nl> - < UniqueIdentifier > { 7496affb - e170 - 4df4 - b56a - 4cf2d0172659 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " V8 Server Source " > <nl> - < UniqueIdentifier > { 78374def - 6f2e - 422e - ba99 - e4e408b08ea3 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " V8 Server Header " > <nl> - < UniqueIdentifier > { 5d6b7adc - 29c6 - 4c28 - a2cf - 9558721af375 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " VocBase Source " > <nl> - < UniqueIdentifier > { bd0b65be - ad15 - 4693 - 88cc - 3cc7439187ee } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " VocBase Header " > <nl> - < UniqueIdentifier > { 0399a4bb - bab6 - 408d - 9e4e - fa95c8351742 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " RestServer Source " > <nl> - < UniqueIdentifier > { 1cbcc1af - 46d4 - 479c - 9559 - 5cf9fa704233 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " IndexOperators Source " > <nl> - < UniqueIdentifier > { 49518ff7 - bc0d - 4394 - 97fe - c293a59bf210 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " IndexOperators Header " > <nl> - < UniqueIdentifier > { 795670be - 3298 - 4020 - a0ac - c821be50679e } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " RestServer Header " > <nl> - < UniqueIdentifier > { ffdc7aa7 - dde3 - 4974 - b707 - 8407b0e92965 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Utils Header " > <nl> - < UniqueIdentifier > { e9fb58cc - 8cec - 41be - 94ad - 6ec0870d48fb } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " FulltextIndex Source " > <nl> - < UniqueIdentifier > { a87ac433 - d49c - 4124 - abd8 - 053130d0fe42 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " FulltextIndex Header " > <nl> - < UniqueIdentifier > { 06cc9415 - dcac - 41b9 - bedf - f3b5c2f422a5 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " RestHandler Source " > <nl> - < UniqueIdentifier > { 4d19ad29 - 43da - 4ceb - b550 - a276e9de2ac6 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " SkiplistsEx Header " > <nl> - < UniqueIdentifier > { cc4700ed - c00c - 4ebb - 9475 - 1d54354fcbfa } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " SkiplistsEx Source " > <nl> - < UniqueIdentifier > { 85835a0d - c3d2 - 4442 - b52c - 48379bf40a35 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " CapConstraint Header " > <nl> - < UniqueIdentifier > { d2ec0280 - a1a3 - 4d91 - b1af - f3466b44ca47 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " CapConstraint Source " > <nl> - < UniqueIdentifier > { 73321ff7 - c3c0 - 411c - 9380 - 0e6382bfe7a3 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Utils Source " > <nl> - < UniqueIdentifier > { d51f8945 - ed7a - 4b2b - 9ddf - 8cfd624e27d2 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Replication Header " > <nl> - < UniqueIdentifier > { c81baa0b - 3760 - 4a16 - 8301 - f250f15909e1 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " Replication Source " > <nl> - < UniqueIdentifier > { 884991d3 - c83a - 4763 - aac1 - 841b5980fd4a } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < None Include = " ReadMe . txt " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestServer \ arango . cpp " > <nl> - < Filter > RestServer Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestServer \ ArangoServer . cpp " > <nl> - < Filter > RestServer Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Actions \ actions . cpp " > <nl> - < Filter > Actions Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Actions \ RestActionHandler . cpp " > <nl> - < Filter > Actions Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - access - optimiser . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - ast - node . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - bind - parameter . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - codegen . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - collections . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - context . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - conversions . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - error . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - explain . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - functions . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - grammar . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - index . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - node . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - optimiser . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - parser . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - parser - functions . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - result . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - scope . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - statement - dump . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - statementlist . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - statement - walker . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - tokens . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - variable . c " > <nl> - < Filter > Ahuacatl Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ BitIndexes \ bitarray . c " > <nl> - < Filter > BitIndexes Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ BitIndexes \ bitarrayIndex . c " > <nl> - < Filter > BitIndexes Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ IndexIterators \ index - iterator . c " > <nl> - < Filter > IndexIterators Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ IndexOperators \ index - operator . c " > <nl> - < Filter > IndexOperators Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ SkipLists \ skiplist . c " > <nl> - < Filter > Skiplists Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ SkipLists \ skiplistIndex . c " > <nl> - < Filter > Skiplists Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ V8Server \ ApplicationV8 . cpp " > <nl> - < Filter > V8 Server Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ V8Server \ v8 - actions . cpp " > <nl> - < Filter > V8 Server Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ V8Server \ v8 - query . cpp " > <nl> - < Filter > V8 Server Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ V8Server \ v8 - vocbase . cpp " > <nl> - < Filter > V8 Server Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ auth . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ barrier . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ cleanup . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ collection . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ compactor . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ datafile . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ document - collection . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ general - cursor . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ headers . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ index . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ primary - collection . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ synchroniser . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ vocbase . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ voc - shaper . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ edge - collection . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ transaction . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ key - generator . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - handles . c " > <nl> - < Filter > FulltextIndex Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - wordlist . c " > <nl> - < Filter > FulltextIndex Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - index . c " > <nl> - < Filter > FulltextIndex Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - list . c " > <nl> - < Filter > FulltextIndex Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - query . c " > <nl> - < Filter > FulltextIndex Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - result . c " > <nl> - < Filter > FulltextIndex Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestHandler \ RestBatchHandler . cpp " > <nl> - < Filter > RestHandler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestHandler \ RestDocumentHandler . cpp " > <nl> - < Filter > RestHandler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestHandler \ RestEdgeHandler . cpp " > <nl> - < Filter > RestHandler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestHandler \ RestImportHandler . cpp " > <nl> - < Filter > RestHandler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestHandler \ RestVocbaseBaseHandler . cpp " > <nl> - < Filter > RestHandler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ SkipListsEx \ skiplistEx . c " > <nl> - < Filter > SkiplistsEx Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ SkipListsEx \ skiplistExIndex . c " > <nl> - < Filter > SkiplistsEx Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ CapConstraint \ cap - constraint . c " > <nl> - < Filter > CapConstraint Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ HashIndex \ hash - array . c " > <nl> - < Filter > HashIndex Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ HashIndex \ hash - index . c " > <nl> - < Filter > HashIndex Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ GeoIndex \ geo - index . c " > <nl> - < Filter > GeoIndex Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ GeoIndex \ GeoIndex . c " > <nl> - < Filter > GeoIndex Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ index - garbage - collector . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ marker . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ update - policy . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestHandler \ RestUploadHandler . cpp " > <nl> - < Filter > RestHandler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestServer \ VocbaseContext . cpp " > <nl> - < Filter > RestServer Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Utils \ DocumentHelper . cpp " > <nl> - < Filter > Utils Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ replication - applier . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ replication - common . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ replication - dump . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ replication - logger . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ replication - master . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ RestHandler \ RestReplicationHandler . cpp " > <nl> - < Filter > RestHandler Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Replication \ ContinuousSyncer . cpp " > <nl> - < Filter > Replication Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Replication \ InitialSyncer . cpp " > <nl> - < Filter > Replication Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Replication \ replication - static . cpp " > <nl> - < Filter > Replication Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ Replication \ Syncer . cpp " > <nl> - < Filter > Replication Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ server . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangod \ VocBase \ vocbase - defaults . c " > <nl> - < Filter > VocBase Source < / Filter > <nl> - < / ClCompile > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestServer \ ArangoServer . h " > <nl> - < Filter > RestServer Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Actions \ actions . h " > <nl> - < Filter > Actions Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Actions \ RestActionHandler . h " > <nl> - < Filter > Actions Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - access - optimiser . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - ast - node . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - bind - parameter . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - codegen . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - collections . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - context . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - conversions . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - error . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - explain . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - functions . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - grammar . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - index . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - node . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - optimiser . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - parser . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - parser - functions . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - result . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - scope . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - statement - dump . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - statementlist . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - statement - walker . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Ahuacatl \ ahuacatl - variable . h " > <nl> - < Filter > Ahuacatl Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ BitIndexes \ bitarray . h " > <nl> - < Filter > BitIndexes Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ BitIndexes \ bitarrayIndex . h " > <nl> - < Filter > BitIndexes Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ BitIndexes \ masterblocktable . h " > <nl> - < Filter > BitIndexes Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ IndexIterators \ index - iterator . h " > <nl> - < Filter > IndexIterators Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ IndexOperators \ index - operator . h " > <nl> - < Filter > IndexOperators Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestHandler \ RestBatchHandler . h " > <nl> - < Filter > RestHandler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestHandler \ RestDocumentHandler . h " > <nl> - < Filter > RestHandler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestHandler \ RestEdgeHandler . h " > <nl> - < Filter > RestHandler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestHandler \ RestImportHandler . h " > <nl> - < Filter > RestHandler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestHandler \ RestVocbaseBaseHandler . h " > <nl> - < Filter > RestHandler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ SkipLists \ skiplist . h " > <nl> - < Filter > Skiplists Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ SkipLists \ skiplistIndex . h " > <nl> - < Filter > Skiplists Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ V8Server \ ApplicationV8 . h " > <nl> - < Filter > V8 Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ V8Server \ v8 - actions . h " > <nl> - < Filter > V8 Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ V8Server \ v8 - query . h " > <nl> - < Filter > V8 Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ V8Server \ v8 - vocbase . h " > <nl> - < Filter > V8 Server Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ auth . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ barrier . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ cleanup . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ collection . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ compactor . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ datafile . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ durham . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ general - cursor . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ headers . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ index . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ primary - collection . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ synchroniser . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ vocbase . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ voc - shaper . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ AhuacatlGuard . h " > <nl> - < Filter > Utils Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ Barrier . h " > <nl> - < Filter > Utils Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ DocumentHelper . h " > <nl> - < Filter > Utils Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ EmbeddableTransaction . h " > <nl> - < Filter > Utils Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ RestTransactionContext . h " > <nl> - < Filter > Utils Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ SingleCollectionReadOnlyTransaction . h " > <nl> - < Filter > Utils Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ SingleCollectionTransaction . h " > <nl> - < Filter > Utils Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ SingleCollectionWriteTransaction . h " > <nl> - < Filter > Utils Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ StandaloneTransaction . h " > <nl> - < Filter > Utils Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ Transaction . h " > <nl> - < Filter > Utils Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ UserTransaction . h " > <nl> - < Filter > Utils Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ V8TransactionContext . h " > <nl> - < Filter > Utils Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ transaction . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ key - generator . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ CollectionNameResolver . h " > <nl> - < Filter > Utils Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Utils \ AhuacatlTransaction . h " > <nl> - < Filter > Utils Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - handles . h " > <nl> - < Filter > FulltextIndex Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - wordlist . h " > <nl> - < Filter > FulltextIndex Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - index . h " > <nl> - < Filter > FulltextIndex Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - list . h " > <nl> - < Filter > FulltextIndex Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - query . h " > <nl> - < Filter > FulltextIndex Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - result . h " > <nl> - < Filter > FulltextIndex Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ FulltextIndex \ fulltext - common . h " > <nl> - < Filter > FulltextIndex Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ SkipListsEx \ compareEx . h " > <nl> - < Filter > SkiplistsEx Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ SkipListsEx \ skiplistEx . h " > <nl> - < Filter > SkiplistsEx Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ SkipListsEx \ skiplistExIndex . h " > <nl> - < Filter > SkiplistsEx Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ CapConstraint \ cap - constraint . h " > <nl> - < Filter > CapConstraint Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ HashIndex \ hash - array . h " > <nl> - < Filter > HashIndex Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ HashIndex \ hash - index . h " > <nl> - < Filter > HashIndex Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ GeoIndex \ geo - index . h " > <nl> - < Filter > GeoIndex Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ GeoIndex \ GeoIndex . h " > <nl> - < Filter > GeoIndex Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ index - garbage - collector . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ marker . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ update - policy . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestHandler \ RestUploadHandler . h " > <nl> - < Filter > RestHandler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestServer \ VocbaseContext . h " > <nl> - < Filter > RestServer Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ replication - applier . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ replication - common . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ replication - dump . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ replication - logger . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ replication - master . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ RestHandler \ RestReplicationHandler . h " > <nl> - < Filter > RestHandler Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Replication \ ContinuousSyncer . h " > <nl> - < Filter > Replication Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Replication \ InitialSyncer . h " > <nl> - < Filter > Replication Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Replication \ replication - static . h " > <nl> - < Filter > Replication Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ Replication \ Syncer . h " > <nl> - < Filter > Replication Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ server . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangod \ VocBase \ vocbase - defaults . h " > <nl> - < Filter > VocBase Header < / Filter > <nl> - < / ClInclude > <nl> - < / ItemGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arangod Binary / Arangod Binary . vcxproj . user b / VS2012 / Arangod Binary / Arangod Binary . vcxproj . user <nl> deleted file mode 100644 <nl> index 33b92bfbb45 . . 00000000000 <nl> mmm a / VS2012 / Arangod Binary / Arangod Binary . vcxproj . user <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < LocalDebuggerCommandArguments > - - server . endpoint tcp : / / 127 . 0 . 0 . 1 : 9000 - - database . directory " c : \ local2 \ learning \ c + + \ vc + + \ data2 " - - server . disable - authentication true - - server . disable - admin - interface true - - log . level info - - javascript . action - directory " Z : \ local2 \ arango \ dev \ js \ actions \ system " - - javascript . modules - path " Z : \ local2 \ arango \ dev \ js \ server \ modules ; Z : \ local2 \ arango \ dev \ js \ common \ modules " < / LocalDebuggerCommandArguments > <nl> - < DebuggerFlavor > WindowsLocalDebugger < / DebuggerFlavor > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < LocalDebuggerCommandArguments > - - server . endpoint tcp : / / 127 . 0 . 0 . 1 : 8529 - - database . directory " c : \ local2 \ arango - triagens \ 1 . 2 \ data2 " - - server . disable - authentication true - - log . level info - - log . severity human - - javascript . startup - directory " z : \ local2 \ arango \ 1 . 2 \ js " - - javascript . action - directory " z : \ local2 \ arango \ 1 . 2 \ js \ actions \ system " - - javascript . modules - path " z : \ local2 \ arango \ 1 . 2 \ js \ server \ modules ; z : \ local2 \ arango \ 1 . 2 \ js \ common \ modules " - - server . threads 1 - - server . admin - directory " z : \ local2 \ arango \ 1 . 2 \ html \ admin " - - server . disable - admin - interface false - - scheduler . threads 1 - - database . maximal - journal - size 1048576 < / LocalDebuggerCommandArguments > <nl> - < DebuggerFlavor > WindowsLocalDebugger < / DebuggerFlavor > <nl> - < LocalDebuggerWorkingDirectory > $ ( TargetDir ) < / LocalDebuggerWorkingDirectory > <nl> - < LocalDebuggerDebuggerType > Auto < / LocalDebuggerDebuggerType > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < LocalDebuggerCommandArguments > - - javascript . startup - directory $ ( SolutionDir ) . . \ js - - log . level info - - database . directory " c : \ local2 \ arango - triagens \ dev \ data2 " - - server . disable - admin - interface true - - javascript . action - directory " $ ( SolutionDir ) . . \ js \ actions \ system " - - javascript . modules - path " $ ( SolutionDir ) . . \ js \ server \ modules ; $ ( SolutionDir ) . . \ js \ common \ modules " - - server . threads 1 - - scheduler . threads 1 - - server . endpoint tcp : / / 127 . 0 . 0 . 1 : 8529 - - server . disable - authentication true < / LocalDebuggerCommandArguments > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < LocalDebuggerWorkingDirectory > $ ( TargetDir ) < / LocalDebuggerWorkingDirectory > <nl> - < DebuggerFlavor > WindowsLocalDebugger < / DebuggerFlavor > <nl> - < / PropertyGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arangoimp Binary / Arangoimp Binary . vcxproj b / VS2012 / Arangoimp Binary / Arangoimp Binary . vcxproj <nl> deleted file mode 100644 <nl> index d3fa65afbe1 . . 00000000000 <nl> mmm a / VS2012 / Arangoimp Binary / Arangoimp Binary . vcxproj <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project DefaultTargets = " Build " ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup Label = " ProjectConfigurations " > <nl> - < ProjectConfiguration Include = " Debug | Win32 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Debug | x64 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | Win32 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | x64 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < / ItemGroup > <nl> - < PropertyGroup Label = " Globals " > <nl> - < ProjectGuid > { 4C3903F3 - 396E - 489F - 954A - 75399C64BE92 } < / ProjectGuid > <nl> - < Keyword > Win32Proj < / Keyword > <nl> - < RootNamespace > ArangoimpBinary < / RootNamespace > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . Default . props " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > Application < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > Application < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > Application < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > Application < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . props " / > <nl> - < ImportGroup Label = " ExtensionSettings " > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < PropertyGroup Label = " UserMacros " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < LinkIncremental > false < / LinkIncremental > <nl> - < OutDir > c : \ local2 \ arango - triagens \ dev \ < / OutDir > <nl> - < TargetName > arangoimp32d < / TargetName > <nl> - < LibraryPath > $ ( SolutionDir ) Debug ; $ ( LibraryPath ) < / LibraryPath > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < LinkIncremental > false < / LinkIncremental > <nl> - < OutDir > c : \ local2 \ arango - triagens \ dev \ < / OutDir > <nl> - < TargetName > arangoimp64d < / TargetName > <nl> - < LibraryPath > $ ( SolutionDir ) x64 \ Debug ; $ ( LibraryPath ) < / LibraryPath > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < LinkIncremental > false < / LinkIncremental > <nl> - < OutDir > $ ( OutDir ) \ Exe \ < / OutDir > <nl> - < TargetName > arangoimp32 < / TargetName > <nl> - < LibraryPath > $ ( SolutionDir ) Release ; $ ( LibraryPath ) < / LibraryPath > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < LinkIncremental > false < / LinkIncremental > <nl> - < OutDir > $ ( OutDir ) \ Exe \ < / OutDir > <nl> - < TargetName > arangoimp64 < / TargetName > <nl> - < LibraryPath > $ ( SolutionDir ) x64 \ Release ; $ ( LibraryPath ) < / LibraryPath > <nl> - < / PropertyGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; WIN32 ; TRI_BITS = 32 ; _DEBUG ; _CONSOLE ; _WIN32 ; YY_NO_UNISTD_H ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; TRI_MISSING_MEMRCHR = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ arangosh ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < OmitFramePointers > <nl> - < / OmitFramePointers > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Console < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < AdditionalLibraryDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ lib32 \ ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ lib \ static \ ; $ ( SolutionDir ) Debug ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ lib32 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ lib ; % ( AdditionalLibraryDirectories ) < / AdditionalLibraryDirectories > <nl> - < AdditionalDependencies > WINMM . LIB ; Ws2_32 . lib ; readline . lib ; libeay32d . lib ; ssleay32d . lib ; arango_client . lib ; arango_v8 . lib ; arango . lib ; regex . lib ; v8_base_MTd . lib ; v8_nosnapshot_MTd . lib ; common_icu32d . lib ; i18n_icu32d . lib ; icudt51_icu32d . lib ; io_icu32d . lib ; layout_icu32d . lib ; layoutex_icu32d . lib ; stubdata_icu32d . lib ; toolutil_icu32d . lib ; zlibstat_MTd . lib ; % ( AdditionalDependencies ) < / AdditionalDependencies > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; TRI_BITS = 64 ; FD_SETSIZE = 2048 ; WIN32 ; _DEBUG ; _CONSOLE ; _WIN32 ; YY_NO_UNISTD_H ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; TRI_MISSING_MEMRCHR = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ arangosh ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < OmitFramePointers > <nl> - < / OmitFramePointers > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Console < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < AdditionalLibraryDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ lib64 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ lib \ static ; $ ( SolutionDir ) x64 \ Debug ; % ( AdditionalLibraryDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ lib64 ; $ ( solutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ lib < / AdditionalLibraryDirectories > <nl> - < AdditionalDependencies > WINMM . LIB ; Ws2_32 . lib ; readline . lib ; libeay64d . lib ; ssleay64d . lib ; arango_client . lib ; arango_v8 . lib ; arango . lib ; regex . lib ; v8_base_MTd . lib ; v8_nosnapshot_MTd . lib ; common_icu64d . lib ; i18n_icu64d . lib ; icudt51_icu64 . lib ; io_icu64d . lib ; layout_icu64d . lib ; layoutex_icu64d . lib ; stubdata_icu64d . lib ; toolutil_icu64d . lib ; % ( AdditionalDependencies ) ; zlibstat_MTd . lib < / AdditionalDependencies > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; WIN32 ; TRI_BITS = 32 ; NDEBUG ; _CONSOLE ; _WIN32 ; YY_NO_UNISTD_H ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; TRI_MISSING_MEMRCHR = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ arangosh ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; . . \ . . \ arangod ; . . \ . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Console < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < AdditionalLibraryDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ lib32 \ ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ lib \ static \ ; $ ( SolutionDir ) Release ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ lib32 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ lib ; % ( AdditionalLibraryDirectories ) < / AdditionalLibraryDirectories > <nl> - < AdditionalDependencies > crypt32 . lib ; WINMM . LIB ; Ws2_32 . lib ; readline . lib ; libeay32 . lib ; ssleay32 . lib ; arango_client . lib ; arango_v8 . lib ; arango . lib ; regex . lib ; v8_base . lib ; v8_nosnapshot . lib ; common_icu32 . lib ; i18n_icu32 . lib ; icudt51_icu32 . lib ; io_icu32 . lib ; layout_icu32 . lib ; layoutex_icu32 . lib ; stubdata_icu32 . lib ; toolutil_icu32 . lib ; zlibstat . lib ; % ( AdditionalDependencies ) < / AdditionalDependencies > <nl> - < ImageHasSafeExceptionHandlers > false < / ImageHasSafeExceptionHandlers > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; TRI_BITS = 64 ; TRI_MISSING_MEMRCHR = 1 ; _WIN64 ; FD_SETSIZE = 2048 ; WIN32 ; NDEBUG ; _CONSOLE ; _WIN32 ; YY_NO_UNISTD_H ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ arangosh ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; . . \ . . \ arangod ; . . \ . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Console < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < AdditionalLibraryDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ lib64 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ lib \ static ; $ ( SolutionDir ) x64 \ Release ; % ( AdditionalLibraryDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ lib64 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ lib < / AdditionalLibraryDirectories > <nl> - < AdditionalDependencies > crypt32 . lib ; WINMM . LIB ; Ws2_32 . lib ; readline . lib ; arango_client . lib ; arango_v8 . lib ; arango . lib ; regex . lib ; % ( AdditionalDependencies ) ; v8_base . lib ; v8_nosnapshot . lib ; common_icu64 . lib ; i18n_icu64 . lib ; icudt51_icu64 . lib ; io_icu64 . lib ; layout_icu64 . lib ; layoutex_icu64 . lib ; stubdata_icu64 . lib ; toolutil_icu64 . lib ; zlibstat . lib ; libeay64 . lib ; ssleay64 . lib < / AdditionalDependencies > <nl> - < IgnoreAllDefaultLibraries > <nl> - < / IgnoreAllDefaultLibraries > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ ArangoShell \ ArangoClient . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ V8Client \ arangoimp . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ V8Client \ ImportHelper . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ V8Client \ V8ClientConnection . cpp " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ arangosh \ ArangoShell \ ArangoClient . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangosh \ V8Client \ ImportHelper . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangosh \ V8Client \ V8ClientConnection . h " / > <nl> - < / ItemGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . targets " / > <nl> - < ImportGroup Label = " ExtensionTargets " > <nl> - < / ImportGroup > <nl> - < / Project > <nl> diff - - git a / VS2012 / Arangoimp Binary / Arangoimp Binary . vcxproj . filters b / VS2012 / Arangoimp Binary / Arangoimp Binary . vcxproj . filters <nl> deleted file mode 100644 <nl> index fdacac026f6 . . 00000000000 <nl> mmm a / VS2012 / Arangoimp Binary / Arangoimp Binary . vcxproj . filters <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup > <nl> - < Filter Include = " ArangoShellHeader " > <nl> - < UniqueIdentifier > { 64b1519d - 7bd3 - 435f - 9ca0 - 01a3bcd1d9e1 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " ArangoShellSource " > <nl> - < UniqueIdentifier > { d45abe7c - a118 - 42e2 - b65a - 051c6f3c3d93 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " V8ClientHeader " > <nl> - < UniqueIdentifier > { 5bb83475 - 9254 - 4ec4 - be3b - b2f50c5863bc } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " V8ClientSource " > <nl> - < UniqueIdentifier > { 3866748e - 56e4 - 49fa - 883f - 1e533a2da63c } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ V8Client \ ImportHelper . cpp " > <nl> - < Filter > V8ClientSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ V8Client \ V8ClientConnection . cpp " > <nl> - < Filter > V8ClientSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ V8Client \ arangoimp . cpp " > <nl> - < Filter > V8ClientSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ ArangoShell \ ArangoClient . cpp " > <nl> - < Filter > ArangoShellSource < / Filter > <nl> - < / ClCompile > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ arangosh \ V8Client \ ImportHelper . h " > <nl> - < Filter > V8ClientHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangosh \ V8Client \ V8ClientConnection . h " > <nl> - < Filter > V8ClientHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangosh \ ArangoShell \ ArangoClient . h " > <nl> - < Filter > ArangoShellHeader < / Filter > <nl> - < / ClInclude > <nl> - < / ItemGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arangoimp Binary / Arangoimp Binary . vcxproj . user b / VS2012 / Arangoimp Binary / Arangoimp Binary . vcxproj . user <nl> deleted file mode 100644 <nl> index 695b5c78b91 . . 00000000000 <nl> mmm a / VS2012 / Arangoimp Binary / Arangoimp Binary . vcxproj . user <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arangosh Binary / Arangosh Binary . vcxproj b / VS2012 / Arangosh Binary / Arangosh Binary . vcxproj <nl> deleted file mode 100644 <nl> index acb796b1627 . . 00000000000 <nl> mmm a / VS2012 / Arangosh Binary / Arangosh Binary . vcxproj <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project DefaultTargets = " Build " ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup Label = " ProjectConfigurations " > <nl> - < ProjectConfiguration Include = " Debug | Win32 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Debug | x64 " > <nl> - < Configuration > Debug < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | Win32 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > Win32 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < ProjectConfiguration Include = " Release | x64 " > <nl> - < Configuration > Release < / Configuration > <nl> - < Platform > x64 < / Platform > <nl> - < / ProjectConfiguration > <nl> - < / ItemGroup > <nl> - < PropertyGroup Label = " Globals " > <nl> - < ProjectGuid > { 6BB0D86C - 8221 - 474C - A004 - A5CCD1F0AB86 } < / ProjectGuid > <nl> - < Keyword > Win32Proj < / Keyword > <nl> - < RootNamespace > ArangoshBinary < / RootNamespace > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . Default . props " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > Application < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > Application < / ConfigurationType > <nl> - < UseDebugLibraries > true < / UseDebugLibraries > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " Label = " Configuration " > <nl> - < ConfigurationType > Application < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " Configuration " > <nl> - < ConfigurationType > Application < / ConfigurationType > <nl> - < UseDebugLibraries > false < / UseDebugLibraries > <nl> - < WholeProgramOptimization > true < / WholeProgramOptimization > <nl> - < CharacterSet > Unicode < / CharacterSet > <nl> - < PlatformToolset > v110 < / PlatformToolset > <nl> - < / PropertyGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . props " / > <nl> - < ImportGroup Label = " ExtensionSettings " > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Label = " PropertySheets " Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < ImportGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " Label = " PropertySheets " > <nl> - < Import Project = " $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props " Condition = " exists ( ' $ ( UserRootDir ) \ Microsoft . Cpp . $ ( Platform ) . user . props ' ) " Label = " LocalAppDataPlatform " / > <nl> - < / ImportGroup > <nl> - < PropertyGroup Label = " UserMacros " / > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < LinkIncremental > false < / LinkIncremental > <nl> - < OutDir > c : \ local2 \ arango - triagens \ dev \ < / OutDir > <nl> - < TargetName > arangosh32d < / TargetName > <nl> - < LibraryPath > $ ( SolutionDir ) Debug ; $ ( LibraryPath ) < / LibraryPath > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < LinkIncremental > false < / LinkIncremental > <nl> - < OutDir > c : \ local2 \ arango - triagens \ dev \ < / OutDir > <nl> - < TargetName > arangosh64d < / TargetName > <nl> - < LibraryPath > $ ( SolutionDir ) x64 \ Debug ; $ ( LibraryPath ) < / LibraryPath > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < LinkIncremental > false < / LinkIncremental > <nl> - < OutDir > $ ( OutDir ) \ Exe \ < / OutDir > <nl> - < TargetName > arangosh32 < / TargetName > <nl> - < LibraryPath > $ ( SolutionDir ) Release ; $ ( LibraryPath ) < / LibraryPath > <nl> - < / PropertyGroup > <nl> - < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < LinkIncremental > false < / LinkIncremental > <nl> - < OutDir > $ ( OutDir ) \ Exe \ < / OutDir > <nl> - < TargetName > arangosh64 < / TargetName > <nl> - < LibraryPath > $ ( SolutionDir ) x64 \ Release ; $ ( LibraryPath ) < / LibraryPath > <nl> - < / PropertyGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | Win32 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; WIN32 ; TRI_BITS = 32 ; _DEBUG ; _CONSOLE ; _WIN32 ; YY_NO_UNISTD_H ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; TRI_MISSING_MEMRCHR = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ icu \ include ; $ ( SolutionDir ) . . \ arangosh ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ zlib \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ zlib \ include < / AdditionalIncludeDirectories > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < OmitFramePointers > <nl> - < / OmitFramePointers > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Console < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < AdditionalLibraryDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ lib32 \ ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ lib \ static \ ; $ ( SolutionDir ) Debug ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ lib ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ lib32 ; % ( AdditionalLibraryDirectories ) < / AdditionalLibraryDirectories > <nl> - < AdditionalDependencies > WINMM . LIB ; Ws2_32 . lib ; readline . lib ; libeay32d . lib ; ssleay32d . lib ; arango_client . lib ; arango_v8 . lib ; arango . lib ; regex . lib ; v8_base_MTd . lib ; v8_nosnapshot_MTd . lib ; common_icu32d . lib ; i18n_icu32d . lib ; icudt51_icu32d . lib ; io_icu32d . lib ; layout_icu32d . lib ; layoutex_icu32d . lib ; stubdata_icu32d . lib ; toolutil_icu32d . lib ; zlibstat_MTd . lib ; % ( AdditionalDependencies ) < / AdditionalDependencies > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | x64 ' " > <nl> - < ClCompile > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; TRI_BITS = 64 ; FD_SETSIZE = 2048 ; WIN32 ; _DEBUG ; _CONSOLE ; _WIN32 ; YY_NO_UNISTD_H ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; TRI_MISSING_MEMRCHR = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ icu \ include ; $ ( SolutionDir ) . . \ arangosh ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ zlib \ include < / AdditionalIncludeDirectories > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < MinimalRebuild > false < / MinimalRebuild > <nl> - < RuntimeLibrary > MultiThreadedDebug < / RuntimeLibrary > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < BasicRuntimeChecks > Default < / BasicRuntimeChecks > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Console < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < AdditionalLibraryDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ lib64 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ lib \ static ; $ ( SolutionDir ) x64 \ Debug ; % ( AdditionalLibraryDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ lib64 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ lib < / AdditionalLibraryDirectories > <nl> - < AdditionalDependencies > WINMM . LIB ; Ws2_32 . lib ; readline . lib ; libeay64d . lib ; ssleay64d . lib ; arango_client . lib ; arango_v8 . lib ; arango . lib ; regex . lib ; v8_base_MTd . lib ; v8_nosnapshot_MTd . lib ; common_icu64d . lib ; i18n_icu64d . lib ; icudt51_icu64 . lib ; io_icu64d . lib ; layout_icu64d . lib ; layoutex_icu64d . lib ; stubdata_icu64d . lib ; toolutil_icu64d . lib ; % ( AdditionalDependencies ) ; zlibstat_MTd . lib < / AdditionalDependencies > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; FD_SETSIZE = 2048 ; WIN32 ; TRI_BITS = 32 ; NDEBUG ; _CONSOLE ; _WIN32 ; YY_NO_UNISTD_H ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; TRI_MISSING_MEMRCHR = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ include ; $ ( SolutionDir ) . . \ arangosh ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; . . \ . . \ arangod ; . . \ . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Console < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < AdditionalLibraryDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ lib32 \ ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x86 \ lib \ static \ ; $ ( SolutionDir ) Release ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ lib32 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ lib ; % ( AdditionalLibraryDirectories ) < / AdditionalLibraryDirectories > <nl> - < AdditionalDependencies > crypt32 . lib ; WINMM . LIB ; Ws2_32 . lib ; readline . lib ; libeay32 . lib ; ssleay32 . lib ; arango_client . lib ; arango_v8 . lib ; arango . lib ; regex . lib ; v8_base . lib ; v8_nosnapshot . lib ; common_icu32 . lib ; i18n_icu32 . lib ; icudt51_icu32 . lib ; io_icu32 . lib ; layout_icu32 . lib ; layoutex_icu32 . lib ; stubdata_icu32 . lib ; toolutil_icu32 . lib ; zlibstat . lib ; % ( AdditionalDependencies ) < / AdditionalDependencies > <nl> - < ImageHasSafeExceptionHandlers > false < / ImageHasSafeExceptionHandlers > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemDefinitionGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | x64 ' " > <nl> - < ClCompile > <nl> - < WarningLevel > Level3 < / WarningLevel > <nl> - < PrecompiledHeader > <nl> - < / PrecompiledHeader > <nl> - < Optimization > MaxSpeed < / Optimization > <nl> - < FunctionLevelLinking > true < / FunctionLevelLinking > <nl> - < IntrinsicFunctions > true < / IntrinsicFunctions > <nl> - < PreprocessorDefinitions > _ALLOW_KEYWORD_MACROS = 1 ; TRI_HAVE_ICU = 1 ; U_STATIC_IMPLEMENTATION = 1 ; _CRT_SECURE_NO_WARNINGS = 1 ; _WIN64 ; TRI_BITS = 64 ; FD_SETSIZE = 2048 ; WIN32 ; NDEBUG ; _CONSOLE ; _WIN32 ; YY_NO_UNISTD_H ; USE_READLINE_STATIC = 1 ; USE_REGEX_STATIC = 1 ; TRI_MISSING_MEMRCHR = 1 ; % ( PreprocessorDefinitions ) < / PreprocessorDefinitions > <nl> - < AdditionalIncludeDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ icu \ include ; $ ( SolutionDir ) . . \ arangosh ; $ ( SolutionDir ) . . \ lib ; $ ( SolutionDir ) . . ; % ( AdditionalIncludeDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ openssl \ x86 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ mygetopt ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ regex \ src ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ readline ; $ ( SolutionDir ) . . \ arangod ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ V8 \ include ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ include < / AdditionalIncludeDirectories > <nl> - < DebugInformationFormat > OldStyle < / DebugInformationFormat > <nl> - < RuntimeLibrary > MultiThreaded < / RuntimeLibrary > <nl> - < BufferSecurityCheck > false < / BufferSecurityCheck > <nl> - < MultiProcessorCompilation > true < / MultiProcessorCompilation > <nl> - < / ClCompile > <nl> - < Link > <nl> - < SubSystem > Console < / SubSystem > <nl> - < GenerateDebugInformation > true < / GenerateDebugInformation > <nl> - < EnableCOMDATFolding > true < / EnableCOMDATFolding > <nl> - < OptimizeReferences > true < / OptimizeReferences > <nl> - < AdditionalLibraryDirectories > $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - V8 \ lib64 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - openssl \ x64 \ lib \ static ; $ ( SolutionDir ) x64 \ Release ; % ( AdditionalLibraryDirectories ) ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - zlib \ 1 . 2 . 7 \ lib64 ; $ ( SolutionDir ) . . \ 3rdParty \ VisualStudio \ 2012 - icu \ lib < / AdditionalLibraryDirectories > <nl> - < AdditionalDependencies > crypt32 . lib ; WINMM . LIB ; Ws2_32 . lib ; readline . lib ; libeay64 . lib ; ssleay64 . lib ; arango_client . lib ; arango_v8 . lib ; arango . lib ; regex . lib ; v8_base . lib ; v8_nosnapshot . lib ; common_icu64 . lib ; i18n_icu64 . lib ; icudt51_icu64 . lib ; io_icu64 . lib ; layout_icu64 . lib ; layoutex_icu64 . lib ; stubdata_icu64 . lib ; toolutil_icu64 . lib ; % ( AdditionalDependencies ) ; zlibstat . lib < / AdditionalDependencies > <nl> - < / Link > <nl> - < / ItemDefinitionGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ ArangoShell \ ArangoClient . cpp " > <nl> - < DebugInformationFormat Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | Win32 ' " > OldStyle < / DebugInformationFormat > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ V8Client \ arangosh . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ V8Client \ ImportHelper . cpp " / > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ V8Client \ V8ClientConnection . cpp " / > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ arangosh \ ArangoShell \ ArangoClient . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangosh \ V8Client \ ImportHelper . h " / > <nl> - < ClInclude Include = " . . \ . . \ arangosh \ V8Client \ V8ClientConnection . h " / > <nl> - < / ItemGroup > <nl> - < Import Project = " $ ( VCTargetsPath ) \ Microsoft . Cpp . targets " / > <nl> - < ImportGroup Label = " ExtensionTargets " > <nl> - < / ImportGroup > <nl> - < / Project > <nl> diff - - git a / VS2012 / Arangosh Binary / Arangosh Binary . vcxproj . filters b / VS2012 / Arangosh Binary / Arangosh Binary . vcxproj . filters <nl> deleted file mode 100644 <nl> index 14a307af978 . . 00000000000 <nl> mmm a / VS2012 / Arangosh Binary / Arangosh Binary . vcxproj . filters <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < ItemGroup > <nl> - < Filter Include = " ArangoShellSource " > <nl> - < UniqueIdentifier > { 6ed4cf69 - 2353 - 499e - 9977 - 9c260f3f4f60 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " ArangoShellHeader " > <nl> - < UniqueIdentifier > { c8fc4b54 - 044e - 4f0c - 8c5e - 66f0f606b888 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " V8ClientHeader " > <nl> - < UniqueIdentifier > { 9ee9f8f3 - f4ab - 4a8e - bd97 - 83ecb429f655 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < Filter Include = " V8ClientSource " > <nl> - < UniqueIdentifier > { 5fe376e5 - e19a - 4858 - a2a1 - 36781dfc2578 } < / UniqueIdentifier > <nl> - < / Filter > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ ArangoShell \ ArangoClient . cpp " > <nl> - < Filter > ArangoShellSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ V8Client \ ImportHelper . cpp " > <nl> - < Filter > V8ClientSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ V8Client \ V8ClientConnection . cpp " > <nl> - < Filter > V8ClientSource < / Filter > <nl> - < / ClCompile > <nl> - < ClCompile Include = " . . \ . . \ arangosh \ V8Client \ arangosh . cpp " > <nl> - < Filter > V8ClientSource < / Filter > <nl> - < / ClCompile > <nl> - < / ItemGroup > <nl> - < ItemGroup > <nl> - < ClInclude Include = " . . \ . . \ arangosh \ ArangoShell \ ArangoClient . h " > <nl> - < Filter > ArangoShellHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangosh \ V8Client \ ImportHelper . h " > <nl> - < Filter > V8ClientHeader < / Filter > <nl> - < / ClInclude > <nl> - < ClInclude Include = " . . \ . . \ arangosh \ V8Client \ V8ClientConnection . h " > <nl> - < Filter > V8ClientHeader < / Filter > <nl> - < / ClInclude > <nl> - < / ItemGroup > <nl> - < / Project > <nl> \ No newline at end of file <nl> diff - - git a / VS2012 / Arangosh Binary / Arangosh Binary . vcxproj . user b / VS2012 / Arangosh Binary / Arangosh Binary . vcxproj . user <nl> deleted file mode 100644 <nl> index 695b5c78b91 . . 00000000000 <nl> mmm a / VS2012 / Arangosh Binary / Arangosh Binary . vcxproj . user <nl> ppp / dev / null <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < Project ToolsVersion = " 4 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> - < / Project > <nl> \ No newline at end of file <nl> deleted file mode 100755 <nl> index 47c2bcbd95a . . 00000000000 <nl> mmm a / VS2012 / Installer / arango32 . xml <nl> ppp / dev / null <nl> <nl> - < ? xml version = ' 1 . 0 ' encoding = ' windows - 1252 ' ? > <nl> - < Wix xmlns = " http : / / wixtoolset . org / schemas / wxs " > <nl> - <nl> - < Product Name = ' triAGENS ArangoDB Server 32 Bit ' <nl> - Id = ' { A7363040 - 5D54 - 4C08 - B777 - 0119BCD0E15E } ' <nl> - UpgradeCode = ' { D7363040 - 5D54 - 4C08 - B777 - 0119BCD0E15E } ' <nl> - Language = ' 1033 ' <nl> - Version = ' 1 . 1 . 0 . 0 ' <nl> - Manufacturer = ' triAGENS ' > <nl> - <nl> - < Package Id = ' * ' InstallerVersion = ' 200 ' Compressed = ' yes ' / > <nl> - <nl> - < Media Id = ' 1 ' Cabinet = ' arango . cab ' EmbedCab = ' yes ' / > <nl> - <nl> - < Property Id = " WIXUI_DONTVALIDATEPATH " Value = " 1 " / > <nl> - <nl> - < Directory Id = ' TARGETDIR ' Name = ' SourceDir ' > <nl> - < Directory Id = ' ProgramFilesFolder ' > <nl> - < Directory Id = " IISROOT " Name = " . " > <nl> - < Directory Id = ' INSTALLDIR ' Name = ' triAGENS ' > <nl> - <nl> - < Directory Id = ' js_dir ' Name = ' js ' / > <nl> - <nl> - < Component Id = ' MainExecutable ' Guid = ' { D7363040 - 5D54 - 4C08 - B777 - 0119BCD0E15E } ' > <nl> - < File Id = ' arangodEXE ' Name = ' arangod . exe ' Source = ' arangod32 . exe ' Vital = ' yes ' / > <nl> - < File Id = ' arangoShellEXE ' Name = ' arangosh . exe ' Source = ' arangosh32 . exe ' Vital = ' yes ' / > <nl> - < File Id = ' arangodImportEXE ' Name = ' arangoimp . exe ' Source = ' arangoimp32 . exe ' Vital = ' yes ' / > <nl> - < File Id = ' arangodRestoreEXE ' Name = ' arangorestore . exe ' Source = ' arangorestore32 . exe ' Vital = ' yes ' / > <nl> - < File Id = ' arangodDumpEXE ' Name = ' arangodump . exe ' Source = ' arangodump32 . exe ' Vital = ' yes ' / > <nl> - < File Id = ' arangodBenchEXE ' Name = ' arangob . exe ' Source = ' arangob32 . exe ' Vital = ' yes ' / > <nl> - < File Id = ' checkserverEXE ' Name = ' checkserver . exe ' Source = ' checkserver32 . exe ' Vital = ' yes ' / > <nl> - <nl> - < File Id = ' arangodConf ' Name = ' arangod . conf ' Source = ' arangod . conf ' Vital = ' yes ' / > <nl> - < File Id = ' arangoShellConf ' Name = ' arangosh . conf ' Source = ' arangosh . conf ' Vital = ' yes ' / > <nl> - < File Id = ' arangoImportConf ' Name = ' arangoimp . conf ' Source = ' arangoimp . conf ' Vital = ' yes ' / > <nl> - < File Id = ' arangoRestoreConf ' Name = ' arangorestore . conf ' Source = ' arangorestore . conf ' Vital = ' yes ' / > <nl> - < File Id = ' arangoDumpConf ' Name = ' arangodump . conf ' Source = ' arangodump . conf ' Vital = ' yes ' / > <nl> - < File Id = ' arangoBenchConf ' Name = ' arangob . conf ' Source = ' arangob . conf ' Vital = ' yes ' / > <nl> - <nl> - < File Id = ' arangodICO ' Name = ' arangod . ico ' Source = ' arango . ico ' Vital = ' yes ' / > <nl> - < File Id = ' arangodReadme ' Name = ' readme . txt ' Source = ' readme . txt ' Vital = ' yes ' / > <nl> - < File Id = ' serverPem ' Name = ' server . pem ' Source = ' server . pem ' Vital = ' yes ' / > <nl> - <nl> - < File Id = ' arangodServerSample ' Name = ' arangod . bat ' Source = ' arangod . bat ' Vital = ' yes ' / > <nl> - < File Id = ' arangodConsoleSample ' Name = ' console . bat ' Source = ' console . bat ' Vital = ' yes ' / > <nl> - < File Id = ' arangodUpgradeSample ' Name = ' upgrade . bat ' Source = ' upgrade . bat ' Vital = ' yes ' / > <nl> - < File Id = ' arangodFoxxManagerSample ' Name = ' foxx - manager . bat ' Source = ' foxx - manager . bat ' Vital = ' yes ' / > <nl> - < File Id = ' arangoShellSample ' Name = ' arangosh . bat ' Source = ' arangosh . bat ' Vital = ' yes ' / > <nl> - <nl> - < RemoveFolder Id = " INSTALLDIR " On = " uninstall " / > <nl> - < / Component > <nl> - <nl> - <nl> - < / Directory > <nl> - <nl> - <nl> - < / Directory > <nl> - <nl> - < / Directory > <nl> - <nl> - < / Directory > <nl> - <nl> - < Feature Id = ' Complete ' Level = " 1 " > <nl> - < ComponentRef Id = ' MainExecutable ' / > <nl> - < ComponentGroupRef Id = ' jsDirectory ' / > <nl> - < / Feature > <nl> - <nl> - < Icon Id = " arango . ico " SourceFile = " arango . ico " / > <nl> - <nl> - < Property Id = " WIXUI_INSTALLDIR " Value = " INSTALLDIR " / > <nl> - < UIRef Id = " WixUI_InstallDir " / > <nl> - < Property Id = " WIXUI_EXITDIALOGOPTIONALTEXT " Value = " Thank you for installing ArangoDB . Please read the readme . txt file in the installation directory which gives sample batch files for starting the server . " / > <nl> - < WixVariable Id = " WixUILicenseRtf " Value = " arangod . rtf " / > <nl> - < WixVariable Id = " WixUIDialogBmp " Value = " arango2 . bmp " / > <nl> - < / Product > <nl> - <nl> - <nl> - < / Wix > <nl> deleted file mode 100755 <nl> index 84577aaca93 . . 00000000000 <nl> mmm a / VS2012 / Installer / arango64 . xml <nl> ppp / dev / null <nl> <nl> - < ? xml version = ' 1 . 0 ' encoding = ' windows - 1252 ' ? > <nl> - < Wix xmlns = " http : / / wixtoolset . org / schemas / wxs " > <nl> - <nl> - < Product Name = ' triAGENS ArangoDB Server 64 Bit ' <nl> - Id = ' { A7363040 - 5D54 - 4C08 - B777 - 0119BCD0E15E } ' <nl> - UpgradeCode = ' { D7363040 - 5D54 - 4C08 - B777 - 0119BCD0E15E } ' <nl> - Language = ' 1033 ' <nl> - Version = ' 1 . 1 . 0 . 0 ' <nl> - Manufacturer = ' triAGENS ' > <nl> - <nl> - < Package Id = ' * ' InstallerVersion = ' 200 ' Compressed = ' yes ' Platform = ' x64 ' / > <nl> - <nl> - < Media Id = ' 1 ' Cabinet = ' arango . cab ' EmbedCab = ' yes ' / > <nl> - <nl> - < Property Id = " WIXUI_DONTVALIDATEPATH " Value = " 1 " / > <nl> - <nl> - < Directory Id = ' TARGETDIR ' Name = ' SourceDir ' > <nl> - < Directory Id = ' ProgramFiles64Folder ' > <nl> - < Directory Id = " IISROOT " Name = " . " > <nl> - < Directory Id = ' INSTALLDIR ' Name = ' triAGENS ' > <nl> - <nl> - < Directory Id = ' js_dir ' Name = ' js ' / > <nl> - <nl> - < Component Id = ' MainExecutable ' Guid = ' { D7363040 - 5D54 - 4C08 - B777 - 0119BCD0E15E } ' Win64 = ' yes ' > <nl> - < File Id = ' arangodEXE ' Name = ' arangod . exe ' Source = ' arangod64 . exe ' Vital = ' yes ' / > <nl> - < File Id = ' arangoShellEXE ' Name = ' arangosh . exe ' Source = ' arangosh64 . exe ' Vital = ' yes ' / > <nl> - < File Id = ' arangodImportEXE ' Name = ' arangoimp . exe ' Source = ' arangoimp64 . exe ' Vital = ' yes ' / > <nl> - < File Id = ' arangodRestoreEXE ' Name = ' arangorestore . exe ' Source = ' arangorestore64 . exe ' Vital = ' yes ' / > <nl> - < File Id = ' arangodDumpEXE ' Name = ' arangodump . exe ' Source = ' arangodump64 . exe ' Vital = ' yes ' / > <nl> - < File Id = ' arangodBenchEXE ' Name = ' arangob . exe ' Source = ' arangob64 . exe ' Vital = ' yes ' / > <nl> - < File Id = ' checkserverEXE ' Name = ' checkserver . exe ' Source = ' checkserver64 . exe ' Vital = ' yes ' / > <nl> - <nl> - < File Id = ' arangodConf ' Name = ' arangod . conf ' Source = ' arangod . conf ' Vital = ' yes ' / > <nl> - < File Id = ' arangoShellConf ' Name = ' arangosh . conf ' Source = ' arangosh . conf ' Vital = ' yes ' / > <nl> - < File Id = ' arangoImportConf ' Name = ' arangoimp . conf ' Source = ' arangoimp . conf ' Vital = ' yes ' / > <nl> - < File Id = ' arangoRestoreConf ' Name = ' arangorestore . conf ' Source = ' arangorestore . conf ' Vital = ' yes ' / > <nl> - < File Id = ' arangoDumpConf ' Name = ' arangodump . conf ' Source = ' arangodump . conf ' Vital = ' yes ' / > <nl> - < File Id = ' arangoBenchConf ' Name = ' arangob . conf ' Source = ' arangob . conf ' Vital = ' yes ' / > <nl> - <nl> - < File Id = ' arangodICO ' Name = ' arangod . ico ' Source = ' arango . ico ' Vital = ' yes ' / > <nl> - < File Id = ' arangodReadme ' Name = ' readme . txt ' Source = ' readme . txt ' Vital = ' yes ' / > <nl> - < File Id = ' serverPem ' Name = ' server . pem ' Source = ' server . pem ' Vital = ' yes ' / > <nl> - <nl> - < File Id = ' arangodServerSample ' Name = ' arangod . bat ' Source = ' arangod . bat ' Vital = ' yes ' / > <nl> - < File Id = ' arangodConsoleSample ' Name = ' console . bat ' Source = ' console . bat ' Vital = ' yes ' / > <nl> - < File Id = ' arangodUpgradeSample ' Name = ' upgrade . bat ' Source = ' upgrade . bat ' Vital = ' yes ' / > <nl> - < File Id = ' arangodFoxxManagerSample ' Name = ' foxx - manager . bat ' Source = ' foxx - manager . bat ' Vital = ' yes ' / > <nl> - < File Id = ' arangoShellSample ' Name = ' arangosh . bat ' Source = ' arangosh . bat ' Vital = ' yes ' / > <nl> - <nl> - < RemoveFolder Id = " INSTALLDIR " On = " uninstall " / > <nl> - < / Component > <nl> - <nl> - <nl> - < / Directory > <nl> - <nl> - <nl> - < / Directory > <nl> - <nl> - < / Directory > <nl> - <nl> - < / Directory > <nl> - <nl> - < Feature Id = ' Complete ' Level = " 1 " > <nl> - < ComponentRef Id = ' MainExecutable ' / > <nl> - < ComponentGroupRef Id = ' jsDirectory ' / > <nl> - < / Feature > <nl> - <nl> - < Icon Id = " arango . ico " SourceFile = " arango . ico " / > <nl> - <nl> - < Property Id = " WIXUI_INSTALLDIR " Value = " INSTALLDIR " / > <nl> - < UIRef Id = " WixUI_InstallDir " / > <nl> - < Property Id = " WIXUI_EXITDIALOGOPTIONALTEXT " Value = " Thank you for installing ArangoDB . Please read the readme . txt file in the installation directory which gives sample batch files for starting the server . " / > <nl> - < WixVariable Id = " WixUILicenseRtf " Value = " arangod . rtf " / > <nl> - < WixVariable Id = " WixUIDialogBmp " Value = " arango2 . bmp " / > <nl> - < / Product > <nl> - <nl> - <nl> - < / Wix > <nl> deleted file mode 100644 <nl> index 7a82145a89d . . 00000000000 <nl> mmm a / VS2012 / Installer / arangob . conf <nl> ppp / dev / null <nl> <nl> - keep - alive = true <nl> - progress = true <nl> - <nl> - [ server ] <nl> - disable - authentication = true <nl> - <nl> deleted file mode 100755 <nl> index 8cb914603e1 . . 00000000000 <nl> mmm a / VS2012 / Installer / arangod . bat <nl> ppp / dev / null <nl> <nl> - @ echo off <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - : : # script to start the ArangoDB server in Windows <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - cls <nl> - break = off <nl> - setlocal enableextensions <nl> - <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - : : # Since we have set the database dir to be . \ data , check that it <nl> - : : # really exists , if not create it - otherwise ArangoDB will exit ! <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - if EXIST " . \ data " goto CHECK_LOCK <nl> - mkdir data <nl> - if NOT EXIST " . \ data " ( <nl> - echo Error when attempting to create data directory . . . exiting <nl> - goto END <nl> - ) <nl> - <nl> - : CHECK_LOCK <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - : : # Check for the pid lock file and delete it . <nl> - : : # This indicates abnormal termination . <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - <nl> - if EXIST " . \ data \ LOCK " goto DEL_LOCK <nl> - <nl> - : DEL_LOCK <nl> - echo removing lock file <nl> - del / F . \ data \ LOCK > NUL 2 > & 1 <nl> - if EXIST " . \ data \ LOCK " ( <nl> - echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - echo ERROR : There appears to be a lock file which is in use . This is generally caused <nl> - echo by starting a second server instance before the first instance has terminated . <nl> - echo If you are certain that no other ArangoDB server instances are active , <nl> - echo you may attempt to manually remove the lock . \ data \ lock . <nl> - echo ACTION : Session ends . <nl> - echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - goto END <nl> - ) <nl> - goto START_ARANGO <nl> - <nl> - : START_ARANGO <nl> - arangod . exe - c arangod . conf data % * <nl> - <nl> - : END <nl> - pause <nl> deleted file mode 100755 <nl> index 0b8ed74992a . . 00000000000 <nl> mmm a / VS2012 / Installer / arangod . conf <nl> ppp / dev / null <nl> <nl> - [ server ] <nl> - endpoint = tcp : / / 127 . 0 . 0 . 1 : 8529 <nl> - disable - authentication = true <nl> - threads = 4 <nl> - <nl> - [ database ] <nl> - # the default size is 32M change this if required - especially in the 32 bit version <nl> - # maximal - journal - size 1048576 <nl> - <nl> - [ javascript ] <nl> - app - path = . \ js \ apps <nl> - startup - directory = . \ js <nl> - <nl> - [ scheduler ] <nl> - threads = 4 <nl> - <nl> - [ log ] <nl> - level = info <nl> - severity = human <nl> - <nl> deleted file mode 100755 <nl> index a1f540c49b9 . . 00000000000 <nl> mmm a / VS2012 / Installer / arangodump . conf <nl> ppp / dev / null <nl> <nl> - [ server ] <nl> - endpoint = tcp : / / 127 . 0 . 0 . 1 : 8529 <nl> - disable - authentication = true <nl> deleted file mode 100755 <nl> index a1f540c49b9 . . 00000000000 <nl> mmm a / VS2012 / Installer / arangoimp . conf <nl> ppp / dev / null <nl> <nl> - [ server ] <nl> - endpoint = tcp : / / 127 . 0 . 0 . 1 : 8529 <nl> - disable - authentication = true <nl> deleted file mode 100755 <nl> index a1f540c49b9 . . 00000000000 <nl> mmm a / VS2012 / Installer / arangorestore . conf <nl> ppp / dev / null <nl> <nl> - [ server ] <nl> - endpoint = tcp : / / 127 . 0 . 0 . 1 : 8529 <nl> - disable - authentication = true <nl> deleted file mode 100755 <nl> index 20ea556b8ed . . 00000000000 <nl> mmm a / VS2012 / Installer / arangosh . bat <nl> ppp / dev / null <nl> <nl> - @ echo off <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - : : # script to start the ArangoDB shell in Windows <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - setlocal enableextensions <nl> - <nl> - arangosh . exe - c arangosh . conf % * <nl> \ No newline at end of file <nl> deleted file mode 100755 <nl> index 72e2bb11b9a . . 00000000000 <nl> mmm a / VS2012 / Installer / arangosh . conf <nl> ppp / dev / null <nl> <nl> - pretty - print = true <nl> - <nl> - [ server ] <nl> - endpoint = tcp : / / 127 . 0 . 0 . 1 : 8529 <nl> - disable - authentication = true <nl> - <nl> - [ javascript ] <nl> - startup - directory = . \ js <nl> deleted file mode 100755 <nl> index d22586053ff . . 00000000000 <nl> mmm a / VS2012 / Installer / console . bat <nl> ppp / dev / null <nl> <nl> - @ echo off <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - : : # script to start the ArangoDB server in Windows <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - cls <nl> - break = off <nl> - setlocal enableextensions <nl> - <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - : : # Since we have set the database dir to be . \ data , check that it <nl> - : : # really exists , if not create it - otherwise ArangoDB will exit ! <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - if EXIST " . \ data " goto CHECK_LOCK <nl> - mkdir data <nl> - if NOT EXIST " . \ data " ( <nl> - echo Error when attempting to create data directory . . . exiting <nl> - goto END <nl> - ) <nl> - <nl> - : CHECK_LOCK <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - : : # Check for the pid lock file and delete it . <nl> - : : # This indicates abnormal termination . <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - <nl> - if EXIST " . \ data \ LOCK " goto DEL_LOCK <nl> - <nl> - : DEL_LOCK <nl> - echo removing lock file <nl> - del / F . \ data \ LOCK > NUL <nl> - if EXIST " . \ data \ LOCK " ( <nl> - echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - echo ERROR : There appears to be a lock file which is in use . This is generally caused <nl> - echo by starting a second server instance before the first instance has terminated . <nl> - echo If you are certain that no other ArangoDB server instances are active , <nl> - echo you may attempt to manually remove the lock . \ data \ lock . <nl> - echo ACTION : Session ends . <nl> - echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - goto END <nl> - ) <nl> - goto START_ARANGO <nl> - <nl> - : START_ARANGO <nl> - arangod . exe - c arangod . conf - - console data % * <nl> - <nl> - : END <nl> deleted file mode 100755 <nl> index dd960bf3622 . . 00000000000 <nl> mmm a / VS2012 / Installer / foxx - manager . bat <nl> ppp / dev / null <nl> <nl> - @ echo off <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - : : # script to start the foxx manager in Windows <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - setlocal enableextensions <nl> - <nl> - arangosh . exe - c arangosh . conf - - javascript . execute - string " require ( ' org / arangodb / foxx / manager ' ) . run ( ARGUMENTS ) ; " % * <nl> deleted file mode 100755 <nl> index bd3f0b49d8c . . 00000000000 <nl> mmm a / VS2012 / Installer / readme . txt <nl> ppp / dev / null <nl> <nl> - mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> - - - Full documentation is available online at : - - <nl> - - - http : / / www . arangodb . org / manuals / current / - - <nl> - mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> - <nl> - <nl> - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> - * * * * Please read sections 6 & 7 below if you have an existing database * * * * <nl> - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> - <nl> - 1 ) The default installation directory is c : \ triAGENS . During the installation process <nl> - you may change this . In what follows we will assume that ArangoDB has been installed <nl> - in the default location . ( Replace c : \ triAGENS with your path if this is not the case . ) <nl> - <nl> - 2 ) In the examples which follow all data will be stored in the directory <nl> - c : \ triAGENS \ data . There are a few example batch files in the installation directory <nl> - that you can you to set up , upgrade and connect to the ArangoDB server . <nl> - <nl> - Please note that ArangoDB consists of a database server and client tools . If you start <nl> - the server , it will place a ( read - only ) lock file to prevent accidental access to the <nl> - data . The example batch files will attempt to remove this lock file when they are started - <nl> - this is in case the installation did not proceed correctly or if the server terminated <nl> - unexpectedly . ( Please note , if you attempt to start the server twice using one of the <nl> - example batch files the scripts will fail . ) <nl> - <nl> - 3 ) To start an ArangoDB server instance with networking enabled , use the batch file <nl> - ' arangod . bat ' . This will use the configuration file ' arangod . conf ' , which you can adjust <nl> - to your needs and use the data directory ' data ' . This is the place where all your data <nl> - ( databases and collections ) will be stored . <nl> - <nl> - Please check the output of the ' arangod . bat ' script before going on . If the server <nl> - started successully , you should see a line " ArangoDB is ready for business . Have fun ! " <nl> - at the end of its output . <nl> - <nl> - We now wish to check that the installation is working correctly and to do this <nl> - we will be using the administration web interface . Execute ' arangod . bat ' if you have <nl> - not already done so , then open up your web browser and point it to the page : <nl> - http : / / 127 . 0 . 0 . 1 : 8529 / <nl> - To check if your installation was successful , on the right hand side of the web page <nl> - click the " Filter " drop down and select the " System " type . If the installation was <nl> - successful , then the page should display a few system collections . <nl> - <nl> - Try to add a new collection and then add some documents to this new collection . <nl> - If you have succeeded in creating a new collection and inserting one or more <nl> - documents , then your installation is working correctly . ( The ' New Collection ' <nl> - link is located on the front admin page on the top left hand side . Don ' t forget <nl> - to click ' Save Collection ' . ) <nl> - <nl> - 4 ) To connect to an already running ArangoDB server instance , there is a batch file <nl> - ' arangosh . bat ' . This starts a shell which can be used ( amongst other things ) to <nl> - administer and query a local or remote ArangoDB server . <nl> - <nl> - Note that ' arangosh . bat ' does NOT start a separate server , it only starts the shell . <nl> - To use it , you must have a server running somewhere , e . g . by using the ' arangod . bat ' <nl> - file . <nl> - <nl> - ' arangosh . bat ' uses configuration from the file ' arangosh . conf ' . Please adjust this <nl> - to your needs if you want to use different connection settings etc . <nl> - <nl> - 5 ) There is also a batch file named ' console . bat ' which will start the ArangoDB server <nl> - in an emergency console mode , with all networking disabled . To run ArangoDB in this <nl> - mode , you must stop an already running server instance first . <nl> - <nl> - If you run ' console . bat ' , you will be presented with the command line : <nl> - arangod > <nl> - <nl> - You can then start executing commands on the local server . To exit the emergency <nl> - console type CTRL - D ( Press the Control Key with D ) . <nl> - Please see the online documentation to see how to access the database using the <nl> - console . <nl> - <nl> - 6 ) If you have an EXISTING database , then please note that currently a 32 bit version <nl> - of ArangoDB is NOT compatible with a 64 bit version . This means that if you have a <nl> - database created with a 32 bit version of ArangoDB it may become corrupted if you <nl> - execute a 64 bit version of ArangoDB against the same database , and vice versa . <nl> - <nl> - 7 ) To upgrade an EXISTING database created with a previous version of ArangoDB , please <nl> - execute the script ' upgrade . bat ' . Otherwise starting ArangoDB may fail with errors . <nl> - <nl> - Note that there is no harm in running the ' upgrade . bat ' script . So you should run this <nl> - batch file if you are unsure of the database version you are using . <nl> - <nl> - You should always check the output of the batch file for errors to see if the <nl> - upgrade was completed successfully . <nl> - <nl> - 8 ) To uninstall the Arango server application you can use the windows control panel <nl> - ( as you would normally uninstall an application ) . Note however , that any data files <nl> - created by the Arango server will remain as well as the c : \ triAGENS directory . <nl> - To complete the uninstallation process , remove the data files and the <nl> - c : \ triAGENS directory manually . <nl> - <nl> - <nl> - If you have any questions regarding the installation or other matters please use <nl> - http : / / groups . google . com / group / arangodb <nl> - <nl> - For bug reports please use https : / / github . com / triAGENS / ArangoDB / issues <nl> - <nl> - To obtain the version of the currently installed ArangoDB instance , execute the following <nl> - on a Command Prompt : <nl> - <nl> - c : \ triAGENS \ arangod . exe - - version <nl> - <nl> - <nl> - Thanks for choosing ArangoDB ! <nl> deleted file mode 100755 <nl> index 108998782f3 . . 00000000000 <nl> mmm a / VS2012 / Installer / server . pem <nl> ppp / dev / null <nl> <nl> mmmmmmBEGIN CERTIFICATEmmm - - <nl> - MIICKTCCAZICCQDrch / 8O8H4PTANBgkqhkiG9w0BAQUFADBZMQswCQYDVQQGEwJE <nl> - RTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0 <nl> - cyBQdHkgTHRkMRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMTIwNzI0MDYxNzUwWhcN <nl> - MTMwNzI0MDYxNzUwWjBZMQswCQYDVQQGEwJERTETMBEGA1UECAwKU29tZS1TdGF0 <nl> - ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRIwEAYDVQQDDAls <nl> - b2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMDwRweF75H + BFBY <nl> - m9c4V / AZyWehxQ + pRfy6d + oPiUbOByqLDEQBdiMamQ0acJX9sn + MsFixEDRC1Y8r <nl> - ef49k1hb9V / pPtSFPVl5y8Db4FiDabKD9juUvNRqCXAzu99dwJwFZU2Ldq4BiCmf <nl> - 8V0SO + nHJHs3 + HNgbYU + g77Fax7dAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEASYfI <nl> - Afq5lRn + XoESn + PQ89XJ83Jr5mJhDkT7ebw + w1CQsnR9uYIeAYNxOyb3bfHOntnz <nl> - 3irGYJWkrewVYjNkID8jhZSYEOZkfC4jxNLigg7QXyw / XWwwCIEr8 / ZW + cnci43G <nl> - + IhSspyoJnljELM99ZsW0IaBLT + tgHzep4bIh0Y = <nl> mmmmmmEND CERTIFICATEmmm - - <nl> mmmmmmBEGIN RSA PRIVATE KEYmmm - - <nl> - MIICXgIBAAKBgQDA8EcHhe + R / gRQWJvXOFfwGclnocUPqUX8unfqD4lGzgcqiwxE <nl> - AXYjGpkNGnCV / bJ / jLBYsRA0QtWPK3n + PZNYW / Vf6T7UhT1ZecvA2 + BYg2myg / Y7 <nl> - lLzUaglwM7vfXcCcBWVNi3auAYgpn / FdEjvpxyR7N / hzYG2FPoO + xWse3QIDAQAB <nl> - AoGBALsP + 34C0M02gI456xbXDQPArLJqePp / P1kSnbL0zz80AGSyHflNhXHxltTK <nl> - fsAeElNyX4QOYEybRB2kpInov5KrL3lR926GY + + otHpSAue + PfLJHH8OU8qjartw <nl> - KGlzdnFFYQVLNc0qYGl / h0MxH6 + Ce8JV0y1zI4J3nwMwCZwBAkEA6uqluGj4SXIj <nl> - 6W + FefuHlHXgFn + TZgsGNNmmCMhLJPUUP7auIagtG1n12mN47kWqhLu3asLEVq4 + <nl> - YnCEa0hF3QJBANJBKN / zyfmvkiET33cY03282gSN0YLyibMYoNDOOYMFEW2b + 3oF <nl> - x0d40FfEkYS0R4rJiR1HI8xWw8uQEWsXLQECQQDRx1DN6Q8vpznij7BGShO8w7ak <nl> - 4LAkA9w6 / dGDLjnMev7mFqBRdfkx35foucOYI6YueeNE90CVl2wmRAw8MYIRAkEA <nl> - qUUgPTyuDMCWqt6u99ka243hD + 2FESFmTrOzNKfykVLRNydvDEv + pcHUKfTtGqNx <nl> - PYEHTHTrkyT / OLFh9I + SAQJAOntw15vhgKiy0DUvjSvXGJziBDPsu / MCZ2CZbaVx <nl> - ipkUZQCZLd / HvMphAiirLV + mAJQC732KKlR9 / HWRzDDFEQ = = <nl> mmmmmmEND RSA PRIVATE KEYmmm - - <nl> deleted file mode 100755 <nl> index 755e322a0b7 . . 00000000000 <nl> mmm a / VS2012 / Installer / upgrade . bat <nl> ppp / dev / null <nl> <nl> - @ echo off <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - : : # script to upgrade the ArangoDB server in Windows <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - cls <nl> - break = off <nl> - setlocal enableextensions <nl> - <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - : : # Since we have set the database dir to be . \ data , check that it <nl> - : : # really exists , if not create it - otherwise ArangoDB will exit ! <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - if EXIST " . \ data " goto CHECK_LOCK <nl> - mkdir data <nl> - if NOT EXIST " . \ data " ( <nl> - echo Error when attempting to create data directory . . . exiting <nl> - goto END <nl> - ) <nl> - <nl> - : CHECK_LOCK <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - : : # Check for the pid lock file and delete it . <nl> - : : # This indicates abnormal termination . <nl> - : : # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - <nl> - if EXIST " . \ data \ LOCK " goto DEL_LOCK <nl> - <nl> - : DEL_LOCK <nl> - echo removing lock file <nl> - del / F . \ data \ LOCK > NUL 2 > & 1 <nl> - if EXIST " . \ data \ LOCK " ( <nl> - echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - echo ERROR : There appears to be a lock file which is in use . This is generally caused <nl> - echo by starting a second server instance before the first instance has terminated . <nl> - echo If you are certain that no other ArangoDB server instances are active , <nl> - echo you may attempt to manually remove the lock . \ data \ lock . <nl> - echo ACTION : Session ends . <nl> - echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - goto END <nl> - ) <nl> - goto START_ARANGO <nl> - <nl> - : START_ARANGO <nl> - arangod . exe - c arangod . conf - - console - - upgrade data % * <nl> - <nl> - : END <nl> - pause <nl> deleted file mode 100644 <nl> index ce2c481d598 . . 00000000000 <nl> mmm a / VS2012 / arango . sln <nl> ppp / dev / null <nl> <nl> - <nl> - Microsoft Visual Studio Solution File , Format Version 12 . 00 <nl> - # Visual Studio Express 2012 for Windows Desktop <nl> - Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " ArangoDB Library " , " ArangoDB Library \ ArangoDB . vcxproj " , " { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } " <nl> - EndProject <nl> - Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " Arango Regex Library " , " Arango Regex Library \ regex - 2 . 7 . vcxproj " , " { 23313837 - C0F8 - 46E2 - 8F16 - 6396D72FBF08 } " <nl> - EndProject <nl> - Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " Arango Front End Library " , " Arango Front End Library \ Arango Front End Library . vcxproj " , " { 4E48A2A8 - 9F42 - 41DA - 8DEF - 6548198E8964 } " <nl> - EndProject <nl> - Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " Arango V8 Library " , " Arango V8 Library \ Arango V8 Library . vcxproj " , " { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } " <nl> - EndProject <nl> - Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " Arango MRuby Library " , " Arango MRuby Library \ Arango MRuby Library . vcxproj " , " { 13A4B4F9 - 4D59 - 4F4C - 8B14 - AFFCCDA5002B } " <nl> - EndProject <nl> - Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " Arangod Binary " , " Arangod Binary \ Arangod Binary . vcxproj " , " { 00364934 - E6C8 - 44F2 - 957C - 0E71383504D0 } " <nl> - ProjectSection ( ProjectDependencies ) = postProject <nl> - { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } = { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } <nl> - { 23313837 - C0F8 - 46E2 - 8F16 - 6396D72FBF08 } = { 23313837 - C0F8 - 46E2 - 8F16 - 6396D72FBF08 } <nl> - { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } = { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } <nl> - { 4E48A2A8 - 9F42 - 41DA - 8DEF - 6548198E8964 } = { 4E48A2A8 - 9F42 - 41DA - 8DEF - 6548198E8964 } <nl> - { 756B37DA - 7F72 - 4D5C - 83C3 - F54815AC304F } = { 756B37DA - 7F72 - 4D5C - 83C3 - F54815AC304F } <nl> - { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } = { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } <nl> - { 13A4B4F9 - 4D59 - 4F4C - 8B14 - AFFCCDA5002B } = { 13A4B4F9 - 4D59 - 4F4C - 8B14 - AFFCCDA5002B } <nl> - EndProjectSection <nl> - EndProject <nl> - Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " Arango Client Library " , " Arango Client Library \ Arango Client Library . vcxproj " , " { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } " <nl> - EndProject <nl> - Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " Arango Readline Library " , " Arango Readline Library \ readline . vcxproj " , " { 756B37DA - 7F72 - 4D5C - 83C3 - F54815AC304F } " <nl> - EndProject <nl> - Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " Arangosh Binary " , " Arangosh Binary \ Arangosh Binary . vcxproj " , " { 6BB0D86C - 8221 - 474C - A004 - A5CCD1F0AB86 } " <nl> - ProjectSection ( ProjectDependencies ) = postProject <nl> - { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } = { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } <nl> - { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } = { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } <nl> - { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } = { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } <nl> - EndProjectSection <nl> - EndProject <nl> - Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " Arangoimp Binary " , " Arangoimp Binary \ Arangoimp Binary . vcxproj " , " { 4C3903F3 - 396E - 489F - 954A - 75399C64BE92 } " <nl> - ProjectSection ( ProjectDependencies ) = postProject <nl> - { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } = { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } <nl> - { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } = { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } <nl> - { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } = { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } <nl> - EndProjectSection <nl> - EndProject <nl> - Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " Arangodump Binary " , " Arangodump Binary \ Arangodump Binary . vcxproj " , " { B4985B94 - 29DA - 4649 - A2F2 - FEDF4E0560EF } " <nl> - ProjectSection ( ProjectDependencies ) = postProject <nl> - { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } = { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } <nl> - { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } = { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } <nl> - EndProjectSection <nl> - EndProject <nl> - Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " Arangorestore Binary " , " Arangorestore Binary \ Arangorestore Binary . vcxproj " , " { 9DB047E8 - AD65 - 4EBB - 9BD2 - D0A0B6F6BB25 } " <nl> - ProjectSection ( ProjectDependencies ) = postProject <nl> - { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } = { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } <nl> - { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } = { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } <nl> - EndProjectSection <nl> - EndProject <nl> - Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " Arangob Binary " , " Arangob Binary \ Arangob Binary . vcxproj " , " { 1D51688C - 8A5D - 4191 - A3A6 - ACD5D3A8111F } " <nl> - ProjectSection ( ProjectDependencies ) = postProject <nl> - { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } = { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } <nl> - { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } = { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } <nl> - EndProjectSection <nl> - EndProject <nl> - Project ( " { 8BC9CEB8 - 8B4A - 11D0 - 8D11 - 00A0C91BC942 } " ) = " Checkserver Binary " , " Checkserver Binary \ Checkserver Binary . vcxproj " , " { 2BC148DF - 067A - 4299 - AA89 - 15A4DB89B40F } " <nl> - ProjectSection ( ProjectDependencies ) = postProject <nl> - { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } = { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } <nl> - { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } = { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } <nl> - { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } = { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } <nl> - EndProjectSection <nl> - EndProject <nl> - Global <nl> - GlobalSection ( SolutionConfigurationPlatforms ) = preSolution <nl> - Debug | Win32 = Debug | Win32 <nl> - Debug | x64 = Debug | x64 <nl> - Release | Win32 = Release | Win32 <nl> - Release | x64 = Release | x64 <nl> - EndGlobalSection <nl> - GlobalSection ( ProjectConfigurationPlatforms ) = postSolution <nl> - { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } . Debug | Win32 . ActiveCfg = Debug | Win32 <nl> - { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } . Debug | Win32 . Build . 0 = Debug | Win32 <nl> - { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } . Debug | x64 . ActiveCfg = Debug | x64 <nl> - { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } . Debug | x64 . Build . 0 = Debug | x64 <nl> - { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } . Release | Win32 . ActiveCfg = Release | Win32 <nl> - { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } . Release | Win32 . Build . 0 = Release | Win32 <nl> - { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } . Release | x64 . ActiveCfg = Release | x64 <nl> - { 9FB69E35 - 6ADE - 4AAD - 9766 - B5409C1D2595 } . Release | x64 . Build . 0 = Release | x64 <nl> - { 23313837 - C0F8 - 46E2 - 8F16 - 6396D72FBF08 } . Debug | Win32 . ActiveCfg = Debug | Win32 <nl> - { 23313837 - C0F8 - 46E2 - 8F16 - 6396D72FBF08 } . Debug | Win32 . Build . 0 = Debug | Win32 <nl> - { 23313837 - C0F8 - 46E2 - 8F16 - 6396D72FBF08 } . Debug | x64 . ActiveCfg = Debug | x64 <nl> - { 23313837 - C0F8 - 46E2 - 8F16 - 6396D72FBF08 } . Debug | x64 . Build . 0 = Debug | x64 <nl> - { 23313837 - C0F8 - 46E2 - 8F16 - 6396D72FBF08 } . Release | Win32 . ActiveCfg = Release | Win32 <nl> - { 23313837 - C0F8 - 46E2 - 8F16 - 6396D72FBF08 } . Release | Win32 . Build . 0 = Release | Win32 <nl> - { 23313837 - C0F8 - 46E2 - 8F16 - 6396D72FBF08 } . Release | x64 . ActiveCfg = Release | x64 <nl> - { 23313837 - C0F8 - 46E2 - 8F16 - 6396D72FBF08 } . Release | x64 . Build . 0 = Release | x64 <nl> - { 4E48A2A8 - 9F42 - 41DA - 8DEF - 6548198E8964 } . Debug | Win32 . ActiveCfg = Debug | Win32 <nl> - { 4E48A2A8 - 9F42 - 41DA - 8DEF - 6548198E8964 } . Debug | Win32 . Build . 0 = Debug | Win32 <nl> - { 4E48A2A8 - 9F42 - 41DA - 8DEF - 6548198E8964 } . Debug | x64 . ActiveCfg = Debug | x64 <nl> - { 4E48A2A8 - 9F42 - 41DA - 8DEF - 6548198E8964 } . Debug | x64 . Build . 0 = Debug | x64 <nl> - { 4E48A2A8 - 9F42 - 41DA - 8DEF - 6548198E8964 } . Release | Win32 . ActiveCfg = Release | Win32 <nl> - { 4E48A2A8 - 9F42 - 41DA - 8DEF - 6548198E8964 } . Release | Win32 . Build . 0 = Release | Win32 <nl> - { 4E48A2A8 - 9F42 - 41DA - 8DEF - 6548198E8964 } . Release | x64 . ActiveCfg = Release | x64 <nl> - { 4E48A2A8 - 9F42 - 41DA - 8DEF - 6548198E8964 } . Release | x64 . Build . 0 = Release | x64 <nl> - { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } . Debug | Win32 . ActiveCfg = Debug | Win32 <nl> - { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } . Debug | Win32 . Build . 0 = Debug | Win32 <nl> - { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } . Debug | x64 . ActiveCfg = Debug | x64 <nl> - { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } . Debug | x64 . Build . 0 = Debug | x64 <nl> - { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } . Release | Win32 . ActiveCfg = Release | Win32 <nl> - { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } . Release | Win32 . Build . 0 = Release | Win32 <nl> - { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } . Release | x64 . ActiveCfg = Release | x64 <nl> - { 8985F67A - A9CC - 41C8 - 80D4 - 364678550F2F } . Release | x64 . Build . 0 = Release | x64 <nl> - { 13A4B4F9 - 4D59 - 4F4C - 8B14 - AFFCCDA5002B } . Debug | Win32 . ActiveCfg = Debug | Win32 <nl> - { 13A4B4F9 - 4D59 - 4F4C - 8B14 - AFFCCDA5002B } . Debug | Win32 . Build . 0 = Debug | Win32 <nl> - { 13A4B4F9 - 4D59 - 4F4C - 8B14 - AFFCCDA5002B } . Debug | x64 . ActiveCfg = Debug | x64 <nl> - { 13A4B4F9 - 4D59 - 4F4C - 8B14 - AFFCCDA5002B } . Debug | x64 . Build . 0 = Debug | x64 <nl> - { 13A4B4F9 - 4D59 - 4F4C - 8B14 - AFFCCDA5002B } . Release | Win32 . ActiveCfg = Release | Win32 <nl> - { 13A4B4F9 - 4D59 - 4F4C - 8B14 - AFFCCDA5002B } . Release | Win32 . Build . 0 = Release | Win32 <nl> - { 13A4B4F9 - 4D59 - 4F4C - 8B14 - AFFCCDA5002B } . Release | x64 . ActiveCfg = Release | x64 <nl> - { 13A4B4F9 - 4D59 - 4F4C - 8B14 - AFFCCDA5002B } . Release | x64 . Build . 0 = Release | x64 <nl> - { 00364934 - E6C8 - 44F2 - 957C - 0E71383504D0 } . Debug | Win32 . ActiveCfg = Debug | Win32 <nl> - { 00364934 - E6C8 - 44F2 - 957C - 0E71383504D0 } . Debug | Win32 . Build . 0 = Debug | Win32 <nl> - { 00364934 - E6C8 - 44F2 - 957C - 0E71383504D0 } . Debug | x64 . ActiveCfg = Debug | x64 <nl> - { 00364934 - E6C8 - 44F2 - 957C - 0E71383504D0 } . Debug | x64 . Build . 0 = Debug | x64 <nl> - { 00364934 - E6C8 - 44F2 - 957C - 0E71383504D0 } . Release | Win32 . ActiveCfg = Release | Win32 <nl> - { 00364934 - E6C8 - 44F2 - 957C - 0E71383504D0 } . Release | Win32 . Build . 0 = Release | Win32 <nl> - { 00364934 - E6C8 - 44F2 - 957C - 0E71383504D0 } . Release | x64 . ActiveCfg = Release | x64 <nl> - { 00364934 - E6C8 - 44F2 - 957C - 0E71383504D0 } . Release | x64 . Build . 0 = Release | x64 <nl> - { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } . Debug | Win32 . ActiveCfg = Debug | Win32 <nl> - { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } . Debug | Win32 . Build . 0 = Debug | Win32 <nl> - { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } . Debug | x64 . ActiveCfg = Debug | x64 <nl> - { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } . Debug | x64 . Build . 0 = Debug | x64 <nl> - { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } . Release | Win32 . ActiveCfg = Release | Win32 <nl> - { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } . Release | Win32 . Build . 0 = Release | Win32 <nl> - { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } . Release | x64 . ActiveCfg = Release | x64 <nl> - { 604036DD - 7013 - 4463 - B827 - D06016BD41FC } . Release | x64 . Build . 0 = Release | x64 <nl> - { 756B37DA - 7F72 - 4D5C - 83C3 - F54815AC304F } . Debug | Win32 . ActiveCfg = Debug | Win32 <nl> - { 756B37DA - 7F72 - 4D5C - 83C3 - F54815AC304F } . Debug | Win32 . Build . 0 = Debug | Win32 <nl> - { 756B37DA - 7F72 - 4D5C - 83C3 - F54815AC304F } . Debug | x64 . ActiveCfg = Debug | x64 <nl> - { 756B37DA - 7F72 - 4D5C - 83C3 - F54815AC304F } . Debug | x64 . Build . 0 = Debug | x64 <nl> - { 756B37DA - 7F72 - 4D5C - 83C3 - F54815AC304F } . Release | Win32 . ActiveCfg = Release | Win32 <nl> - { 756B37DA - 7F72 - 4D5C - 83C3 - F54815AC304F } . Release | Win32 . Build . 0 = Release | Win32 <nl> - { 756B37DA - 7F72 - 4D5C - 83C3 - F54815AC304F } . Release | x64 . ActiveCfg = Release | x64 <nl> - { 756B37DA - 7F72 - 4D5C - 83C3 - F54815AC304F } . Release | x64 . Build . 0 = Release | x64 <nl> - { 6BB0D86C - 8221 - 474C - A004 - A5CCD1F0AB86 } . Debug | Win32 . ActiveCfg = Debug | Win32 <nl> - { 6BB0D86C - 8221 - 474C - A004 - A5CCD1F0AB86 } . Debug | Win32 . Build . 0 = Debug | Win32 <nl> - { 6BB0D86C - 8221 - 474C - A004 - A5CCD1F0AB86 } . Debug | x64 . ActiveCfg = Debug | x64 <nl> - { 6BB0D86C - 8221 - 474C - A004 - A5CCD1F0AB86 } . Debug | x64 . Build . 0 = Debug | x64 <nl> - { 6BB0D86C - 8221 - 474C - A004 - A5CCD1F0AB86 } . Release | Win32 . ActiveCfg = Release | Win32 <nl> - { 6BB0D86C - 8221 - 474C - A004 - A5CCD1F0AB86 } . Release | Win32 . Build . 0 = Release | Win32 <nl> - { 6BB0D86C - 8221 - 474C - A004 - A5CCD1F0AB86 } . Release | x64 . ActiveCfg = Release | x64 <nl> - { 6BB0D86C - 8221 - 474C - A004 - A5CCD1F0AB86 } . Release | x64 . Build . 0 = Release | x64 <nl> - { 4C3903F3 - 396E - 489F - 954A - 75399C64BE92 } . Debug | Win32 . ActiveCfg = Debug | Win32 <nl> - { 4C3903F3 - 396E - 489F - 954A - 75399C64BE92 } . Debug | Win32 . Build . 0 = Debug | Win32 <nl> - { 4C3903F3 - 396E - 489F - 954A - 75399C64BE92 } . Debug | x64 . ActiveCfg = Debug | x64 <nl> - { 4C3903F3 - 396E - 489F - 954A - 75399C64BE92 } . Debug | x64 . Build . 0 = Debug | x64 <nl> - { 4C3903F3 - 396E - 489F - 954A - 75399C64BE92 } . Release | Win32 . ActiveCfg = Release | Win32 <nl> - { 4C3903F3 - 396E - 489F - 954A - 75399C64BE92 } . Release | Win32 . Build . 0 = Release | Win32 <nl> - { 4C3903F3 - 396E - 489F - 954A - 75399C64BE92 } . Release | x64 . ActiveCfg = Release | x64 <nl> - { 4C3903F3 - 396E - 489F - 954A - 75399C64BE92 } . Release | x64 . Build . 0 = Release | x64 <nl> - { B4985B94 - 29DA - 4649 - A2F2 - FEDF4E0560EF } . Debug | Win32 . ActiveCfg = Debug | Win32 <nl> - { B4985B94 - 29DA - 4649 - A2F2 - FEDF4E0560EF } . Debug | Win32 . Build . 0 = Debug | Win32 <nl> - { B4985B94 - 29DA - 4649 - A2F2 - FEDF4E0560EF } . Debug | x64 . ActiveCfg = Debug | x64 <nl> - { B4985B94 - 29DA - 4649 - A2F2 - FEDF4E0560EF } . Debug | x64 . Build . 0 = Debug | x64 <nl> - { B4985B94 - 29DA - 4649 - A2F2 - FEDF4E0560EF } . Release | Win32 . ActiveCfg = Release | Win32 <nl> - { B4985B94 - 29DA - 4649 - A2F2 - FEDF4E0560EF } . Release | Win32 . Build . 0 = Release | Win32 <nl> - { B4985B94 - 29DA - 4649 - A2F2 - FEDF4E0560EF } . Release | x64 . ActiveCfg = Release | x64 <nl> - { B4985B94 - 29DA - 4649 - A2F2 - FEDF4E0560EF } . Release | x64 . Build . 0 = Release | x64 <nl> - { 9DB047E8 - AD65 - 4EBB - 9BD2 - D0A0B6F6BB25 } . Debug | Win32 . ActiveCfg = Debug | Win32 <nl> - { 9DB047E8 - AD65 - 4EBB - 9BD2 - D0A0B6F6BB25 } . Debug | Win32 . Build . 0 = Debug | Win32 <nl> - { 9DB047E8 - AD65 - 4EBB - 9BD2 - D0A0B6F6BB25 } . Debug | x64 . ActiveCfg = Debug | x64 <nl> - { 9DB047E8 - AD65 - 4EBB - 9BD2 - D0A0B6F6BB25 } . Debug | x64 . Build . 0 = Debug | x64 <nl> - { 9DB047E8 - AD65 - 4EBB - 9BD2 - D0A0B6F6BB25 } . Release | Win32 . ActiveCfg = Release | Win32 <nl> - { 9DB047E8 - AD65 - 4EBB - 9BD2 - D0A0B6F6BB25 } . Release | Win32 . Build . 0 = Release | Win32 <nl> - { 9DB047E8 - AD65 - 4EBB - 9BD2 - D0A0B6F6BB25 } . Release | x64 . ActiveCfg = Release | x64 <nl> - { 9DB047E8 - AD65 - 4EBB - 9BD2 - D0A0B6F6BB25 } . Release | x64 . Build . 0 = Release | x64 <nl> - { 1D51688C - 8A5D - 4191 - A3A6 - ACD5D3A8111F } . Debug | Win32 . ActiveCfg = Debug | Win32 <nl> - { 1D51688C - 8A5D - 4191 - A3A6 - ACD5D3A8111F } . Debug | Win32 . Build . 0 = Debug | Win32 <nl> - { 1D51688C - 8A5D - 4191 - A3A6 - ACD5D3A8111F } . Debug | x64 . ActiveCfg = Debug | x64 <nl> - { 1D51688C - 8A5D - 4191 - A3A6 - ACD5D3A8111F } . Debug | x64 . Build . 0 = Debug | x64 <nl> - { 1D51688C - 8A5D - 4191 - A3A6 - ACD5D3A8111F } . Release | Win32 . ActiveCfg = Release | Win32 <nl> - { 1D51688C - 8A5D - 4191 - A3A6 - ACD5D3A8111F } . Release | Win32 . Build . 0 = Release | Win32 <nl> - { 1D51688C - 8A5D - 4191 - A3A6 - ACD5D3A8111F } . Release | x64 . ActiveCfg = Release | x64 <nl> - { 1D51688C - 8A5D - 4191 - A3A6 - ACD5D3A8111F } . Release | x64 . Build . 0 = Release | x64 <nl> - { 2BC148DF - 067A - 4299 - AA89 - 15A4DB89B40F } . Debug | Win32 . ActiveCfg = Debug | Win32 <nl> - { 2BC148DF - 067A - 4299 - AA89 - 15A4DB89B40F } . Debug | Win32 . Build . 0 = Debug | Win32 <nl> - { 2BC148DF - 067A - 4299 - AA89 - 15A4DB89B40F } . Debug | x64 . ActiveCfg = Debug | x64 <nl> - { 2BC148DF - 067A - 4299 - AA89 - 15A4DB89B40F } . Debug | x64 . Build . 0 = Debug | x64 <nl> - { 2BC148DF - 067A - 4299 - AA89 - 15A4DB89B40F } . Release | Win32 . ActiveCfg = Release | Win32 <nl> - { 2BC148DF - 067A - 4299 - AA89 - 15A4DB89B40F } . Release | Win32 . Build . 0 = Release | Win32 <nl> - { 2BC148DF - 067A - 4299 - AA89 - 15A4DB89B40F } . Release | x64 . ActiveCfg = Release | x64 <nl> - { 2BC148DF - 067A - 4299 - AA89 - 15A4DB89B40F } . Release | x64 . Build . 0 = Release | x64 <nl> - EndGlobalSection <nl> - GlobalSection ( SolutionProperties ) = preSolution <nl> - HideSolutionNode = FALSE <nl> - EndGlobalSection <nl> - EndGlobal <nl> mmm a / arangod / Ahuacatl / ahuacatl - grammar . c <nl> ppp b / arangod / Ahuacatl / ahuacatl - grammar . c <nl> <nl> typedef union YYSTYPE <nl> { <nl> <nl> - / * Line 293 of yacc . c * / <nl> + / * Line 301 of yacc . c * / <nl> # line 26 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> <nl> TRI_aql_node_t * node ; <nl> typedef union YYSTYPE <nl> <nl> <nl> <nl> - / * Line 293 of yacc . c * / <nl> + / * Line 301 of yacc . c * / <nl> # line 195 " arangod / Ahuacatl / ahuacatl - grammar . c " <nl> } YYSTYPE ; <nl> # define YYSTYPE_IS_TRIVIAL 1 <nl> YYLTYPE yylloc ; <nl> { <nl> case 2 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 184 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 3 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 189 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 4 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 191 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 5 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 196 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 6 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 198 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 7 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 200 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 8 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 202 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 9 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 204 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 10 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 206 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 11 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 211 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node ; <nl> YYLTYPE yylloc ; <nl> <nl> case 12 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 230 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeFilterAql ( context , ( yyvsp [ ( 2 ) - ( 2 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 13 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 243 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 14 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 248 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 15 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 250 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 16 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 255 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeLetAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . strval ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 17 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 269 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeListAql ( context ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 18 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 277 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeCollectAql ( context , TRI_PopStackParseAql ( context ) , ( yyvsp [ ( 4 ) - ( 4 ) ] . strval ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 19 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 290 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 20 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 292 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 21 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 297 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeAssignAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . strval ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 22 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 310 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . strval ) = NULL ; <nl> YYLTYPE yylloc ; <nl> <nl> case 23 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 313 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . strval ) = ( yyvsp [ ( 2 ) - ( 2 ) ] . strval ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 24 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 319 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeListAql ( context ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 25 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 327 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * list = TRI_PopStackParseAql ( context ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 26 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 341 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> if ( ! TRI_PushListAql ( context , ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ) ) { <nl> YYLTYPE yylloc ; <nl> <nl> case 27 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 346 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> if ( ! TRI_PushListAql ( context , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ) { <nl> YYLTYPE yylloc ; <nl> <nl> case 28 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 354 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeSortElementAql ( context , ( yyvsp [ ( 1 ) - ( 2 ) ] . node ) , ( yyvsp [ ( 2 ) - ( 2 ) ] . boolval ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 29 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 365 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . boolval ) = true ; <nl> YYLTYPE yylloc ; <nl> <nl> case 30 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 368 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . boolval ) = true ; <nl> YYLTYPE yylloc ; <nl> <nl> case 31 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 371 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . boolval ) = false ; <nl> YYLTYPE yylloc ; <nl> <nl> case 32 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 377 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeLimitAql ( context , TRI_CreateNodeValueIntAql ( context , 0 ) , ( yyvsp [ ( 2 ) - ( 2 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 33 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 388 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeLimitAql ( context , ( yyvsp [ ( 2 ) - ( 4 ) ] . node ) , ( yyvsp [ ( 4 ) - ( 4 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 34 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 401 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeReturnAql ( context , ( yyvsp [ ( 2 ) - ( 2 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 35 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 421 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = ( yyvsp [ ( 2 ) - ( 3 ) ] . node ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 36 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 424 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> if ( ! TRI_StartScopeAql ( context , TRI_AQL_SCOPE_SUBQUERY ) ) { <nl> YYLTYPE yylloc ; <nl> <nl> case 37 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 428 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * result ; <nl> YYLTYPE yylloc ; <nl> <nl> case 38 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 460 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 39 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 463 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 40 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 466 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 41 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 469 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 42 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 472 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 43 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 475 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 44 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 478 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node ; <nl> YYLTYPE yylloc ; <nl> <nl> case 45 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 509 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . strval ) = ( yyvsp [ ( 1 ) - ( 1 ) ] . strval ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 46 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 516 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> if ( ( yyvsp [ ( 1 ) - ( 3 ) ] . strval ) = = NULL | | ( yyvsp [ ( 3 ) - ( 3 ) ] . strval ) = = NULL ) { <nl> YYLTYPE yylloc ; <nl> <nl> case 47 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 530 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node ; <nl> YYLTYPE yylloc ; <nl> <nl> case 48 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 543 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * list = TRI_PopStackParseAql ( context ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 49 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 555 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorUnaryPlusAql ( context , ( yyvsp [ ( 2 ) - ( 2 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 50 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 563 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorUnaryMinusAql ( context , ( yyvsp [ ( 2 ) - ( 2 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 51 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 571 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorUnaryNotAql ( context , ( yyvsp [ ( 2 ) - ( 2 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 52 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 582 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorBinaryOrAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . node ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 53 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 590 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorBinaryAndAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . node ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 54 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 598 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorBinaryPlusAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . node ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 55 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 606 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorBinaryMinusAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . node ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 56 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 614 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorBinaryTimesAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . node ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 57 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 622 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorBinaryDivAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . node ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 58 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 630 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorBinaryModAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . node ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 59 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 638 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorBinaryEqAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . node ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 60 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 646 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorBinaryNeAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . node ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 61 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 654 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorBinaryLtAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . node ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 62 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 662 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorBinaryGtAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . node ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 63 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 670 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorBinaryLeAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . node ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 64 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 678 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorBinaryGeAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . node ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 65 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 686 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorBinaryInAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . node ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 66 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 697 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeOperatorTernaryAql ( context , ( yyvsp [ ( 1 ) - ( 5 ) ] . node ) , ( yyvsp [ ( 3 ) - ( 5 ) ] . node ) , ( yyvsp [ ( 5 ) - ( 5 ) ] . node ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 67 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 709 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 68 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 711 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 69 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 716 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> if ( ! TRI_PushListAql ( context , ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ) ) { <nl> YYLTYPE yylloc ; <nl> <nl> case 70 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 721 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> if ( ! TRI_PushListAql ( context , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ) { <nl> YYLTYPE yylloc ; <nl> <nl> case 71 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 729 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 72 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 732 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 73 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 738 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeListAql ( context ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 74 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 745 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = TRI_PopStackParseAql ( context ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 75 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 751 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 76 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 753 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 77 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 758 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> if ( ! TRI_PushListAql ( context , ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ) ) { <nl> YYLTYPE yylloc ; <nl> <nl> case 78 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 763 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> if ( ! TRI_PushListAql ( context , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ) { <nl> YYLTYPE yylloc ; <nl> <nl> case 79 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 771 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeArrayAql ( context ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 80 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 778 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = TRI_PopStackParseAql ( context ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 81 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 784 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 82 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 786 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 83 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 791 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 84 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 793 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> } <nl> YYLTYPE yylloc ; <nl> <nl> case 85 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 798 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> if ( ! TRI_PushArrayAql ( context , ( yyvsp [ ( 1 ) - ( 3 ) ] . strval ) , ( yyvsp [ ( 3 ) - ( 3 ) ] . node ) ) ) { <nl> YYLTYPE yylloc ; <nl> <nl> case 86 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 806 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> / / start of reference ( collection or variable name ) <nl> YYLTYPE yylloc ; <nl> <nl> case 87 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 810 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> / / expanded variable access , e . g . variable [ * ] <nl> YYLTYPE yylloc ; <nl> <nl> case 88 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 834 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> / / return from the " expansion " subrule <nl> YYLTYPE yylloc ; <nl> <nl> case 89 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 868 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> / / variable or collection <nl> YYLTYPE yylloc ; <nl> <nl> case 90 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 885 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 91 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 892 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> / / named variable access , e . g . variable . reference <nl> YYLTYPE yylloc ; <nl> <nl> case 92 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 900 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> / / named variable access , e . g . variable . @ reference <nl> YYLTYPE yylloc ; <nl> <nl> case 93 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 908 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> / / indexed variable access , e . g . variable [ index ] <nl> YYLTYPE yylloc ; <nl> <nl> case 94 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 919 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> / / named variable access , continuation from * expansion , e . g . [ * ] . variable . reference <nl> YYLTYPE yylloc ; <nl> <nl> case 95 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 929 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> / / named variable access w / bind parameter , continuation from * expansion , e . g . [ * ] . variable . @ reference <nl> YYLTYPE yylloc ; <nl> <nl> case 96 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 939 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> / / indexed variable access , continuation from * expansion , e . g . [ * ] . variable [ index ] <nl> YYLTYPE yylloc ; <nl> <nl> case 97 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 949 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> / / named variable access , continuation from * expansion , e . g . [ * ] . variable . xx . reference <nl> YYLTYPE yylloc ; <nl> <nl> case 98 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 957 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> / / named variable access w / bind parameter , continuation from * expansion , e . g . [ * ] . variable . xx . @ reference <nl> YYLTYPE yylloc ; <nl> <nl> case 99 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 965 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> / / indexed variable access , continuation from * expansion , e . g . [ * ] . variable . xx . [ index ] <nl> YYLTYPE yylloc ; <nl> <nl> case 100 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 976 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 101 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 979 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 102 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 985 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 103 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 988 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node ; <nl> YYLTYPE yylloc ; <nl> <nl> case 104 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 1013 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeValueStringAql ( context , ( yyvsp [ ( 1 ) - ( 1 ) ] . strval ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 105 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 1022 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . node ) = ( yyvsp [ ( 1 ) - ( 1 ) ] . node ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 106 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 1025 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeValueNullAql ( context ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 107 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 1034 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeValueBoolAql ( context , true ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 108 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 1043 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeValueBoolAql ( context , false ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 109 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 1055 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node = TRI_CreateNodeParameterAql ( context , ( yyvsp [ ( 1 ) - ( 1 ) ] . strval ) ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 110 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 1067 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> if ( ( yyvsp [ ( 1 ) - ( 1 ) ] . strval ) = = NULL ) { <nl> YYLTYPE yylloc ; <nl> <nl> case 111 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 1074 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> if ( ( yyvsp [ ( 1 ) - ( 1 ) ] . strval ) = = NULL ) { <nl> YYLTYPE yylloc ; <nl> <nl> case 112 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 1083 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> ( yyval . strval ) = ( yyvsp [ ( 1 ) - ( 1 ) ] . strval ) ; <nl> YYLTYPE yylloc ; <nl> <nl> case 113 : <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 1089 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> { <nl> TRI_aql_node_t * node ; <nl> YYLTYPE yylloc ; <nl> <nl> <nl> <nl> - / * Line 1806 of yacc . c * / <nl> + / * Line 1821 of yacc . c * / <nl> # line 3235 " arangod / Ahuacatl / ahuacatl - grammar . c " <nl> default : break ; <nl> } <nl> mmm a / arangod / Ahuacatl / ahuacatl - grammar . h <nl> ppp b / arangod / Ahuacatl / ahuacatl - grammar . h <nl> <nl> typedef union YYSTYPE <nl> { <nl> <nl> - / * Line 2068 of yacc . c * / <nl> + / * Line 2132 of yacc . c * / <nl> # line 26 " arangod / Ahuacatl / ahuacatl - grammar . y " <nl> <nl> TRI_aql_node_t * node ; <nl> typedef union YYSTYPE <nl> <nl> <nl> <nl> - / * Line 2068 of yacc . c * / <nl> + / * Line 2132 of yacc . c * / <nl> # line 113 " arangod / Ahuacatl / ahuacatl - grammar . h " <nl> } YYSTYPE ; <nl> # define YYSTYPE_IS_TRIVIAL 1 <nl> mmm a / arangod / CMakeLists . txt <nl> ppp b / arangod / CMakeLists . txt <nl> <nl> # # - - SECTION - - COMMON INCLUDES <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief local directory <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> include_directories ( . ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief library source <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> include_directories ( $ { PROJECT_SOURCE_DIR } / lib ) <nl> <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> include_directories ( $ { PROJECT_SOURCE_DIR } / lib ) <nl> # # # @ brief output directory <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - set ( CMAKE_RUNTIME_OUTPUT_DIRECTORY " $ { PROJECT_BINARY_DIR } / bin / " ) <nl> + set ( CMAKE_RUNTIME_OUTPUT_DIRECTORY " $ { PROJECT_BINARY_DIR } / bin " ) <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief arangod <nl> target_link_libraries ( <nl> $ { ZLIB_LIBS } <nl> $ { READLINE_LIBS } <nl> $ { OPENSSL_LIBS } <nl> - $ { CMAKE_THREAD_LIBS_INIT } ) <nl> + $ { CMAKE_THREAD_LIBS_INIT } <nl> + $ { MSVC_LIBS } <nl> + ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arangod binary <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> install ( <nl> TARGETS $ { BIN_ARANGOD } <nl> - RUNTIME DESTINATION sbin ) <nl> + RUNTIME DESTINATION $ { TRI_SBINDIR_INSTALL } ) <nl> <nl> - if ( USE_RAW_CONFIG ) <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangod . conf . in <nl> - DESTINATION $ { ETCDIR_INSTALL } <nl> - RENAME arangod - relative . conf ) <nl> - endif ( ) <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arangod config <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - if ( BUILD_PACKAGE STREQUAL " raspbian " ) <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangod - arm . conf <nl> - DESTINATION $ { ETCDIR_INSTALL } <nl> - RENAME arangod . conf ) <nl> - <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangod - uid - arm . conf <nl> - DESTINATION $ { ETCDIR_INSTALL } <nl> - RENAME arangod - uid . conf ) <nl> - else ( ) <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangod . conf <nl> - DESTINATION $ { ETCDIR_INSTALL } ) <nl> - <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangod - uid . conf <nl> - DESTINATION $ { ETCDIR_INSTALL } ) <nl> - endif ( ) <nl> + install_config ( arangod ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arango - dfdb binary <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + install_command_alias ( $ { BIN_ARANGOD } $ { TRI_SBINDIR_INSTALL } arango - dfdb ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arango - dfdb config <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + install_config ( arango - dfdb ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install server - side JavaScript files <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> install ( <nl> DIRECTORY $ { PROJECT_SOURCE_DIR } / js / common $ { PROJECT_SOURCE_DIR } / js / server $ { PROJECT_SOURCE_DIR } / js / actions <nl> install ( <nl> DESTINATION share / arangodb / js <nl> PATTERN " databases " EXCLUDE ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arangod mruby files <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> install ( <nl> DIRECTORY $ { PROJECT_SOURCE_DIR } / mr / common $ { PROJECT_SOURCE_DIR } / mr / server $ { PROJECT_SOURCE_DIR } / mr / actions <nl> DESTINATION share / arangodb / mr <nl> FILES_MATCHING PATTERN " * . rb " ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install log directory <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> install ( <nl> DIRECTORY $ { PROJECT_BINARY_DIR } / var / log / arangodb <nl> DESTINATION $ { VARDIR_INSTALL } / log ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install database directory <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> install ( <nl> DIRECTORY $ { PROJECT_BINARY_DIR } / var / lib / arangodb <nl> DESTINATION $ { VARDIR_INSTALL } / lib ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install apps directory <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + install ( <nl> + DIRECTORY $ { PROJECT_BINARY_DIR } / var / lib / arangodb - apps <nl> + DESTINATION $ { VARDIR_INSTALL } / lib ) <nl> + <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> # # - - SECTION - - END - OF - FILE <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> # # Local Variables : <nl> # # mode : outline - minor <nl> - # # outline - regexp : " ^ \ \ ( # # # @ brief \ \ | # # - - SECTION - - \ \ | # - \ \ * - \ \ ) " <nl> + # # outline - regexp : " # # # @ brief \ \ | # # - - SECTION - - \ \ | # - \ \ * - " <nl> # # End : <nl> mmm a / arangod / RestServer / ArangoServer . cpp <nl> ppp b / arangod / RestServer / ArangoServer . cpp <nl> ArangoServer : : ArangoServer ( int argc , char * * argv ) <nl> TRI_FreeString ( TRI_CORE_MEM_ZONE , p ) ; <nl> <nl> / / set working directory and database directory <nl> + # ifdef _WIN32 <nl> + _workingDirectory = " . " ; <nl> + # else <nl> _workingDirectory = " / var / tmp " ; <nl> + # endif <nl> <nl> _defaultLanguage = Utf8Helper : : DefaultUtf8Helper . getCollatorLanguage ( ) ; <nl> <nl> void ArangoServer : : buildApplicationServer ( ) { <nl> LOG_FATAL_AND_EXIT ( " out of memory " ) ; <nl> } <nl> <nl> - _applicationServer - > setSystemConfigFile ( " arangod . conf " ) ; <nl> + char * p = TRI_BinaryName ( _argv [ 0 ] ) ; <nl> + string conf = p ; <nl> + TRI_FreeString ( TRI_CORE_MEM_ZONE , p ) ; <nl> + conf + = " . conf " ; <nl> <nl> - / / arangod allows defining a user - specific configuration file . arangosh and the other binaries don ' t <nl> - _applicationServer - > setUserConfigFile ( string ( " . arango " ) + string ( 1 , TRI_DIR_SEPARATOR_CHAR ) + string ( " arangod . conf " ) ) ; <nl> + _applicationServer - > setSystemConfigFile ( conf ) ; <nl> <nl> + / / arangod allows defining a user - specific configuration file . arangosh and the other binaries don ' t <nl> + _applicationServer - > setUserConfigFile ( " . arango " + string ( 1 , TRI_DIR_SEPARATOR_CHAR ) + string ( conf ) ) ; <nl> <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> / / multi - threading scheduler <nl> void ArangoServer : : buildApplicationServer ( ) { <nl> / / define server options <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> - / / daemon and supervisor mode <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> - <nl> - <nl> additional [ ApplicationServer : : OPTIONS_CMDLINE ] <nl> ( " console " , " do not start as server , start a JavaScript emergency console instead " ) <nl> ( " temp - path " , & _tempPath , " temporary path " ) <nl> ( " upgrade " , " perform a database upgrade " ) <nl> + ( " default - language " , & _defaultLanguage , " ISO - 639 language code " ) <nl> ; <nl> <nl> additional [ ApplicationServer : : OPTIONS_HIDDEN ] <nl> ( " no - upgrade " , " skip a database upgrade " ) <nl> + ( " start - service " , " used to start as windows service " ) <nl> ; <nl> <nl> # ifdef TRI_ENABLE_MRUBY <nl> void ArangoServer : : buildApplicationServer ( ) { <nl> ; <nl> # endif <nl> <nl> + / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> + / / daemon and supervisor mode <nl> + / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> + <nl> + # ifndef _WIN32 <nl> + <nl> additional [ ApplicationServer : : OPTIONS_CMDLINE + " : help - extended " ] <nl> ( " daemon " , " run as daemon " ) <nl> ( " pid - file " , & _pidFile , " pid - file in daemon mode " ) <nl> ( " supervisor " , " starts a supervisor and runs as daemon " ) <nl> ( " working - directory " , & _workingDirectory , " working directory in daemon mode " ) <nl> - ( " default - language " , & _defaultLanguage , " ISO - 639 language code " ) <nl> ; <nl> <nl> + # endif <nl> + <nl> additional [ ApplicationServer : : OPTIONS_HIDDEN ] <nl> ( " development - mode " , " start server in development mode " ) <nl> ; <nl> void ArangoServer : : buildApplicationServer ( ) { <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> int ArangoServer : : startupServer ( ) { <nl> - v8 : : HandleScope scope ; <nl> <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> / / prepare the various parts of the Arango server <nl> int ArangoServer : : startupServer ( ) { <nl> TRI_vocbase_t * vocbase = TRI_UseDatabaseServer ( _server , TRI_VOC_SYSTEM_DATABASE ) ; <nl> assert ( vocbase ! = 0 ) ; <nl> <nl> - <nl> + / / initialise V8 <nl> _applicationV8 - > setVocbase ( vocbase ) ; <nl> _applicationV8 - > setConcurrency ( _dispatcherThreads ) ; <nl> <nl> mmm a / arangod / RestServer / arango . cpp <nl> ppp b / arangod / RestServer / arango . cpp <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> # include " Basics / Common . h " <nl> - # include " BasicsC / messages . h " <nl> <nl> - # include " RestServer / ArangoServer . h " <nl> + # include " BasicsC / messages . h " <nl> + # include " BasicsC / logging . h " <nl> + # include " BasicsC / tri - strings . h " <nl> # include " Rest / InitialiseRest . h " <nl> + # include " RestServer / ArangoServer . h " <nl> <nl> using namespace triagens ; <nl> using namespace triagens : : rest ; <nl> using namespace triagens : : arango ; <nl> <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> - / / - - SECTION - - public functions <nl> + / / - - SECTION - - private variables <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup ArangoDB <nl> - / / / @ { <nl> + / / / @ brief ArangoDB server <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> + static ArangoServer * ArangoInstance = 0 ; <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief running flag <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + # ifdef _WIN32 <nl> + static bool IsRunning = false ; <nl> + # endif <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief startup and exit functions <nl> + / / / @ brief Windows service name <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> - void * arangodResourcesAllocated = NULL ; <nl> - static void arangodEntryFunction ( ) ; <nl> - static void arangodExitFunction ( int , void * ) ; <nl> + # ifdef _WIN32 <nl> + static string ServiceName = " ArangoDB " ; <nl> + # endif <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief service status handler <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> # ifdef _WIN32 <nl> + static SERVICE_STATUS_HANDLE ServiceStatus ; <nl> + # endif <nl> <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> - / / Call this function to do various initialistions for windows only <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + / / - - SECTION - - private functions <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - void arangodEntryFunction ( ) { <nl> + static void TRI_GlobalEntryFunction ( ) ; <nl> + static void TRI_GlobalExitFunction ( int , void * ) ; <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief global entry function <nl> + / / / <nl> + / / / TODO can we share this between the binaries <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + # ifdef _WIN32 <nl> + <nl> + static void TRI_GlobalEntryFunction ( ) { <nl> int maxOpenFiles = 2048 ; / / upper hard limit for windows <nl> int res = 0 ; <nl> <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> / / Uncomment this to call this for extended debug information . <nl> / / If you familiar with valgrind . . . then this is not like that , however <nl> / / you do get some similar functionality . <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> - / / res = initialiseWindows ( TRI_WIN_INITIAL_SET_DEBUG_FLAG , 0 ) ; <nl> + <nl> + / / res = initialiseWindows ( TRI_WIN_INITIAL_SET_DEBUG_FLAG , 0 ) ; <nl> <nl> res = initialiseWindows ( TRI_WIN_INITIAL_SET_INVALID_HANLE_HANDLER , 0 ) ; <nl> <nl> if ( res ! = 0 ) { <nl> - _exit ( 1 ) ; <nl> + _exit ( EXIT_FAILURE ) ; <nl> } <nl> <nl> res = initialiseWindows ( TRI_WIN_INITIAL_SET_MAX_STD_IO , ( const char * ) ( & maxOpenFiles ) ) ; <nl> <nl> if ( res ! = 0 ) { <nl> - _exit ( 1 ) ; <nl> + _exit ( EXIT_FAILURE ) ; <nl> } <nl> <nl> res = initialiseWindows ( TRI_WIN_INITIAL_WSASTARTUP_FUNCTION_CALL , 0 ) ; <nl> <nl> if ( res ! = 0 ) { <nl> - _exit ( 1 ) ; <nl> + _exit ( EXIT_FAILURE ) ; <nl> } <nl> <nl> - TRI_Application_Exit_SetExit ( arangodExitFunction ) ; <nl> + TRI_Application_Exit_SetExit ( TRI_GlobalExitFunction ) ; <nl> + } <nl> + <nl> + # else <nl> <nl> + static void TRI_GlobalEntryFunction ( ) { <nl> } <nl> <nl> - static void arangodExitFunction ( int exitCode , void * data ) { <nl> + # endif <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief global exit function <nl> + / / / <nl> + / / / TODO can we share this between the binaries <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + # ifdef _WIN32 <nl> + <nl> + static void TRI_GlobalExitFunction ( int exitCode , void * data ) { <nl> int res = 0 ; <nl> + <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> / / TODO : need a terminate function for windows to be called and cleanup <nl> / / any windows specific stuff . <nl> static void arangodExitFunction ( int exitCode , void * data ) { <nl> <nl> res = finaliseWindows ( TRI_WIN_FINAL_WSASTARTUP_FUNCTION_CALL , 0 ) ; <nl> <nl> - <nl> if ( res ! = 0 ) { <nl> - exit ( 1 ) ; <nl> + exit ( EXIT_FAILURE ) ; <nl> } <nl> <nl> exit ( exitCode ) ; <nl> static void arangodExitFunction ( int exitCode , void * data ) { <nl> <nl> # else <nl> <nl> - static void arangodEntryFunction ( ) { <nl> + static void TRI_GlobalExitFunction ( int exitCode , void * data ) { <nl> } <nl> <nl> - static void arangodExitFunction ( int exitCode , void * data ) { <nl> + # endif <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief installs arangod as service with command - line <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + # ifdef _WIN32 <nl> + <nl> + static void InstallServiceCommand ( string command ) { <nl> + string friendlyServiceName = " ArangoDB - the multi - purpose database " ; <nl> + <nl> + cout < < " INFO : adding service ' " < < friendlyServiceName <nl> + < < " ' ( internal ' " < < ServiceName < < " ' ) " <nl> + < < endl ; <nl> + <nl> + SC_HANDLE schSCManager = OpenSCManager ( NULL , SERVICES_ACTIVE_DATABASE , SC_MANAGER_ALL_ACCESS ) ; <nl> + <nl> + if ( schSCManager = = 0 ) { <nl> + cout < < " FATAL : OpenSCManager failed with " < < GetLastError ( ) < < endl ; <nl> + exit ( EXIT_FAILURE ) ; <nl> + } <nl> + <nl> + SC_HANDLE schService = CreateServiceA ( <nl> + schSCManager , / / SCManager database <nl> + ServiceName . c_str ( ) , / / name of service <nl> + friendlyServiceName . c_str ( ) , / / service name to display <nl> + SERVICE_ALL_ACCESS , / / desired access <nl> + SERVICE_WIN32_OWN_PROCESS , / / service type <nl> + SERVICE_AUTO_START , / / start type <nl> + SERVICE_ERROR_NORMAL , / / error control type <nl> + command . c_str ( ) , / / path to service ' s binary <nl> + NULL , / / no load ordering group <nl> + NULL , / / no tag identifier <nl> + NULL , / / no dependencies <nl> + NULL , / / account ( LocalSystem ) <nl> + NULL ) ; / / password <nl> + <nl> + CloseServiceHandle ( schSCManager ) ; <nl> + <nl> + if ( schService = = 0 ) { <nl> + cout < < " FATAL : CreateServiceA failed with " < < GetLastError ( ) < < endl ; <nl> + exit ( EXIT_FAILURE ) ; <nl> + } <nl> + <nl> + SERVICE_DESCRIPTION description = { " multi - purpose NoSQL database ( version " TRI_VERSION " ) " } ; <nl> + ChangeServiceConfig2 ( schService , SERVICE_CONFIG_DESCRIPTION , & description ) ; <nl> + <nl> + cout < < " INFO : added service with command line ' " < < command < < " ' " < < endl ; <nl> + <nl> + CloseServiceHandle ( schService ) ; <nl> } <nl> <nl> # endif <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief installs a windows service <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + # ifdef _WIN32 <nl> + <nl> + static void InstallService ( int argc , char * argv [ ] ) { <nl> + CHAR path [ MAX_PATH ] ; <nl> + <nl> + if ( ! GetModuleFileNameA ( NULL , path , MAX_PATH ) ) { <nl> + cout < < " FATAL : GetModuleFileNameA failed " < < endl ; <nl> + exit ( EXIT_FAILURE ) ; <nl> + } <nl> + <nl> + / / build command <nl> + string command ; <nl> + <nl> + command + = " \ " " ; <nl> + command + = path ; <nl> + command + = " \ " " ; <nl> + <nl> + command + = " - - start - service " ; <nl> + <nl> + / / register service <nl> + InstallServiceCommand ( command ) ; <nl> + } <nl> + <nl> + # endif <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief deletes a windows service <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + # ifdef _WIN32 <nl> + <nl> + static void DeleteService ( int argc , char * argv [ ] ) { <nl> + cout < < " INFO : removing service ' " < < ServiceName < < " ' " < < endl ; <nl> + <nl> + SC_HANDLE schSCManager = OpenSCManager ( NULL , SERVICES_ACTIVE_DATABASE , SC_MANAGER_ALL_ACCESS ) ; <nl> + <nl> + if ( schSCManager = = 0 ) { <nl> + cout < < " FATAL : OpenSCManager failed with " < < GetLastError ( ) < < endl ; <nl> + exit ( EXIT_FAILURE ) ; <nl> + } <nl> + <nl> + SC_HANDLE schService = OpenServiceA ( <nl> + schSCManager , / / SCManager database <nl> + ServiceName . c_str ( ) , / / name of service <nl> + DELETE ) ; / / only need DELETE access <nl> + <nl> + CloseServiceHandle ( schSCManager ) ; <nl> + <nl> + if ( schService = = 0 ) { <nl> + cout < < " FATAL : OpenServiceA failed with " < < GetLastError ( ) < < endl ; <nl> + exit ( EXIT_FAILURE ) ; <nl> + } <nl> + <nl> + if ( ! DeleteService ( schService ) ) { <nl> + cout < < " FATAL : DeleteService failed with " < < GetLastError ( ) < < endl ; <nl> + exit ( EXIT_FAILURE ) ; <nl> + } <nl> + <nl> + CloseServiceHandle ( schService ) ; <nl> + } <nl> + <nl> + # endif <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief deletes a windows service <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + # ifdef _WIN32 <nl> + <nl> + static void SetServiceStatus ( DWORD dwCurrentState , DWORD dwWin32ExitCode , DWORD dwCheckPoint , DWORD dwWaitHint ) { <nl> + <nl> + / / disable control requests until the service is started <nl> + SERVICE_STATUS ss ; <nl> + <nl> + if ( dwCurrentState = = SERVICE_START_PENDING | | dwCurrentState = = SERVICE_STOP_PENDING ) { <nl> + ss . dwControlsAccepted = 0 ; <nl> + } <nl> + else { <nl> + ss . dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN ; <nl> + } <nl> + <nl> + / / initialize ss structure <nl> + ss . dwServiceType = SERVICE_WIN32_OWN_PROCESS ; <nl> + ss . dwServiceSpecificExitCode = 0 ; <nl> + ss . dwCurrentState = dwCurrentState ; <nl> + ss . dwWin32ExitCode = dwWin32ExitCode ; <nl> + ss . dwCheckPoint = dwCheckPoint ; <nl> + ss . dwWaitHint = dwWaitHint ; <nl> + <nl> + / / Send status of the service to the Service Controller . <nl> + if ( ! SetServiceStatus ( ServiceStatus , & ss ) ) { <nl> + ss . dwCurrentState = SERVICE_STOP_PENDING ; <nl> + ss . dwControlsAccepted = 0 ; <nl> + SetServiceStatus ( ServiceStatus , & ss ) ; <nl> + <nl> + if ( ArangoInstance ! = 0 ) { <nl> + ArangoInstance - > beginShutdown ( ) ; <nl> + } <nl> + <nl> + ss . dwCurrentState = SERVICE_STOPPED ; <nl> + SetServiceStatus ( ServiceStatus , & ss ) ; <nl> + } <nl> + } <nl> + <nl> + # endif <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief service control handler <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + # ifdef _WIN32 <nl> + <nl> + static void WINAPI ServiceCtrl ( DWORD dwCtrlCode ) { <nl> + DWORD dwState = SERVICE_RUNNING ; <nl> + <nl> + switch ( dwCtrlCode ) { <nl> + case SERVICE_CONTROL_STOP : <nl> + case SERVICE_CONTROL_SHUTDOWN : <nl> + dwState = SERVICE_STOP_PENDING ; <nl> + break ; <nl> + <nl> + case SERVICE_CONTROL_INTERROGATE : <nl> + break ; <nl> + <nl> + default : <nl> + break ; <nl> + } <nl> + <nl> + / / stop service <nl> + if ( dwCtrlCode = = SERVICE_CONTROL_STOP | | dwCtrlCode = = SERVICE_CONTROL_SHUTDOWN ) { <nl> + SetServiceStatus ( SERVICE_STOP_PENDING , NO_ERROR , 0 , 0 ) ; <nl> + <nl> + if ( ArangoInstance ! = 0 ) { <nl> + ArangoInstance - > beginShutdown ( ) ; <nl> + <nl> + while ( IsRunning ) { <nl> + Sleep ( 100 ) ; <nl> + } <nl> + } <nl> + } <nl> + else { <nl> + SetServiceStatus ( dwState , NO_ERROR , 0 , 0 ) ; <nl> + } <nl> + } <nl> + <nl> + # endif <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief starts server as service <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + # ifdef _WIN32 <nl> + <nl> + static int ARGC ; <nl> + static char * * ARGV ; <nl> + <nl> + static void WINAPI ServiceMain ( DWORD dwArgc , LPSTR * lpszArgv ) { <nl> + <nl> + / / register the service ctrl handler , lpszArgv [ 0 ] contains service name <nl> + ServiceStatus = RegisterServiceCtrlHandlerA ( lpszArgv [ 0 ] , ( LPHANDLER_FUNCTION ) ServiceCtrl ) ; <nl> + <nl> + / / set start pending <nl> + SetServiceStatus ( SERVICE_START_PENDING , 0 , 0 , 0 ) ; <nl> + <nl> + / / start palo <nl> + SetServiceStatus ( SERVICE_RUNNING , 0 , 0 , 0 ) ; <nl> + <nl> + IsRunning = true ; <nl> + ArangoInstance = new ArangoServer ( ARGC , ARGV ) ; <nl> + ArangoInstance - > start ( ) ; <nl> + IsRunning = false ; <nl> + <nl> + / / service has stopped <nl> + SetServiceStatus ( SERVICE_STOPPED , NO_ERROR , 0 , 0 ) ; <nl> + } <nl> + <nl> + # endif <nl> + <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + / / - - SECTION - - public functions <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief creates an application server <nl> static void arangodExitFunction ( int exitCode , void * data ) { <nl> int main ( int argc , char * argv [ ] ) { <nl> int res = 0 ; <nl> <nl> - arangodEntryFunction ( ) ; <nl> + # ifdef _WIN32 <nl> + bool startAsService = false ; <nl> + <nl> + if ( 1 < argc ) { <nl> + if ( TRI_EqualString ( argv [ 1 ] , " - - install - service " ) ) { <nl> + InstallService ( argc , argv ) ; <nl> + exit ( EXIT_SUCCESS ) ; <nl> + } <nl> + else if ( TRI_EqualString ( argv [ 1 ] , " - - uninstall - service " ) ) { <nl> + DeleteService ( argc , argv ) ; <nl> + exit ( EXIT_SUCCESS ) ; <nl> + } <nl> + else if ( TRI_EqualString ( argv [ 1 ] , " - - start - service " ) ) { <nl> + startAsService = true ; <nl> + } <nl> + } <nl> <nl> + # endif <nl> + <nl> + / / initialise sub - systems <nl> + TRI_GlobalEntryFunction ( ) ; <nl> TRIAGENS_REST_INITIALISE ( argc , argv ) ; <nl> <nl> / / create and start a ArangoDB server <nl> - ArangoServer server ( argc , argv ) ; <nl> <nl> - res = server . start ( ) ; <nl> + # ifdef _WIN32 <nl> + <nl> + if ( startAsService ) { <nl> + SERVICE_TABLE_ENTRY ste [ ] = { <nl> + { TEXT ( " " ) , ( LPSERVICE_MAIN_FUNCTION ) ServiceMain } , <nl> + { NULL , NULL } <nl> + } ; <nl> <nl> - / / shutdown <nl> - TRIAGENS_REST_SHUTDOWN ; <nl> + ARGC = argc ; <nl> + ARGV = argv ; <nl> + <nl> + if ( ! StartServiceCtrlDispatcher ( ste ) ) { <nl> + cout < < " FATAL : StartServiceCtrlDispatcher has failed with " < < GetLastError ( ) < < endl ; <nl> + exit ( EXIT_SUCCESS ) ; <nl> + } <nl> + } <nl> + else { <nl> + ArangoInstance = new ArangoServer ( argc , argv ) ; <nl> + res = ArangoInstance - > start ( ) ; <nl> + } <nl> <nl> - arangodExitFunction ( res , NULL ) ; <nl> + # else <nl> + <nl> + ArangoInstance = new ArangoServer ( argc , argv ) ; <nl> + res = ArangoInstance - > start ( ) ; <nl> + <nl> + # endif <nl> + <nl> + / / shutdown sub - systems <nl> + TRIAGENS_REST_SHUTDOWN ; <nl> + TRI_GlobalExitFunction ( res , NULL ) ; <nl> <nl> return res ; <nl> } <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + / / - - SECTION - - END - OF - FILE <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> / / Local Variables : <nl> / / mode : outline - minor <nl> mmm a / arangod / VocBase / server . c <nl> ppp b / arangod / VocBase / server . c <nl> int TRI_StartServer ( TRI_server_t * server , <nl> <nl> res = TRI_VerifyLockFile ( server - > _lockFilename ) ; <nl> <nl> - if ( res = = TRI_ERROR_NO_ERROR ) { <nl> + if ( res ! = TRI_ERROR_NO_ERROR ) { <nl> LOG_ERROR ( " database is locked , please check the lock file ' % s ' " , <nl> server - > _lockFilename ) ; <nl> <nl> mmm a / arangod / VocBase / vocbase . c <nl> ppp b / arangod / VocBase / vocbase . c <nl> void TRI_DestroyVocBase ( TRI_vocbase_t * vocbase ) { <nl> / / stop replication <nl> TRI_StopReplicationApplier ( vocbase - > _replicationApplier , false ) ; <nl> TRI_StopReplicationLogger ( vocbase - > _replicationLogger ) ; <nl> - <nl> + <nl> TRI_InitVectorPointer ( & collections , TRI_UNKNOWN_MEM_ZONE ) ; <nl> <nl> TRI_WRITE_LOCK_COLLECTIONS_VOCBASE ( vocbase ) ; <nl> old mode 100644 <nl> new mode 100755 <nl> index 4c45836ab70 . . e3ceb235e2e <nl> mmm a / arangoirb / CMakeLists . txt <nl> ppp b / arangoirb / CMakeLists . txt <nl> include_directories ( $ { PROJECT_SOURCE_DIR } / arangosh ) <nl> # # # @ brief output directory <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - set ( CMAKE_RUNTIME_OUTPUT_DIRECTORY " $ { PROJECT_BINARY_DIR } / bin / " ) <nl> + set ( CMAKE_RUNTIME_OUTPUT_DIRECTORY " $ { PROJECT_BINARY_DIR } / bin " ) <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief arangoirb <nl> target_link_libraries ( <nl> $ { ZLIB_LIBS } <nl> $ { READLINE_LIBS } <nl> $ { OPENSSL_LIBS } <nl> + $ { MSVC_LIBS } <nl> ) <nl> <nl> install ( <nl> TARGETS $ { BIN_ARANGOIRB } <nl> - RUNTIME DESTINATION bin ) <nl> + RUNTIME DESTINATION $ { TRI_BINDIR_INSTALL } ) <nl> <nl> - if ( USE_RAW_CONFIG ) <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangoirb . conf . in <nl> - DESTINATION $ { ETCDIR_INSTALL } <nl> - RENAME arangoirb - relative . conf ) <nl> - endif ( ) <nl> - <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangoirb . conf <nl> - DESTINATION $ { ETCDIR_INSTALL } ) <nl> + install_config ( arangoirb ) <nl> <nl> install ( <nl> DIRECTORY $ { PROJECT_SOURCE_DIR } / mr / common $ { PROJECT_SOURCE_DIR } / mr / client <nl> mmm a / arangosh / ArangoShell / ArangoClient . cpp <nl> ppp b / arangosh / ArangoShell / ArangoClient . cpp <nl> void ArangoClient : : parse ( ProgramOptions & options , <nl> } <nl> <nl> <nl> - # ifdef _SYSCONFDIR_ <nl> else { <nl> - / / use packaged config file from etc / relative <nl> - string sysDir = string ( _SYSCONFDIR_ ) ; <nl> - string systemConfigFile = initFilename ; <nl> + char * d = TRI_LocateConfigDirectory ( ) ; <nl> <nl> - if ( ! sysDir . empty ( ) ) { <nl> - if ( sysDir [ sysDir . size ( ) - 1 ] ! = TRI_DIR_SEPARATOR_CHAR ) { <nl> - sysDir + = TRI_DIR_SEPARATOR_CHAR + systemConfigFile ; <nl> - } <nl> - else { <nl> - sysDir + = systemConfigFile ; <nl> - } <nl> + if ( d ! = 0 ) { <nl> + string sysDir = string ( d ) + initFilename ; <nl> + TRI_FreeString ( TRI_CORE_MEM_ZONE , d ) ; <nl> <nl> if ( FileUtils : : exists ( sysDir ) ) { <nl> configFile = sysDir ; <nl> void ArangoClient : : parse ( ProgramOptions & options , <nl> } <nl> } <nl> } <nl> - # endif <nl> <nl> if ( ! configFile . empty ( ) ) { <nl> LOG_DEBUG ( " using init file ' % s ' " , configFile . c_str ( ) ) ; <nl> mmm a / arangosh / CMakeLists . txt <nl> ppp b / arangosh / CMakeLists . txt <nl> include_directories ( $ { PROJECT_SOURCE_DIR } / lib ) <nl> # # # @ brief output directory <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - set ( CMAKE_RUNTIME_OUTPUT_DIRECTORY " $ { PROJECT_BINARY_DIR } / bin / " ) <nl> + set ( CMAKE_RUNTIME_OUTPUT_DIRECTORY " $ { PROJECT_BINARY_DIR } / bin " ) <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief arangob <nl> target_link_libraries ( <nl> $ { ZLIB_LIBS } <nl> $ { READLINE_LIBS } <nl> $ { OPENSSL_LIBS } <nl> + $ { MSVC_LIBS } <nl> ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arangob binary <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> install ( <nl> TARGETS $ { BIN_ARANGOB } <nl> - RUNTIME DESTINATION bin ) <nl> + RUNTIME DESTINATION $ { TRI_BINDIR_INSTALL } ) <nl> <nl> - if ( USE_RAW_CONFIG ) <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangob . conf . in <nl> - DESTINATION $ { ETCDIR_INSTALL } <nl> - RENAME arangob - relative . conf ) <nl> - endif ( ) <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arangob config <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangob . conf <nl> - DESTINATION $ { ETCDIR_INSTALL } ) <nl> - <nl> - install ( <nl> - DIRECTORY $ { PROJECT_SOURCE_DIR } / js / common $ { PROJECT_SOURCE_DIR } / js / client <nl> - DESTINATION share / arangodb / js <nl> - FILES_MATCHING PATTERN " * . js " <nl> - REGEX " ^ . * / common / test - data $ " EXCLUDE <nl> - REGEX " ^ . * / common / tests $ " EXCLUDE <nl> - REGEX " ^ . * / client / tests $ " EXCLUDE ) <nl> + install_config ( arangob ) <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief arangodump <nl> target_link_libraries ( <nl> $ { ZLIB_LIBS } <nl> $ { READLINE_LIBS } <nl> $ { OPENSSL_LIBS } <nl> + $ { MSVC_LIBS } <nl> ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arangodump binary <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> install ( <nl> TARGETS $ { BIN_ARANGODUMP } <nl> - RUNTIME DESTINATION bin ) <nl> + RUNTIME DESTINATION $ { TRI_BINDIR_INSTALL } ) <nl> <nl> - if ( USE_RAW_CONFIG ) <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangodump . conf . in <nl> - DESTINATION $ { ETCDIR_INSTALL } <nl> - RENAME arangodump - relative . conf ) <nl> - endif ( ) <nl> - <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangodump . conf <nl> - DESTINATION $ { ETCDIR_INSTALL } ) <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arangodump config <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - install ( <nl> - DIRECTORY $ { PROJECT_SOURCE_DIR } / js / common $ { PROJECT_SOURCE_DIR } / js / client <nl> - DESTINATION share / arangodb / js <nl> - FILES_MATCHING PATTERN " * . js " <nl> - REGEX " ^ . * / common / test - data $ " EXCLUDE <nl> - REGEX " ^ . * / common / tests $ " EXCLUDE <nl> - REGEX " ^ . * / client / tests $ " EXCLUDE ) <nl> + install_config ( arangodump ) <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief arangoimp <nl> target_link_libraries ( <nl> $ { ZLIB_LIBS } <nl> $ { READLINE_LIBS } <nl> $ { OPENSSL_LIBS } <nl> + $ { MSVC_LIBS } <nl> ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arangoimp binary <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> install ( <nl> TARGETS $ { BIN_ARANGOIMP } <nl> - RUNTIME DESTINATION bin ) <nl> + RUNTIME DESTINATION $ { TRI_BINDIR_INSTALL } ) <nl> <nl> - if ( USE_RAW_CONFIG ) <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangoimp . conf . in <nl> - DESTINATION $ { ETCDIR_INSTALL } <nl> - RENAME arangoimp - relative . conf ) <nl> - endif ( ) <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arangoimp config <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangoimp . conf <nl> - DESTINATION $ { ETCDIR_INSTALL } ) <nl> - <nl> - install ( <nl> - DIRECTORY $ { PROJECT_SOURCE_DIR } / js / common $ { PROJECT_SOURCE_DIR } / js / client <nl> - DESTINATION share / arangodb / js <nl> - FILES_MATCHING PATTERN " * . js " <nl> - REGEX " ^ . * / common / test - data $ " EXCLUDE <nl> - REGEX " ^ . * / common / tests $ " EXCLUDE <nl> - REGEX " ^ . * / client / tests $ " EXCLUDE ) <nl> + install_config ( arangoimp ) <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief arangorestore <nl> target_link_libraries ( <nl> $ { ZLIB_LIBS } <nl> $ { READLINE_LIBS } <nl> $ { OPENSSL_LIBS } <nl> + $ { MSVC_LIBS } <nl> ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arangorestore binary <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> install ( <nl> TARGETS $ { BIN_ARANGORESTORE } <nl> - RUNTIME DESTINATION bin ) <nl> - <nl> - if ( USE_RAW_CONFIG ) <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangorestore . conf . in <nl> - DESTINATION $ { ETCDIR_INSTALL } <nl> - RENAME arangorestore - relative . conf ) <nl> - endif ( ) <nl> + RUNTIME DESTINATION $ { TRI_BINDIR_INSTALL } ) <nl> <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangorestore . conf <nl> - DESTINATION $ { ETCDIR_INSTALL } ) <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arangorestore config <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - install ( <nl> - DIRECTORY $ { PROJECT_SOURCE_DIR } / js / common $ { PROJECT_SOURCE_DIR } / js / client <nl> - DESTINATION share / arangodb / js <nl> - FILES_MATCHING PATTERN " * . js " <nl> - REGEX " ^ . * / common / test - data $ " EXCLUDE <nl> - REGEX " ^ . * / common / tests $ " EXCLUDE <nl> - REGEX " ^ . * / client / tests $ " EXCLUDE ) <nl> + install_config ( arangorestore ) <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief arangosh <nl> target_link_libraries ( <nl> $ { ZLIB_LIBS } <nl> $ { READLINE_LIBS } <nl> $ { OPENSSL_LIBS } <nl> + $ { MSVC_LIBS } <nl> ) <nl> <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arangosh binary <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> install ( <nl> TARGETS $ { BIN_ARANGOSH } <nl> - RUNTIME DESTINATION bin ) <nl> + RUNTIME DESTINATION $ { TRI_BINDIR_INSTALL } ) <nl> <nl> - if ( USE_RAW_CONFIG ) <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangosh . conf . in <nl> - DESTINATION $ { ETCDIR_INSTALL } <nl> - RENAME arangosh - relative . conf ) <nl> - endif ( ) <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install arangosh config <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> - install ( <nl> - FILES $ { PROJECT_SOURCE_DIR } / etc / arangodb / arangosh . conf <nl> - DESTINATION $ { ETCDIR_INSTALL } ) <nl> + install_config ( arangosh ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install foxx - manager binary <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + install_command_alias ( $ { BIN_ARANGOSH } $ { TRI_BINDIR_INSTALL } foxx - manager ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install foxx - manager config <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + <nl> + install_config ( foxx - manager ) <nl> + <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> + # # # @ brief install client - side JavaScript files <nl> + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> <nl> install ( <nl> DIRECTORY $ { PROJECT_SOURCE_DIR } / js / common $ { PROJECT_SOURCE_DIR } / js / client <nl> mmm a / arangosh / V8Client / arangosh . cpp <nl> ppp b / arangosh / V8Client / arangosh . cpp <nl> using namespace triagens : : arango ; <nl> <nl> static std : : string DeprecatedPath ; <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief command prompt <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + static string Prompt = " arangosh [ % d ] > " ; <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief base class for clients <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> static vector < string > UnitTests ; <nl> <nl> static vector < string > JsLint ; <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief command prompt <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> - static string Prompt = " arangosh [ % u @ % d ] > " ; <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief garbage collection interval <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> static v8 : : Handle < v8 : : Value > JS_ImportJsonFile ( v8 : : Arguments const & argv ) { <nl> } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief normalize UTF 16 strings <nl> + / / / @ brief normalizes UTF 16 strings <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> static v8 : : Handle < v8 : : Value > JS_normalize_string ( v8 : : Arguments const & argv ) { <nl> static v8 : : Handle < v8 : : Value > JS_compare_string ( v8 : : Arguments const & argv ) { <nl> } <nl> <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> - / / - - SECTION - - private functions <nl> + / / - - SECTION - - private enums <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief return a new client connection instance <nl> + / / / @ brief enum for wrapped V8 objects <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> - static V8ClientConnection * CreateConnection ( ) { <nl> - return new V8ClientConnection ( BaseClient . endpointServer ( ) , <nl> - BaseClient . databaseName ( ) , <nl> - BaseClient . username ( ) , <nl> - BaseClient . password ( ) , <nl> - BaseClient . requestTimeout ( ) , <nl> - BaseClient . connectTimeout ( ) , <nl> - ArangoClient : : DEFAULT_RETRIES , <nl> - BaseClient . sslProtocol ( ) , <nl> - false ) ; <nl> - } <nl> + enum WRAP_CLASS_TYPES { WRAP_TYPE_CONNECTION = 1 } ; <nl> + <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + / / - - SECTION - - private functions <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief parses the program options <nl> static vector < string > ParseProgramOptions ( int argc , char * argv [ ] ) { <nl> <nl> / / and parse the command line and config file <nl> ProgramOptions options ; <nl> - BaseClient . parse ( options , description , argc , argv , " arangosh . conf " ) ; <nl> + <nl> + char * p = TRI_BinaryName ( argv [ 0 ] ) ; <nl> + string conf = p ; <nl> + TRI_FreeString ( TRI_CORE_MEM_ZONE , p ) ; <nl> + conf + = " . conf " ; <nl> + <nl> + BaseClient . parse ( options , description , argc , argv , conf ) ; <nl> <nl> / / set V8 options <nl> v8 : : V8 : : SetFlagsFromCommandLine ( & argc , argv , true ) ; <nl> static vector < string > ParseProgramOptions ( int argc , char * argv [ ] ) { <nl> } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief copy v8 : : Object to std : : map < string , string > <nl> + / / / @ brief copies v8 : : Object to std : : map < string , string > <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> static void objectToMap ( map < string , string > & myMap , v8 : : Handle < v8 : : Value > val ) { <nl> v8 : : Handle < v8 : : Object > v8Headers = val . As < v8 : : Object > ( ) ; <nl> + <nl> if ( v8Headers - > IsObject ( ) ) { <nl> v8 : : Handle < v8 : : Array > props = v8Headers - > GetPropertyNames ( ) ; <nl> + <nl> for ( uint32_t i = 0 ; i < props - > Length ( ) ; i + + ) { <nl> v8 : : Handle < v8 : : Value > key = props - > Get ( v8 : : Integer : : New ( i ) ) ; <nl> myMap [ TRI_ObjectToString ( key ) ] = TRI_ObjectToString ( v8Headers - > Get ( key ) ) ; <nl> static void objectToMap ( map < string , string > & myMap , v8 : : Handle < v8 : : Value > val ) <nl> } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief ClientConnection class <nl> + / / / @ brief returns a new client connection instance <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> - enum WRAP_CLASS_TYPES { WRAP_TYPE_CONNECTION = 1 } ; <nl> + static V8ClientConnection * CreateConnection ( ) { <nl> + return new V8ClientConnection ( BaseClient . endpointServer ( ) , <nl> + BaseClient . databaseName ( ) , <nl> + BaseClient . username ( ) , <nl> + BaseClient . password ( ) , <nl> + BaseClient . requestTimeout ( ) , <nl> + BaseClient . connectTimeout ( ) , <nl> + ArangoClient : : DEFAULT_RETRIES , <nl> + BaseClient . sslProtocol ( ) , <nl> + false ) ; <nl> + } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief weak reference callback for queries ( call the destructor here ) <nl> static void arangoshExitFunction ( int , void * ) ; <nl> <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> / / Call this function to do various initialistions for windows only <nl> + / / <nl> + / / TODO can we move this to a general function for all binaries ? <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> <nl> void arangoshEntryFunction ( ) { <nl> int main ( int argc , char * argv [ ] ) { <nl> if ( CodePage > 0 ) { <nl> SetConsoleOutputCP ( ( UINT ) CodePage ) ; <nl> } <nl> + <nl> + / / TODO we should have a special " printf " which can handle the color escape sequences ! <nl> SetConsoleTextAttribute ( GetStdHandle ( STD_OUTPUT_HANDLE ) , greenColour ) ; <nl> printf ( " " ) ; <nl> SetConsoleTextAttribute ( GetStdHandle ( STD_OUTPUT_HANDLE ) , redColour ) ; <nl> mmm a / etc / Makefile . files <nl> ppp b / etc / Makefile . files <nl> <nl> # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> BUILT_SOURCES + = \ <nl> + etc / arangodb / arango - dfdb . conf \ <nl> etc / arangodb / arangob . conf \ <nl> etc / arangodb / arangod . conf \ <nl> etc / arangodb / arangodump . conf \ <nl> etc / arangodb / arangoimp . conf \ <nl> etc / arangodb / arangoirb . conf \ <nl> etc / arangodb / arangorestore . conf \ <nl> - etc / arangodb / arangosh . conf <nl> + etc / arangodb / arangosh . conf \ <nl> + etc / arangodb / foxx - manager . conf <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> # # # @ brief config <nl> new file mode 100644 <nl> index 00000000000 . . fce68053ace <nl> mmm / dev / null <nl> ppp b / etc / arangodb / arango - dfdb . conf . in <nl> <nl> + no - upgrade = true <nl> + <nl> + [ database ] <nl> + directory = @ LOCALSTATEDIR @ / lib / arangodb <nl> + # maximal - journal - size = 33554432 <nl> + # remove - on - drop = true <nl> + <nl> + [ javascript ] <nl> + startup - directory = @ PKGDATADIR @ / js <nl> + modules - path = @ PKGDATADIR @ / js / server / modules ; @ PKGDATADIR @ / js / common / modules ; @ PKGDATADIR @ / js / node <nl> + package - path = @ PKGDATADIR @ / js / npm <nl> + app - path = @ LOCALSTATEDIR @ / lib / arangodb - apps <nl> + <nl> + [ log ] <nl> + level = info <nl> + severity = human <nl> mmm a / etc / arangodb / arangod . conf . in <nl> ppp b / etc / arangodb / arangod . conf . in <nl> <nl> # <nl> <nl> [ database ] <nl> - directory = @ LOCALSTATEDIR @ / lib / arangodb <nl> - # maximal - journal - size = 33554432 <nl> - # remove - on - drop = true <nl> + directory = @ LOCALSTATEDIR @ / lib / arangodb <nl> + # directory = @ HOMEDRIVE @ / @ HOMEPATH @ / arangodb / databases <nl> + <nl> + # maximal - journal - size = 33554432 <nl> + # remove - on - drop = true <nl> <nl> [ server ] <nl> # Specify the endpoint for HTTP requests by clients . <nl> endpoint = tcp : / / 0 . 0 . 0 . 0 : 8529 <nl> <nl> disable - authentication = yes <nl> threads = 5 <nl> + <nl> + # the user and group are normally set in the start script <nl> # uid = arangodb <nl> # gid = arangodb <nl> <nl> threads = 3 <nl> [ javascript ] <nl> startup - directory = @ PKGDATADIR @ / js <nl> app - path = @ LOCALSTATEDIR @ / lib / arangodb - apps <nl> + # app - path = @ HOMEDRIVE @ / @ HOMEPATH @ / arangodb / apps <nl> <nl> [ ruby ] <nl> action - directory = @ PKGDATADIR @ / mr / actions <nl> new file mode 100644 <nl> index 00000000000 . . 32727ed8910 <nl> mmm / dev / null <nl> ppp b / etc / arangodb / foxx - manager . conf . in <nl> <nl> + pretty - print = true <nl> + <nl> + [ server ] <nl> + endpoint = tcp : / / localhost : 8529 <nl> + disable - authentication = true <nl> + <nl> + [ javascript ] <nl> + startup - directory = @ PKGDATADIR @ / js <nl> + modules - path = @ PKGDATADIR @ / js / client / modules ; @ PKGDATADIR @ / js / common / modules ; @ PKGDATADIR @ / js / node <nl> + package - path = @ PKGDATADIR @ / js / npm <nl> + execute - string = require ( " org / arangodb / foxx / manager " ) . run ( ARGUMENTS ) ; <nl> new file mode 100644 <nl> index 00000000000 . . 8b38005eef0 <nl> mmm / dev / null <nl> ppp b / etc / relative / arango - dfdb . conf <nl> <nl> + no - upgrade = true <nl> + <nl> + [ database ] <nl> + # directory = / var / arangodb <nl> + # maximal - journal - size = 33554432 <nl> + # remove - on - drop = true <nl> + <nl> + [ javascript ] <nl> + startup - directory = . / js <nl> + modules - path = . / js / server / modules ; . / js / common / modules ; . / js / node <nl> + package - path = . / js / npm <nl> + app - path = . / js / apps <nl> + script = . / js / server / arango - dfdb . js <nl> + <nl> + [ log ] <nl> + level = info <nl> + severity = human <nl> new file mode 100644 <nl> index 00000000000 . . 77bb7528df7 <nl> mmm / dev / null <nl> ppp b / etc / relative / foxx - manager . conf <nl> <nl> + pretty - print = true <nl> + <nl> + [ server ] <nl> + disable - authentication = true <nl> + <nl> + [ javascript ] <nl> + startup - directory = . / js <nl> + modules - path = . / js / client / modules ; . / js / common / modules ; . / js / node <nl> + package - path = . / js / npm <nl> + execute - string = require ( " org / arangodb / foxx / manager " ) . run ( ARGUMENTS ) ; <nl> mmm a / etc / systemd / arangodb . service <nl> ppp b / etc / systemd / arangodb . service <nl> After = syslog . target network . target <nl> Type = forking <nl> PIDFile = / var / run / arangodb / arangod . pid <nl> ExecStartPre = / usr / bin / install - g arangodb - o arangodb - d / var / run / arangodb <nl> - ExecStart = / usr / sbin / arangod - c / etc / arangodb / arangod - uid . conf - - pid - file / var / run / arangodb / arangod . pid - - supervisor <nl> + ExecStart = / usr / sbin / arangod - c / etc / arangodb / arangod . conf - - uid arangodb - - gid arangodb - - pid - file / var / run / arangodb / arangod . pid - - supervisor <nl> <nl> [ Install ] <nl> WantedBy = multi - user . target <nl> deleted file mode 100644 <nl> index 911ea9b2758 . . 00000000000 <nl> Binary files a / js / apps / system / aardvark / frontend / img / gv_collapse_reverse . png and / dev / null differ <nl> mmm a / js / common / modules / org / arangodb / graph / algorithms - common . js <nl> ppp b / js / common / modules / org / arangodb / graph / algorithms - common . js <nl> <nl> <nl> var graph = require ( " org / arangodb / graph " ) ; <nl> <nl> + var Edge = graph . Edge ; <nl> var Graph = graph . Graph ; <nl> var Vertex = graph . Vertex ; <nl> <nl> Graph . prototype . measurement = function ( measurement ) { <nl> / / / <nl> / / / Calculates the normalized degree , closeness , betweenness or eccentricity <nl> / / / of all vertices in a graph <nl> + / / / ` measurement ` can either be : <nl> + / / / - ` closeness ` : to calculate the closeness <nl> + / / / - ` betweenness ` : to calculate the betweenness <nl> + / / / - ` eccentricity ` : to calculate the eccentricity <nl> / / / <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> mmm a / js / server / tests / compaction . js <nl> ppp b / js / server / tests / compaction . js <nl> function CompactionSuite ( ) { <nl> assertTrue ( 0 < = fig [ " dead " ] [ " size " ] ) ; <nl> assertTrue ( 0 < = fig [ " dead " ] [ " deletion " ] ) ; <nl> assertTrue ( 0 < = fig [ " journals " ] [ " count " ] ) ; <nl> - assertTrue ( 0 < fig [ " datafiles " ] [ " count " ] ) ; <nl> + assertTrue ( 0 < = fig [ " datafiles " ] [ " count " ] ) ; <nl> <nl> / / wait for compactor to run <nl> require ( " console " ) . log ( " waiting for compactor to run " ) ; <nl> mmm a / lib / ApplicationServer / ApplicationServer . cpp <nl> ppp b / lib / ApplicationServer / ApplicationServer . cpp <nl> <nl> # include " Basics / delete_object . h " <nl> # include " BasicsC / conversions . h " <nl> # include " BasicsC / logging . h " <nl> + # include " BasicsC / files . h " <nl> + # include " BasicsC / tri - strings . h " <nl> <nl> using namespace triagens : : basics ; <nl> using namespace triagens : : rest ; <nl> ApplicationServer : : ApplicationServer ( std : : string const & name , std : : string const <nl> _configFile ( ) , <nl> _userConfigFile ( ) , <nl> _systemConfigFile ( ) , <nl> - _systemConfigPath ( ) , <nl> _uid ( ) , <nl> _realUid ( 0 ) , <nl> _effectiveUid ( 0 ) , <nl> ApplicationServer : : ApplicationServer ( std : : string const & name , std : : string const <nl> _configFile ( ) , <nl> _userConfigFile ( ) , <nl> _systemConfigFile ( ) , <nl> - _systemConfigPath ( ) , <nl> _uid ( ) , <nl> _realUid ( 0 ) , <nl> _effectiveUid ( 0 ) , <nl> void ApplicationServer : : addFeature ( ApplicationFeature * feature ) { <nl> } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief sets the name of the system config file with a path <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> - void ApplicationServer : : setSystemConfigFile ( std : : string const & name , std : : string const & path ) { <nl> - _systemConfigFile = name ; <nl> - _systemConfigPath = path ; <nl> - } <nl> - <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief sets the name of the system config file without a path <nl> + / / / @ brief sets the name of the system config file <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> void ApplicationServer : : setSystemConfigFile ( std : : string const & name ) { <nl> - return setSystemConfigFile ( name , " " ) ; <nl> + _systemConfigFile = name ; <nl> } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> bool ApplicationServer : : readConfigurationFile ( ) { <nl> / / A safer approach below <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> <nl> - string homeDir = FileUtils : : homeDirectory ( ) ; <nl> + string homeDir = FileUtils : : homeDirectory ( ) ; / / TODO homedirectory should either always or never end in " / " <nl> <nl> if ( ! homeDir . empty ( ) ) { <nl> if ( homeDir [ homeDir . size ( ) - 1 ] ! = TRI_DIR_SEPARATOR_CHAR ) { <nl> bool ApplicationServer : : readConfigurationFile ( ) { <nl> } <nl> <nl> <nl> - if ( _systemConfigPath . empty ( ) ) { <nl> - <nl> - # ifdef _SYSCONFDIR_ <nl> - <nl> - / / try the configuration file in the system directory - if there is one <nl> + / / try the configuration file in the system directory - if there is one <nl> + if ( ! _systemConfigFile . empty ( ) ) { <nl> <nl> / / Please note that the system directory changes depending on <nl> / / where the user installed the application server . <nl> <nl> - if ( ! _systemConfigFile . empty ( ) ) { <nl> - string sysDir = string ( _SYSCONFDIR_ ) ; <nl> - <nl> - if ( ! sysDir . empty ( ) ) { <nl> - if ( sysDir [ sysDir . size ( ) - 1 ] ! = TRI_DIR_SEPARATOR_CHAR ) { <nl> - sysDir + = TRI_DIR_SEPARATOR_CHAR + _systemConfigFile ; <nl> - } <nl> - else { <nl> - sysDir + = _systemConfigFile ; <nl> - } <nl> - <nl> - / / check and see if file exists <nl> - if ( FileUtils : : exists ( sysDir ) ) { <nl> - LOG_INFO ( " using init file ' % s ' " , sysDir . c_str ( ) ) ; <nl> - <nl> - bool ok = _options . parse ( _descriptionFile , sysDir ) ; <nl> + char * d = TRI_LocateConfigDirectory ( ) ; <nl> <nl> - / / Observe that this is treated as an error - the configuration file exists <nl> - / / but for some reason can not be parsed . Best to report an error . <nl> - <nl> - if ( ! ok ) { <nl> - LOG_ERROR ( " cannot parse config file ' % s ' : % s " , sysDir . c_str ( ) , _options . lastError ( ) . c_str ( ) ) ; <nl> - } <nl> - <nl> - return ok ; <nl> - } <nl> - else { <nl> - LOG_INFO ( " no system init file ' % s ' found " , sysDir . c_str ( ) ) ; <nl> - } <nl> - } <nl> - else { <nl> - LOG_DEBUG ( " no system init file , not system directory is known " ) ; <nl> - } <nl> - } <nl> - <nl> - # endif <nl> - <nl> - } <nl> - else { <nl> - if ( ! _systemConfigFile . empty ( ) ) { <nl> - string sysDir = _systemConfigPath + TRI_DIR_SEPARATOR_CHAR + _systemConfigFile ; <nl> + if ( d ! = 0 ) { <nl> + string sysDir = string ( d ) + _systemConfigFile ; <nl> + TRI_FreeString ( TRI_CORE_MEM_ZONE , d ) ; <nl> <nl> / / check and see if file exists <nl> if ( FileUtils : : exists ( sysDir ) ) { <nl> mmm a / lib / ApplicationServer / ApplicationServer . h <nl> ppp b / lib / ApplicationServer / ApplicationServer . h <nl> namespace triagens { <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> class ApplicationServer { <nl> - private : <nl> - ApplicationServer ( const ApplicationServer & ) ; <nl> - ApplicationServer & operator = ( const ApplicationServer & ) ; <nl> + ApplicationServer ( const ApplicationServer & ) ; <nl> + ApplicationServer & operator = ( const ApplicationServer & ) ; <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ } <nl> namespace triagens { <nl> void addFeature ( ApplicationFeature * ) ; <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief sets the name of the system config file with a path <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> - void setSystemConfigFile ( const std : : string & name , const std : : string & path ) ; <nl> - <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief sets the name of the system config file without a path <nl> + / / / @ brief sets the name of the system config file <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> void setSystemConfigFile ( const std : : string & name ) ; <nl> namespace triagens { <nl> <nl> std : : string _systemConfigFile ; <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief system config path <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> - std : : string _systemConfigPath ; <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief the user id to use for the process <nl> / / / <nl> mmm a / lib / Basics / StringUtils . cpp <nl> ppp b / lib / Basics / StringUtils . cpp <nl> <nl> # include " Basics / StringBuffer . h " <nl> <nl> / / TODO need to this in another way <nl> + # ifndef TRI_HAVE_GLOBAL_TIMEZONE_PROTO <nl> # ifdef GLOBAL_TIMEZONE <nl> extern long GLOBAL_TIMEZONE ; <nl> # else <nl> static long GLOBAL_TIMEZONE = 0 ; <nl> # endif <nl> + # endif <nl> <nl> using namespace std ; <nl> <nl> mmm a / lib / Basics / Thread . cpp <nl> ppp b / lib / Basics / Thread . cpp <nl> <nl> / / / @ author Copyright 2008 - 2013 , triAGENS GmbH , Cologne , Germany <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> + # include " Thread . h " <nl> + <nl> # ifdef _WIN32 <nl> # include " BasicsC / win - utils . h " <nl> # endif <nl> <nl> - # include " Thread . h " <nl> - <nl> # include < errno . h > <nl> # include < signal . h > <nl> <nl> mmm a / lib / BasicsC / files . c <nl> ppp b / lib / BasicsC / files . c <nl> <nl> # include " BasicsC / string - buffer . h " <nl> # include " BasicsC / tri - strings . h " <nl> # include " BasicsC / threads . h " <nl> + <nl> # ifdef _WIN32 <nl> # include < tchar . h > <nl> # endif <nl> <nl> / / - - SECTION - - private defines <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup Files <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief read buffer size ( used for bulk file reading ) <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> # define READBUFFER_SIZE 8192 <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - private variables <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup Files <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief already initialised <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> static TRI_vector_t FileDescriptors ; <nl> <nl> static TRI_read_write_lock_t FileNamesLock ; <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - private functions <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup Files <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief remove trailing path separators from path . <nl> - / / / path will be modified in - place <nl> + / / / @ brief removes trailing path separators from path <nl> + / / / <nl> + / / / @ note path will be modified in - place <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> static void RemoveTrailingSeparator ( char * path ) { <nl> static void RemoveTrailingSeparator ( char * path ) { <nl> if ( n > 0 ) { <nl> char * p = path + n - 1 ; <nl> <nl> - while ( p > s & & * p = = TRI_DIR_SEPARATOR_CHAR ) { <nl> + while ( p > s & & ( * p = = TRI_DIR_SEPARATOR_CHAR | | * p = = ' / ' ) ) { <nl> * p = ' \ 0 ' ; <nl> - - p ; <nl> } <nl> } <nl> } <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief normalizes path <nl> + / / / <nl> + / / / @ note path will be modified in - place <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + static void NormalizePath ( char * path ) { <nl> + char * p ; <nl> + char * e ; <nl> + <nl> + RemoveTrailingSeparator ( path ) ; <nl> + <nl> + p = path ; <nl> + e = path + strlen ( p ) ; <nl> + <nl> + for ( ; p < e ; + + p ) { <nl> + if ( * p = = TRI_DIR_SEPARATOR_CHAR | | * p = = ' / ' ) { <nl> + * p = TRI_DIR_SEPARATOR_CHAR ; <nl> + } <nl> + } <nl> + } <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief linear search of the giving element <nl> / / / <nl> static void RemoveTrailingSeparator ( char * path ) { <nl> / / / - 1 when the element was not found <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> - static int LookupElementVectorString ( TRI_vector_string_t * vector , char const * element ) { <nl> + static ssize_t LookupElementVectorString ( TRI_vector_string_t * vector , char const * element ) { <nl> size_t i ; <nl> int idx = - 1 ; <nl> <nl> static int LookupElementVectorString ( TRI_vector_string_t * vector , char const * <nl> for ( i = 0 ; i < vector - > _length ; i + + ) { <nl> if ( TRI_EqualString ( element , vector - > _buffer [ i ] ) ) { <nl> / / theoretically this might cap the value of i , but it is highly unlikely <nl> - idx = ( int ) i ; <nl> + idx = ( ssize_t ) i ; <nl> break ; <nl> } <nl> } <nl> static int LookupElementVectorString ( TRI_vector_string_t * vector , char const * <nl> <nl> static void RemoveAllLockedFiles ( void ) { <nl> size_t i ; <nl> - int fd ; <nl> <nl> TRI_WriteLockReadWriteLock ( & FileNamesLock ) ; <nl> <nl> for ( i = 0 ; i < FileNames . _length ; i + + ) { <nl> - TRI_UnlinkFile ( FileNames . _buffer [ i ] ) ; <nl> + # ifdef TRI_HAVE_WIN32_FILE_LOCKING <nl> + HANDLE fd ; <nl> <nl> - fd = * ( int * ) TRI_AtVector ( & FileDescriptors , i ) ; <nl> + fd = * ( HANDLE * ) TRI_AtVector ( & FileDescriptors , i ) ; <nl> + CloseHandle ( fd ) ; <nl> + # else <nl> + int fd ; <nl> <nl> + fd = * ( int * ) TRI_AtVector ( & FileDescriptors , i ) ; <nl> TRI_CLOSE ( fd ) ; <nl> + # endif <nl> + <nl> + TRI_UnlinkFile ( FileNames . _buffer [ i ] ) ; <nl> } <nl> <nl> TRI_DestroyVectorString ( & FileNames ) ; <nl> static void InitialiseLockFiles ( void ) { <nl> } <nl> <nl> TRI_InitVectorString ( & FileNames , TRI_CORE_MEM_ZONE ) ; <nl> + <nl> + # ifdef TRI_HAVE_WIN32_FILE_LOCKING <nl> + TRI_InitVector ( & FileDescriptors , TRI_CORE_MEM_ZONE , sizeof ( HANDLE ) ) ; <nl> + # else <nl> TRI_InitVector ( & FileDescriptors , TRI_CORE_MEM_ZONE , sizeof ( int ) ) ; <nl> + # endif <nl> <nl> TRI_InitReadWriteLock ( & FileNamesLock ) ; <nl> <nl> static void ListTreeRecursively ( char const * full , <nl> TRI_DestroyVectorString ( & dirs ) ; <nl> } <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - public functions <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup Files <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief sets close - on - exit for a socket <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> int64_t TRI_SizeFile ( char const * path ) { <nl> # ifdef _WIN32 <nl> <nl> bool TRI_IsWritable ( char const * path ) { <nl> + <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> / / will attempt the following : <nl> / / if path is a directory , then attempt to create temporary file <nl> bool TRI_IsWritable ( char const * path ) { <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> <nl> / / # error " TRI_IsWritable needs to be implemented for Windows " <nl> - / / implementation for seems to be non - trivial <nl> + / / TODO : implementation for seems to be non - trivial <nl> return true ; <nl> } <nl> <nl> bool TRI_IsDirectory ( char const * path ) { <nl> # ifdef _WIN32 <nl> <nl> bool TRI_IsSymbolicLink ( char const * path ) { <nl> - / / todo : check if a file is a symbolic link - without opening the file <nl> + / / TODO : check if a file is a symbolic link - without opening the file <nl> return false ; <nl> } <nl> <nl> char * TRI_Dirname ( char const * path ) { <nl> <nl> char * TRI_Basename ( char const * path ) { <nl> size_t n ; <nl> - size_t m ; <nl> char const * p ; <nl> <nl> n = strlen ( path ) ; <nl> - m = 0 ; <nl> <nl> if ( 1 < n ) { <nl> - if ( path [ n - 1 ] = = TRI_DIR_SEPARATOR_CHAR ) { <nl> - m = 1 ; <nl> + if ( path [ n - 1 ] = = TRI_DIR_SEPARATOR_CHAR | | path [ n - 1 ] = = ' / ' ) { <nl> + n - = 1 ; <nl> } <nl> } <nl> <nl> if ( n = = 0 ) { <nl> return TRI_DuplicateString ( " " ) ; <nl> } <nl> - else if ( n = = 1 & & * path = = TRI_DIR_SEPARATOR_CHAR ) { <nl> - return TRI_DuplicateString ( " " ) ; <nl> - } <nl> - else if ( n - m = = 1 & & * path = = ' . ' ) { <nl> - return TRI_DuplicateString ( " " ) ; <nl> - } <nl> - else if ( n - m = = 2 & & path [ 0 ] = = ' . ' & & path [ 1 ] = = ' . ' ) { <nl> - return TRI_DuplicateString ( " " ) ; <nl> + else if ( n = = 1 ) { <nl> + if ( * path = = TRI_DIR_SEPARATOR_CHAR | | * path = = ' / ' ) { <nl> + return TRI_DuplicateString ( TRI_DIR_SEPARATOR_STR ) ; <nl> + } <nl> + else { <nl> + return TRI_DuplicateString2 ( path , n ) ; <nl> + } <nl> } <nl> + else { <nl> + for ( p = path + ( n - 2 ) ; path < p ; - - p ) { <nl> + if ( * p = = TRI_DIR_SEPARATOR_CHAR | | * p = = ' / ' ) { <nl> + break ; <nl> + } <nl> + } <nl> <nl> - for ( p = path + ( n - m - 1 ) ; path < p ; - - p ) { <nl> - if ( * p = = TRI_DIR_SEPARATOR_CHAR ) { <nl> - break ; <nl> + if ( path = = p ) { <nl> + if ( * p = = TRI_DIR_SEPARATOR_CHAR | | * p = = ' / ' ) { <nl> + return TRI_DuplicateString2 ( path + 1 , n - 1 ) ; <nl> + } <nl> + else { <nl> + return TRI_DuplicateString2 ( path , n ) ; <nl> + } <nl> } <nl> - } <nl> + else { <nl> + n - = p - path ; <nl> <nl> - if ( path = = p ) { <nl> - if ( * p = = TRI_DIR_SEPARATOR_CHAR ) { <nl> - return TRI_DuplicateString2 ( path + 1 , n - m ) ; <nl> + return TRI_DuplicateString2 ( p + 1 , n - 1 ) ; <nl> } <nl> } <nl> - <nl> - n - = p - path ; <nl> - <nl> - return TRI_DuplicateString2 ( p + 1 , n - 1 ) ; <nl> } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> char * TRI_Basename ( char const * path ) { <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> char * TRI_Concatenate2File ( char const * path , char const * name ) { <nl> - return TRI_Concatenate3String ( path , TRI_DIR_SEPARATOR_STR , name ) ; <nl> + size_t len = strlen ( path ) ; <nl> + char * result ; <nl> + <nl> + if ( 0 < len ) { <nl> + result = TRI_DuplicateString ( path ) ; <nl> + RemoveTrailingSeparator ( result ) ; <nl> + <nl> + TRI_AppendString ( & result , TRI_DIR_SEPARATOR_STR ) ; <nl> + } <nl> + else { <nl> + result = TRI_DuplicateString ( " " ) ; <nl> + } <nl> + <nl> + TRI_AppendString ( & result , name ) ; <nl> + NormalizePath ( result ) ; <nl> + <nl> + return result ; <nl> } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> char * TRI_Concatenate2File ( char const * path , char const * name ) { <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> char * TRI_Concatenate3File ( char const * path1 , char const * path2 , char const * name ) { <nl> - return TRI_Concatenate5String ( path1 , TRI_DIR_SEPARATOR_STR , path2 , TRI_DIR_SEPARATOR_STR , name ) ; <nl> + char * tmp ; <nl> + char * result ; <nl> + <nl> + tmp = TRI_Concatenate2File ( path1 , path2 ) ; <nl> + result = TRI_Concatenate2File ( tmp , name ) ; <nl> + <nl> + TRI_FreeString ( TRI_CORE_MEM_ZONE , tmp ) ; <nl> + <nl> + return result ; <nl> } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> int TRI_RenameFile ( char const * old , char const * filename ) { <nl> # ifdef _WIN32 <nl> BOOL moveResult = 0 ; <nl> moveResult = MoveFileExA ( old , filename , MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING ) ; <nl> + <nl> if ( ! moveResult ) { <nl> DWORD errorCode = GetLastError ( ) ; <nl> res = - 1 ; <nl> char * TRI_SlurpFile ( TRI_memory_zone_t * zone , <nl> # ifdef TRI_HAVE_WIN32_FILE_LOCKING <nl> <nl> int TRI_CreateLockFile ( char const * filename ) { <nl> + BOOL r ; <nl> + DWORD len ; <nl> + HANDLE fd ; <nl> + OVERLAPPED ol ; <nl> TRI_pid_t pid ; <nl> char * buf ; <nl> char * fn ; <nl> - int fd ; <nl> - int rv ; <nl> int res ; <nl> <nl> InitialiseLockFiles ( ) ; <nl> int TRI_CreateLockFile ( char const * filename ) { <nl> return TRI_ERROR_NO_ERROR ; <nl> } <nl> <nl> - fd = TRI_CREATE ( filename , O_CREAT | O_EXCL | O_RDWR , S_IRUSR | S_IWUSR ) ; <nl> + fd = CreateFile ( filename , GENERIC_WRITE , 0 , NULL , CREATE_ALWAYS , FILE_ATTRIBUTE_NORMAL , NULL ) ; <nl> <nl> - if ( fd = = - 1 ) { <nl> + if ( fd = = INVALID_HANDLE_VALUE ) { <nl> return TRI_set_errno ( TRI_ERROR_SYS_ERROR ) ; <nl> } <nl> <nl> pid = TRI_CurrentProcessId ( ) ; <nl> buf = TRI_StringUInt32 ( pid ) ; <nl> <nl> - rv = TRI_WRITE ( fd , buf , ( unsigned int ) strlen ( buf ) ) ; <nl> + r = WriteFile ( fd , buf , ( unsigned int ) strlen ( buf ) , & len , NULL ) ; <nl> <nl> - if ( rv = = - 1 ) { <nl> + if ( ! r | | len ! = strlen ( buf ) ) { <nl> res = TRI_set_errno ( TRI_ERROR_SYS_ERROR ) ; <nl> <nl> TRI_FreeString ( TRI_CORE_MEM_ZONE , buf ) ; <nl> <nl> - TRI_CLOSE ( fd ) ; <nl> + if ( r ) { <nl> + CloseHandle ( fd ) ; <nl> + } <nl> + <nl> TRI_UNLINK ( filename ) ; <nl> <nl> return res ; <nl> } <nl> <nl> TRI_FreeString ( TRI_CORE_MEM_ZONE , buf ) ; <nl> - TRI_CLOSE ( fd ) ; <nl> - <nl> - / / try to open pid file <nl> - fd = TRI_OPEN ( filename , O_RDONLY ) ; <nl> - <nl> - if ( fd < 0 ) { <nl> - return TRI_set_errno ( TRI_ERROR_SYS_ERROR ) ; <nl> - } <nl> <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> - / / TODO : use windows LockFile to lock the file <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> - / / rv = LockFileEx ( fd , LOCKFILE_EXCLUSIVE_LOCK , 0 , 0 , 0 , 0 ) ; <nl> - / / rv = flock ( fd , LOCK_EX ) ; <nl> - rv = true ; <nl> + memset ( & ol , 0 , sizeof ( ol ) ) ; <nl> + r = LockFileEx ( fd , LOCKFILE_EXCLUSIVE_LOCK | LOCKFILE_FAIL_IMMEDIATELY , 0 , 0 , 128 , & ol ) ; <nl> <nl> - if ( ! rv ) { <nl> + if ( ! r ) { <nl> res = TRI_set_errno ( TRI_ERROR_SYS_ERROR ) ; <nl> <nl> - TRI_CLOSE ( fd ) ; <nl> + CloseHandle ( fd ) ; <nl> TRI_UNLINK ( filename ) ; <nl> <nl> return res ; <nl> int TRI_CreateLockFile ( char const * filename ) { <nl> TRI_PushBackVector ( & FileDescriptors , & fd ) ; <nl> TRI_WriteUnlockReadWriteLock ( & FileNamesLock ) ; <nl> <nl> - <nl> return TRI_ERROR_NO_ERROR ; <nl> } <nl> <nl> int TRI_CreateLockFile ( char const * filename ) { <nl> # ifdef TRI_HAVE_WIN32_FILE_LOCKING <nl> <nl> int TRI_VerifyLockFile ( char const * filename ) { <nl> - TRI_pid_t pid ; <nl> - char buffer [ 128 ] ; <nl> - int can_lock ; <nl> - int fd ; <nl> - int res ; <nl> - ssize_t n ; <nl> - uint32_t fc ; <nl> + HANDLE fd ; <nl> <nl> if ( ! TRI_ExistsFile ( filename ) ) { <nl> - return TRI_set_errno ( TRI_ERROR_SYS_ERROR ) ; <nl> - } <nl> - <nl> - fd = TRI_OPEN ( filename , O_RDONLY ) ; <nl> - if ( fd < 0 ) { <nl> - / / this method if checking whether or not the database is locked is not suitable with the manner <nl> - / / in which it is coded . <nl> - / / windows assigns ownership of the file to the process for exclusive use <nl> - / / the file exists , yet we can not open it , so being here we can only assume that the <nl> - / / database is locked . <nl> return TRI_ERROR_NO_ERROR ; <nl> } <nl> - n = TRI_READ ( fd , buffer , sizeof ( buffer ) ) ; <nl> - TRI_CLOSE ( fd ) ; <nl> - <nl> - / / file empty or pid too long <nl> - if ( n = = 0 | | n = = sizeof ( buffer ) ) { <nl> - return TRI_set_errno ( TRI_ERROR_ILLEGAL_NUMBER ) ; <nl> - } <nl> - <nl> - / / NUL - terminate buffer <nl> - buffer [ n ] = ' \ 0 ' ; <nl> - <nl> - fc = TRI_UInt32String ( buffer ) ; <nl> - res = TRI_errno ( ) ; <nl> - <nl> - if ( res ! = TRI_ERROR_NO_ERROR ) { <nl> - return res ; <nl> - } <nl> - <nl> - pid = fc ; <nl> <nl> + fd = CreateFile ( filename , GENERIC_WRITE , 0 , NULL , OPEN_EXISTING , FILE_ATTRIBUTE_NORMAL , NULL ) ; <nl> <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> - / / determine if a process with pid exists <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> - / / use OpenProcess / TerminateProcess as a replacement for kill <nl> - / / if ( kill ( pid , 0 ) = = - 1 ) { <nl> - / / return TRI_set_errno ( TRI_ERROR_DEAD_PID ) ; <nl> - / / } <nl> - <nl> - fd = TRI_OPEN ( filename , O_RDONLY ) ; <nl> + if ( fd = = INVALID_HANDLE_VALUE ) { <nl> + if ( GetLastError ( ) = = ERROR_SHARING_VIOLATION ) { <nl> + return TRI_ERROR_ARANGO_DATADIR_LOCKED ; <nl> + } <nl> <nl> - if ( fd < 0 ) { <nl> - return TRI_set_errno ( TRI_ERROR_SYS_ERROR ) ; <nl> + return TRI_ERROR_NO_ERROR ; <nl> } <nl> <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> - / / TODO : Use windows LockFileEx to determine if file can be locked <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> - / / = LockFileEx ( fd , LOCKFILE_EXCLUSIVE_LOCK , 0 , 0 , 0 , 0 ) ; <nl> - / / can_lock = flock ( fd , LOCK_EX | LOCK_NB ) ; <nl> - can_lock = true ; <nl> - <nl> - <nl> - / / file was not yet be locked <nl> - if ( can_lock = = 0 ) { <nl> - res = TRI_set_errno ( TRI_ERROR_SYS_ERROR ) ; <nl> - <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> - / / TODO : Use windows LockFileEx to determine if file can be locked <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> - / / flock ( fd , LOCK_UN ) ; <nl> - <nl> - TRI_CLOSE ( fd ) ; <nl> + CloseHandle ( fd ) ; <nl> + TRI_UnlinkFile ( filename ) ; <nl> <nl> - return res ; <nl> - } <nl> - <nl> - TRI_CLOSE ( fd ) ; <nl> return TRI_ERROR_NO_ERROR ; <nl> } <nl> <nl> int TRI_VerifyLockFile ( char const * filename ) { <nl> uint32_t fc ; <nl> <nl> if ( ! TRI_ExistsFile ( filename ) ) { <nl> - return TRI_set_errno ( TRI_ERROR_SYS_ERROR ) ; <nl> + return TRI_ERROR_NO_ERROR ; <nl> } <nl> <nl> fd = TRI_OPEN ( filename , O_RDONLY ) ; <nl> <nl> if ( fd < 0 ) { <nl> - return TRI_set_errno ( errno ) ; <nl> + return TRI_ERROR_NO_ERROR ; <nl> } <nl> <nl> n = TRI_READ ( fd , buffer , sizeof ( buffer ) ) ; <nl> int TRI_VerifyLockFile ( char const * filename ) { <nl> TRI_CLOSE ( fd ) ; <nl> <nl> if ( n < 0 ) { <nl> - return TRI_set_errno ( errno ) ; <nl> + return TRI_ERROR_NO_ERROR ; <nl> } <nl> <nl> / / file empty or pid too long <nl> if ( n = = 0 | | n = = sizeof ( buffer ) ) { <nl> - return TRI_set_errno ( TRI_ERROR_ILLEGAL_NUMBER ) ; <nl> + return TRI_ERROR_NO_ERROR ; <nl> } <nl> <nl> - / / NUL - terminate buffer <nl> + / / 0 - terminate buffer <nl> buffer [ n ] = ' \ 0 ' ; <nl> <nl> fc = TRI_UInt32String ( buffer ) ; <nl> res = TRI_errno ( ) ; <nl> <nl> if ( res ! = TRI_ERROR_NO_ERROR ) { <nl> - return res ; <nl> + return TRI_ERROR_NO_ERROR ; <nl> } <nl> <nl> pid = fc ; <nl> <nl> if ( kill ( pid , 0 ) = = - 1 ) { <nl> - return TRI_set_errno ( TRI_ERROR_DEAD_PID ) ; <nl> + return TRI_ERROR_NO_ERROR ; <nl> } <nl> <nl> fd = TRI_OPEN ( filename , O_RDONLY ) ; <nl> <nl> if ( fd < 0 ) { <nl> - return TRI_set_errno ( TRI_ERROR_SYS_ERROR ) ; <nl> + return TRI_ERROR_NO_ERROR ; <nl> } <nl> <nl> can_lock = flock ( fd , LOCK_EX | LOCK_NB ) ; <nl> <nl> / / file was not yet be locked <nl> if ( can_lock = = 0 ) { <nl> - res = TRI_set_errno ( TRI_ERROR_SYS_ERROR ) ; <nl> - <nl> flock ( fd , LOCK_UN ) ; <nl> TRI_CLOSE ( fd ) ; <nl> <nl> - return res ; <nl> + return TRI_ERROR_NO_ERROR ; <nl> } <nl> <nl> TRI_CLOSE ( fd ) ; <nl> - return TRI_ERROR_NO_ERROR ; <nl> + return TRI_ERROR_ARANGO_DATADIR_LOCKED ; <nl> } <nl> <nl> # endif <nl> int TRI_VerifyLockFile ( char const * filename ) { <nl> # ifdef TRI_HAVE_WIN32_FILE_LOCKING <nl> <nl> int TRI_DestroyLockFile ( char const * filename ) { <nl> - int fd ; <nl> - int n ; <nl> - int res ; <nl> + HANDLE fd ; <nl> + ssize_t n ; <nl> <nl> InitialiseLockFiles ( ) ; <nl> n = LookupElementVectorString ( & FileNames , filename ) ; <nl> <nl> if ( n < 0 ) { <nl> - return false ; <nl> - } <nl> - <nl> - <nl> - fd = TRI_OPEN ( filename , O_RDWR ) ; <nl> - <nl> - if ( fd < 0 ) { <nl> - return false ; <nl> + return TRI_ERROR_NO_ERROR ; <nl> } <nl> <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> - / / TODO : Use windows LockFileEx to determine if file can be locked <nl> - / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> - / / flock ( fd , LOCK_UN ) ; <nl> - / / res = flock ( fd , LOCK_UN ) ; <nl> - res = 0 ; <nl> <nl> - TRI_CLOSE ( fd ) ; <nl> + fd = * ( HANDLE * ) TRI_AtVector ( & FileDescriptors , n ) ; <nl> <nl> - if ( res = = 0 ) { <nl> - TRI_UnlinkFile ( filename ) ; <nl> + CloseHandle ( fd ) ; <nl> <nl> - TRI_WriteLockReadWriteLock ( & FileNamesLock ) ; <nl> + TRI_UnlinkFile ( filename ) ; <nl> <nl> - TRI_RemoveVectorString ( & FileNames , n ) ; <nl> - fd = * ( int * ) TRI_AtVector ( & FileDescriptors , n ) ; <nl> - TRI_CLOSE ( fd ) ; <nl> - <nl> - TRI_WriteUnlockReadWriteLock ( & FileNamesLock ) ; <nl> - } <nl> + TRI_WriteLockReadWriteLock ( & FileNamesLock ) ; <nl> + TRI_RemoveVectorString ( & FileNames , n ) ; <nl> + TRI_RemoveVector ( & FileDescriptors , n ) ; <nl> + TRI_WriteUnlockReadWriteLock ( & FileNamesLock ) ; <nl> <nl> - return res ; <nl> + return TRI_ERROR_NO_ERROR ; <nl> } <nl> <nl> # else <nl> <nl> int TRI_DestroyLockFile ( char const * filename ) { <nl> int fd ; <nl> - int n ; <nl> int res ; <nl> + ssize_t n ; <nl> <nl> InitialiseLockFiles ( ) ; <nl> n = LookupElementVectorString ( & FileNames , filename ) ; <nl> int TRI_DestroyLockFile ( char const * filename ) { <nl> <nl> if ( res = = 0 ) { <nl> TRI_UnlinkFile ( filename ) ; <nl> - <nl> - TRI_WriteLockReadWriteLock ( & FileNamesLock ) ; <nl> - <nl> - TRI_RemoveVectorString ( & FileNames , n ) ; <nl> - fd = * ( int * ) TRI_AtVector ( & FileDescriptors , n ) ; <nl> - TRI_CLOSE ( fd ) ; <nl> - <nl> - TRI_WriteUnlockReadWriteLock ( & FileNamesLock ) ; <nl> } <nl> <nl> + TRI_WriteLockReadWriteLock ( & FileNamesLock ) ; <nl> + TRI_RemoveVectorString ( & FileNames , n ) ; <nl> + TRI_RemoveVector ( & FileDescriptors , n ) ; <nl> + TRI_WriteUnlockReadWriteLock ( & FileNamesLock ) ; <nl> + <nl> return res ; <nl> } <nl> <nl> char * TRI_GetAbsolutePath ( char const * file , char const * cwd ) { <nl> <nl> # endif <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief returns the binary name without any path or suffix <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + char * TRI_BinaryName ( const char * argv0 ) { <nl> + char * name ; <nl> + char * p ; <nl> + char * e ; <nl> + <nl> + name = TRI_Basename ( argv0 ) ; <nl> + <nl> + p = name ; <nl> + e = name + strlen ( name ) ; <nl> + <nl> + for ( ; p < e ; + + p ) { <nl> + if ( * p = = ' . ' ) { <nl> + * p = ' \ 0 ' ; <nl> + break ; <nl> + } <nl> + } <nl> + <nl> + for ( ; name < p ; - - p ) { <nl> + if ( * p = = ' - ' ) { <nl> + break ; <nl> + } <nl> + } <nl> + <nl> + / / TODO this needs to be fixed : the install script should do some transformation <nl> + / / on the config files installed . But in this case all programs must use <nl> + / / config files based on their name . <nl> + <nl> + if ( * p = = ' - ' & & TRI_EqualString ( p , " - unstable " ) ) { <nl> + * p = ' \ 0 ' ; <nl> + } <nl> + <nl> + return name ; <nl> + } <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief locates the directory containing the program <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> void TRI_SetUserTempPath ( char * path ) { <nl> } <nl> } <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief locate the installation directory <nl> + / / / <nl> + / / / Will always end in a directory separator . <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + # if _WIN32 <nl> + <nl> + char * TRI_LocateInstallDirectory ( ) { <nl> + DWORD dwType ; <nl> + char szPath [ 1023 ] ; <nl> + DWORD dwDataSize ; <nl> + HKEY key ; <nl> + <nl> + dwDataSize = sizeof ( szPath ) ; <nl> + memset ( szPath , 0 , dwDataSize ) ; <nl> + <nl> + / / open the key for reading <nl> + / / TODO : the installer always uses the 32bit path ( Wow6432 ) <nl> + long lResult = RegOpenKeyEx ( <nl> + HKEY_LOCAL_MACHINE , <nl> + " SOFTWARE \ \ Wow6432Node \ \ triAGENS GmbH \ \ ArangoDB " TRI_VERSION , <nl> + 0 , <nl> + KEY_READ , <nl> + & key ) ; <nl> + <nl> + if ( lResult ! = ERROR_SUCCESS ) { <nl> + lResult = RegOpenKeyEx ( <nl> + HKEY_LOCAL_MACHINE , <nl> + " SOFTWARE \ \ triAGENS GmbH \ \ ArangoDB " TRI_VERSION , <nl> + 0 , <nl> + KEY_READ , <nl> + & key ) ; <nl> + } <nl> + <nl> + if ( lResult = = ERROR_SUCCESS ) { <nl> + <nl> + / / read the version value <nl> + lResult = RegQueryValueEx ( key , " " , NULL , & dwType , ( BYTE * ) szPath , & dwDataSize ) ; <nl> + <nl> + if ( lResult = = ERROR_SUCCESS ) { <nl> + return TRI_Concatenate2String ( szPath , " \ \ " ) ; / / TODO check if it already ends in \ \ or / <nl> + } <nl> + <nl> + RegCloseKey ( key ) ; <nl> + } <nl> + <nl> + return NULL ; <nl> + } <nl> + <nl> + # else <nl> + <nl> + char * TRI_LocateInstallDirectory ( ) { <nl> + return NULL ; <nl> + } <nl> + <nl> + # endif <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief locate the configuration directory <nl> + / / / <nl> + / / / Will always end in a directory separator . <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + # if _WIN32 <nl> + <nl> + char * TRI_LocateConfigDirectory ( ) { <nl> + char * v ; <nl> + <nl> + v = TRI_LocateInstallDirectory ( ) ; <nl> + <nl> + if ( v ! = NULL ) { <nl> + TRI_AppendString ( & v , " etc \ \ arangodb \ \ " ) ; <nl> + } <nl> + <nl> + return v ; <nl> + } <nl> + <nl> + # elif defined ( _SYSCONFDIR_ ) <nl> + <nl> + char * TRI_LocateConfigDirectory ( ) { <nl> + size_t len ; <nl> + const char * dir = _SYSCONFDIR_ ; <nl> + <nl> + if ( * dir = = ' \ 0 ' ) { <nl> + return NULL ; <nl> + } <nl> + <nl> + len = strlen ( dir ) ; <nl> + <nl> + if ( dir [ len - 1 ] ! = TRI_DIR_SEPARATOR_CHAR ) { <nl> + return TRI_Concatenate2String ( dir , " / " ) ; <nl> + } <nl> + else { <nl> + return TRI_DuplicateString ( dir ) ; <nl> + } <nl> + } <nl> + <nl> + # else <nl> + <nl> + char * TRI_LocateConfigDirectory ( ) { <nl> + return NULL ; <nl> + } <nl> + <nl> + # endif <nl> + <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + / / - - SECTION - - module functions <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief initialise the files subsystem <nl> + / / / <nl> + / / / TODO : inialise logging here ? <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> void TRI_InitialiseFiles ( void ) { <nl> void TRI_InitialiseFiles ( void ) { <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief shutdown the files subsystem <nl> + / / / <nl> + / / / TODO : inialise logging here ? <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> void TRI_ShutdownFiles ( void ) { <nl> mmm a / lib / BasicsC / files . h <nl> ppp b / lib / BasicsC / files . h <nl> char * TRI_GetFilename ( char const * ) ; <nl> <nl> char * TRI_GetAbsolutePath ( char const * , char const * ) ; <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief returns the binary name without any path or suffix <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + char * TRI_BinaryName ( const char * argv0 ) ; <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief locates the directory containing the program <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> char * TRI_GetUserTempPath ( void ) ; <nl> <nl> void TRI_SetUserTempPath ( char * ) ; <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief locate the installation directory <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + char * TRI_LocateInstallDirectory ( void ) ; <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief locate the configuration directory <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + char * TRI_LocateConfigDirectory ( void ) ; <nl> + <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + / / - - SECTION - - module functions <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief initialise the files subsystem <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> mmm a / lib / BasicsC / messages . h <nl> ppp b / lib / BasicsC / messages . h <nl> extern " C " { <nl> / / / @ brief bye bye message <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> + # define TRI_BYE_MESSAGE_CH " Uf wiederluege ! " <nl> + # define TRI_BYE_MESSAGE_CZ " Na shledanou ! " <nl> + # define TRI_BYE_MESSAGE_DE " Auf Wiedersehen ! " <nl> + # define TRI_BYE_MESSAGE_EN " Bye Bye ! " <nl> + # define TRI_BYE_MESSAGE_EO " Adiau ! " <nl> + # define TRI_BYE_MESSAGE_ES " ¡ Hasta luego ! " <nl> + # define TRI_BYE_MESSAGE_FR " Au revoir ! " <nl> + # define TRI_BYE_MESSAGE_GR " Εις το επανιδείν ! " <nl> + # define TRI_BYE_MESSAGE_IT " Arrivederci ! " <nl> + # define TRI_BYE_MESSAGE_JP " さようなら " <nl> + # define TRI_BYE_MESSAGE_NL " Tot ziens ! " <nl> + # define TRI_BYE_MESSAGE_RU " До свидания ! " <nl> + # define TRI_BYE_MESSAGE_SV " Adjö ! " <nl> <nl> - # define TRI_BYE_MESSAGE " Auf Wiedersehen ! Bye Bye ! Arrivederci ! Na shledanou ! Au revoir ! ¡ Hasta luego ! Εις το επανιδείν ! Adjö ! До свидания ! さようなら " <nl> + # define TRI_BYE_MESSAGE \ <nl> + TRI_BYE_MESSAGE_CH " " \ <nl> + TRI_BYE_MESSAGE_CZ " " \ <nl> + TRI_BYE_MESSAGE_DE " " \ <nl> + TRI_BYE_MESSAGE_EN " " \ <nl> + TRI_BYE_MESSAGE_EO " " \ <nl> + TRI_BYE_MESSAGE_ES " " \ <nl> + TRI_BYE_MESSAGE_FR " " \ <nl> + TRI_BYE_MESSAGE_GR " " \ <nl> + TRI_BYE_MESSAGE_IT " " \ <nl> + TRI_BYE_MESSAGE_JP " " \ <nl> + TRI_BYE_MESSAGE_NL " " \ <nl> + TRI_BYE_MESSAGE_RU " " \ <nl> + TRI_BYE_MESSAGE_SV <nl> <nl> # ifdef __cplusplus <nl> } <nl> old mode 100755 <nl> new mode 100644 <nl> mmm a / lib / BasicsC / operating - system . h <nl> ppp b / lib / BasicsC / operating - system . h <nl> <nl> / / - - SECTION - - global <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup OperatingSystem <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> # ifndef __STDC_LIMIT_MACROS <nl> # define __STDC_LIMIT_MACROS <nl> # endif <nl> <nl> # define TRI_PADDING_32 1 <nl> # endif <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - Section - - apple <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup OperatingSystem <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> # ifdef __APPLE__ <nl> <nl> # define TRI_PLATFORM " darwin " <nl> <nl> <nl> # endif <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - FreeBSD <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup OperatingSystem <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> # ifdef __FreeBSD__ <nl> <nl> # define TRI_PLATFORM " freebsd " <nl> <nl> <nl> # endif <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - linux <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup OperatingSystem <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> # ifdef __linux__ <nl> <nl> # define TRI_PLATFORM " linux " <nl> <nl> <nl> # endif <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - windows <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup OperatingSystem <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> # if defined ( _WIN32 ) & & defined ( _MSC_VER ) <nl> <nl> # ifdef _WIN64 <nl> <nl> / / / @ brief necessary defines and includes <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> + / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> + / / This directive below suppresses warnings about ' inline ' <nl> + / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> + <nl> + # define _ALLOW_KEYWORD_MACROS 1 <nl> + <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> / / This directive below suppresses warnings about using the ' new ' more secure CRT <nl> / / functions . <nl> <nl> / / / @ brief available features <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> + # define TRI_HAVE_LINENOISE 1 <nl> + <nl> # define GLOBAL_TIMEZONE timezone <nl> + # define TRI_HAVE_GLOBAL_TIMEZONE_PROTO 1 <nl> + <nl> + # define YY_NO_UNISTD_H 1 <nl> <nl> # define TRI_WIN32_CONSOLE 1 <nl> # define TRI_WIN32_THREAD_LOCAL_STORAGE 1 <nl> <nl> # define TRI_HAVE_WIN32_PWD 1 <nl> <nl> # define TRI_HAVE_ANONYMOUS_MMAP 1 <nl> + # define TRI_MISSING_MEMRCHR 1 <nl> <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> / / usleep in POSIX is for microseconds - not milliseconds <nl> <nl> <nl> typedef int ssize_t ; <nl> <nl> + # ifndef va_copy <nl> # define va_copy ( d , s ) ( ( d ) = ( s ) ) <nl> + # endif <nl> <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> / / typedef unsigned int bool ; - this never ever going to work . Problem is <nl> typedef int ssize_t ; <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> <nl> # ifndef __BOOL_DEFINED <nl> - <nl> typedef unsigned char bool ; <nl> # define true 1 <nl> # define false 0 <nl> typedef unsigned char bool ; <nl> # define TRI_GETCWD _getcwd <nl> # define TRI_LSEEK _lseek <nl> # define TRI_MKDIR ( a , b ) _mkdir ( ( a ) ) <nl> - # define TRI_OPEN ( a , b ) TRI_openFile ( ( a ) , ( b ) ) <nl> + # define TRI_OPEN ( a , b ) TRI_OPEN_WIN32 ( ( a ) , ( b ) ) <nl> # define TRI_READ _read <nl> # define TRI_RMDIR _rmdir <nl> # define TRI_UNLINK _unlink <nl> typedef unsigned char bool ; <nl> <nl> # endif <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - GNU C compiler <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup OperatingSystem <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> # ifdef __GNUC__ <nl> # define TRI_HAVE_GCC_UNUSED 1 <nl> # define TRI_HAVE_GCC_ATTRIBUTE 1 <nl> # define TRI_HAVE_GCC_BUILTIN 1 <nl> # endif <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - size_t overloading <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup OperatingSystem <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> # if defined ( TRI_OVERLOAD_FUNCS_SIZE_T ) <nl> # if TRI_SIZEOF_SIZE_T = = 8 <nl> # define sizetint_t uint64_t <nl> typedef unsigned char bool ; <nl> # endif <nl> # endif <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> # endif <nl> <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> old mode 100755 <nl> new mode 100644 <nl> mmm a / lib / BasicsC / win - utils . c <nl> ppp b / lib / BasicsC / win - utils . c <nl> <nl> # include < malloc . h > <nl> # include < crtdbg . h > <nl> <nl> - / * <nl> - # include < fcntl . h > <nl> - # include < sys / types . h > <nl> - # include < sys / stat . h > <nl> - # include < stdio . h > <nl> - # include < share . h > <nl> - * / <nl> - <nl> - <nl> - <nl> - <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> / / Some global variables which may be required throughout the lifetime of the <nl> / / server <nl> int TRI_createFile ( const char * filename , int openFlags , int modeFlags ) { <nl> } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / Creates or opens a file using the windows CreateFile method . Notice below we <nl> - / / have used the method CreateFileA to avoid unicode characters - for now anyway <nl> - / / TODO oreste : map the flags e . g . O_RDWR to the equivalents for CreateFileA <nl> + / / / @ brief opens a file for windows <nl> + / / / <nl> + / / / Creates or opens a file using the windows CreateFile method . Notice below we <nl> + / / / have used the method CreateFileA to avoid unicode characters - for now <nl> + / / / anyway . <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> - int TRI_openFile ( const char * filename , int openFlags ) { <nl> + int TRI_OPEN_WIN32 ( const char * filename , int openFlags ) { <nl> + static const int O_ACCMODE = 3 ; <nl> HANDLE fileHandle ; <nl> - int fileDescriptor ; <nl> + int fileDescriptor ; <nl> + DWORD mode ; <nl> + <nl> + switch ( openFlags & O_ACCMODE ) { <nl> + case O_RDONLY : <nl> + mode = GENERIC_READ ; <nl> + break ; <nl> + <nl> + case O_WRONLY : <nl> + mode = GENERIC_WRITE ; <nl> + break ; <nl> + <nl> + case O_RDWR : <nl> + mode = GENERIC_READ | GENERIC_WRITE ; <nl> + break ; <nl> + } <nl> + <nl> + fileHandle = CreateFileA ( <nl> + filename , <nl> + mode , <nl> + FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE , <nl> + NULL , <nl> + OPEN_EXISTING , <nl> + 0 , <nl> + NULL ) ; <nl> <nl> - fileHandle = CreateFileA ( filename , <nl> - GENERIC_READ | GENERIC_WRITE , <nl> - FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE , <nl> - NULL , <nl> - OPEN_EXISTING , <nl> - 0 , <nl> - NULL ) ; <nl> if ( fileHandle = = INVALID_HANDLE_VALUE ) { <nl> return - 1 ; <nl> } <nl> <nl> - fileDescriptor = _open_osfhandle ( ( intptr_t ) ( fileHandle ) , O_RDWR | _O_BINARY ) ; <nl> + fileDescriptor = _open_osfhandle ( ( intptr_t ) ( fileHandle ) , ( openFlags & O_ACCMODE ) | _O_BINARY ) ; <nl> return fileDescriptor ; <nl> - <nl> - / * <nl> - # define O_RDONLY _O_RDONLY <nl> - # define O_WRONLY _O_WRONLY <nl> - # define O_RDWR _O_RDWR <nl> - # define O_APPEND _O_APPEND <nl> - # define O_CREAT _O_CREAT <nl> - # define O_TRUNC _O_TRUNC <nl> - # define O_EXCL _O_EXCL <nl> - # define O_TEXT _O_TEXT <nl> - # define O_BINARY _O_BINARY <nl> - # define O_RAW _O_BINARY <nl> - # define O_TEMPORARY _O_TEMPORARY <nl> - # define O_NOINHERIT _O_NOINHERIT <nl> - # define O_SEQUENTIAL _O_SEQUENTIAL <nl> - # define O_RANDOM _O_RANDOM <nl> - / / filename , O_CREAT | O_EXCL | O_RDWR , S_IRUSR | S_IWUSR <nl> - * / <nl> } <nl> <nl> - <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ } <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> mmm a / lib / BasicsC / win - utils . h <nl> ppp b / lib / BasicsC / win - utils . h <nl> <nl> <nl> # include < WinSock2 . h > <nl> <nl> - / * Constants rounded for 21 decimals . <nl> - # define M_E 2 . 71828182845904523536 <nl> - # define M_LOG2E 1 . 44269504088896340736 <nl> - # define M_LOG10E 0 . 434294481903251827651 <nl> - # define M_LN2 0 . 693147180559945309417 <nl> - # define M_LN10 2 . 30258509299404568402 <nl> - # define M_PI 3 . 14159265358979323846 <nl> - # define M_PI_2 1 . 57079632679489661923 <nl> - # define M_PI_4 0 . 785398163397448309616 <nl> - # define M_1_PI 0 . 318309886183790671538 <nl> - # define M_2_PI 0 . 636619772367581343076 <nl> - # define M_1_SQRTPI 0 . 564189583547756286948 <nl> - # define M_2_SQRTPI 1 . 12837916709551257390 <nl> - # define M_SQRT2 1 . 41421356237309504880 <nl> - # define M_SQRT_2 0 . 707106781186547524401 <nl> - * / <nl> - <nl> # ifdef __cplusplus <nl> extern " C " { <nl> # endif <nl> int getpagesize ( void ) ; <nl> <nl> int TRI_createFile ( const char * filename , int openFlags , int modeFlags ) ; <nl> <nl> - int TRI_openFile ( const char * filename , int openFlags ) ; <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief opens a file for windows <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + int TRI_OPEN_WIN32 ( const char * filename , int openFlags ) ; <nl> <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> / / the sleep function in windows is for milliseconds , on linux it is for seconds <nl> mmm a / lib / CMakeLists . txt <nl> ppp b / lib / CMakeLists . txt <nl> if ( APPLE ) <nl> SET ( LIB_ARANGO_APPLE BasicsC / locks - macos . c ) <nl> endif ( ) <nl> <nl> + if ( MSVC ) <nl> + SET ( LIB_ARANGO_MSVC <nl> + BasicsC / locks - win32 . c <nl> + BasicsC / memory - map - win32 . c <nl> + BasicsC / terminal - utils - win32 . c <nl> + BasicsC / threads - win32 . c <nl> + BasicsC / win - utils . c <nl> + Utilities / LineEditor - linenoise . cpp <nl> + Zip / iowin32 . c <nl> + ) <nl> + else ( ) <nl> + SET ( LIB_ARANGO_POSIX <nl> + BasicsC / locks - posix . c <nl> + BasicsC / memory - map - posix . c <nl> + BasicsC / terminal - utils - posix . c <nl> + BasicsC / threads - posix . c <nl> + Rest / EndpointUnixDomain . cpp <nl> + Utilities / LineEditor - readline . cpp <nl> + ) <nl> + endif ( ) <nl> + <nl> add_library ( <nl> $ { LIB_ARANGO } <nl> STATIC <nl> $ { LIB_ARANGO_APPLE } <nl> + $ { LIB_ARANGO_MSVC } <nl> + $ { LIB_ARANGO_POSIX } <nl> Basics / ConditionLocker . cpp <nl> Basics / ConditionVariable . cpp <nl> Basics / Exceptions . cpp <nl> add_library ( <nl> BasicsC / json . c <nl> BasicsC / json - utilities . c <nl> BasicsC / linked - list . c <nl> - BasicsC / locks - posix . c <nl> BasicsC / logging . c <nl> BasicsC / memory . c <nl> - BasicsC / memory - map - posix . c <nl> BasicsC / mersenne . c <nl> BasicsC / mimetypes . c <nl> BasicsC / process - utils . c <nl> add_library ( <nl> BasicsC / tri - strings . c <nl> BasicsC / structures . c <nl> BasicsC / system - functions . c <nl> - BasicsC / terminal - utils - posix . c <nl> BasicsC / terminal - utils . c <nl> - BasicsC / threads - posix . c <nl> BasicsC / utf8 - helper . c <nl> BasicsC / vector . c <nl> BasicsC / voc - errors . c <nl> add_library ( <nl> Rest / EndpointIp . cpp <nl> Rest / EndpointIpV4 . cpp <nl> Rest / EndpointIpV6 . cpp <nl> - Rest / EndpointUnixDomain . cpp <nl> Rest / Handler . cpp <nl> Rest / HttpRequest . cpp <nl> Rest / HttpResponse . cpp <nl> add_library ( <nl> ShapedJson / shape - accessor . c <nl> ShapedJson / shaped - json . c <nl> Statistics / statistics . cpp <nl> - Utilities / LineEditor . cpp <nl> Utilities / ScriptLoader . cpp <nl> Zip / ioapi . c <nl> Zip / unzip . c <nl> mmm a / lib / Makefile . files <nl> ppp b / lib / Makefile . files <nl> lib_libarango_a_SOURCES = \ <nl> lib / ShapedJson / shape - accessor . c \ <nl> lib / ShapedJson / shaped - json . c \ <nl> lib / Statistics / statistics . cpp \ <nl> - lib / Utilities / LineEditor . cpp \ <nl> + lib / Utilities / LineEditor - readline . cpp \ <nl> lib / Utilities / ScriptLoader . cpp \ <nl> lib / Zip / ioapi . c \ <nl> lib / Zip / unzip . c \ <nl> mmm a / lib / ProgramOptions / program - options . c <nl> ppp b / lib / ProgramOptions / program - options . c <nl> <nl> # include < regex . h > <nl> <nl> # include " BasicsC / conversions . h " <nl> + # include " BasicsC / files . h " <nl> # include " BasicsC / logging . h " <nl> # include " BasicsC / string - buffer . h " <nl> # include " BasicsC / tri - strings . h " <nl> static char * FillVariables ( const char * value ) { <nl> char * k = TRI_DuplicateString2 ( t , q - t ) ; <nl> char * v = getenv ( k ) ; <nl> <nl> + if ( v ! = NULL & & * v = = ' \ 0 ' ) { <nl> + TRI_FreeString ( TRI_CORE_MEM_ZONE , v ) ; <nl> + v = NULL ; <nl> + } <nl> + <nl> + if ( v = = NULL ) { <nl> + if ( TRI_EqualString ( k , " ROOTDIR " ) ) { <nl> + char * vv = TRI_LocateInstallDirectory ( ) ; <nl> + size_t lv = strlen ( vv ) ; <nl> + <nl> + if ( 0 < lv ) { <nl> + if ( vv [ lv - 1 ] = = TRI_DIR_SEPARATOR_CHAR | | vv [ lv - 1 ] = = ' / ' ) { <nl> + v = TRI_DuplicateString2 ( vv , lv - 1 ) ; <nl> + } <nl> + else { <nl> + v = TRI_DuplicateString2 ( vv , lv ) ; <nl> + } <nl> + } <nl> + <nl> + TRI_FreeString ( TRI_CORE_MEM_ZONE , vv ) ; <nl> + } <nl> + } <nl> + else { <nl> + v = TRI_DuplicateString ( v ) ; <nl> + } <nl> + <nl> if ( v ! = NULL ) { <nl> TRI_AppendStringStringBuffer ( & buffer , v ) ; <nl> + TRI_FreeString ( TRI_CORE_MEM_ZONE , v ) ; <nl> } <nl> <nl> TRI_FreeString ( TRI_CORE_MEM_ZONE , k ) ; <nl> mmm a / lib / Rest / AnyServer . cpp <nl> ppp b / lib / Rest / AnyServer . cpp <nl> AnyServer : : ~ AnyServer ( ) { <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup Rest <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief start the server <nl> + / / / @ brief starts the server <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> int AnyServer : : start ( ) { <nl> int AnyServer : : start ( ) { <nl> } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> + / / / @ brief begins shutdown sequence <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> + void AnyServer : : beginShutdown ( ) { <nl> + if ( _applicationServer ! = 0 ) { <nl> + _applicationServer - > beginShutdown ( ) ; <nl> + } <nl> + } <nl> + <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - protected methods <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> mmm a / lib / Rest / AnyServer . h <nl> ppp b / lib / Rest / AnyServer . h <nl> namespace triagens { <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> class AnyServer { <nl> - public : <nl> - AnyServer ( AnyServer const & ) ; <nl> - AnyServer & operator = ( AnyServer const & ) ; <nl> + AnyServer ( AnyServer const & ) ; <nl> + AnyServer & operator = ( AnyServer const & ) ; <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ } <nl> namespace triagens { <nl> public : <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief start the server <nl> + / / / @ brief starts the server <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> int start ( ) ; <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief begins shutdown sequence <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + void beginShutdown ( ) ; <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ } <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> new file mode 100644 <nl> index 00000000000 . . a7044a1f81d <nl> mmm / dev / null <nl> ppp b / lib / Utilities / LineEditor - linenoise . cpp <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief abstract line editor <nl> + / / / <nl> + / / / @ file <nl> + / / / <nl> + / / / DISCLAIMER <nl> + / / / <nl> + / / / Copyright 2004 - 2013 triAGENS GmbH , Cologne , Germany <nl> + / / / <nl> + / / / Licensed under the Apache License , Version 2 . 0 ( the " License " ) ; <nl> + / / / you may not use this file except in compliance with the License . <nl> + / / / You may obtain a copy of the License at <nl> + / / / <nl> + / / / http : / / www . apache . org / licenses / LICENSE - 2 . 0 <nl> + / / / <nl> + / / / Unless required by applicable law or agreed to in writing , software <nl> + / / / distributed under the License is distributed on an " AS IS " BASIS , <nl> + / / / WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> + / / / See the License for the specific language governing permissions and <nl> + / / / limitations under the License . <nl> + / / / <nl> + / / / Copyright holder is triAGENS GmbH , Cologne , Germany <nl> + / / / <nl> + / / / @ author Dr . Frank Celler <nl> + / / / @ author Copyright 2011 - 2013 , triAGENS GmbH , Cologne , Germany <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + # include " LineEditor . h " <nl> + <nl> + extern " C " { <nl> + # include < linenoise . h > <nl> + } <nl> + <nl> + # include " BasicsC / tri - strings . h " <nl> + # include " BasicsC / files . h " <nl> + <nl> + using namespace std ; <nl> + <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + / / - - SECTION - - class LineEditor <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + / / - - SECTION - - constructors and destructors <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief constructs a new editor <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + LineEditor : : LineEditor ( std : : string const & history ) <nl> + : _current ( ) , <nl> + _historyFilename ( history ) , <nl> + _state ( STATE_NONE ) { <nl> + } <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief destructor <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + LineEditor : : ~ LineEditor ( ) { <nl> + close ( ) ; <nl> + } <nl> + <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + / / - - SECTION - - public methods <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief line editor open <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + bool LineEditor : : open ( bool ) { <nl> + linenoiseHistoryLoad ( historyPath ( ) . c_str ( ) ) ; <nl> + <nl> + _state = STATE_OPENED ; <nl> + <nl> + return true ; <nl> + } <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief line editor shutdown <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + bool LineEditor : : close ( ) { <nl> + if ( _state ! = STATE_OPENED ) { <nl> + / / avoid duplicate saving of history <nl> + return true ; <nl> + } <nl> + <nl> + _state = STATE_CLOSED ; <nl> + <nl> + return writeHistory ( ) ; <nl> + } <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief get the history file path <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + string LineEditor : : historyPath ( ) { <nl> + string path ; <nl> + <nl> + path = TRI_HomeDirectory ( ) ; <nl> + path + = ' / ' ; <nl> + <nl> + path . append ( _historyFilename ) ; <nl> + <nl> + return path ; <nl> + } <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief add to history <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + void LineEditor : : addHistory ( char const * str ) { <nl> + if ( * str = = ' \ 0 ' ) { <nl> + return ; <nl> + } <nl> + <nl> + linenoiseHistoryAdd ( str ) ; <nl> + } <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief save history <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + bool LineEditor : : writeHistory ( ) { <nl> + linenoiseHistorySave ( historyPath ( ) . c_str ( ) ) ; <nl> + <nl> + return true ; <nl> + } <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief line editor prompt <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + char * LineEditor : : prompt ( char const * prompt ) { <nl> + string dotdot ; <nl> + char const * p = prompt ; <nl> + size_t len1 = strlen ( prompt ) ; <nl> + size_t len2 = len1 ; <nl> + size_t lineno = 0 ; <nl> + <nl> + if ( len1 < 3 ) { <nl> + dotdot = " > " ; <nl> + len2 = 2 ; <nl> + } <nl> + else { <nl> + dotdot = string ( len1 - 2 , ' . ' ) + " > " ; <nl> + } <nl> + <nl> + char const * sep = " " ; <nl> + <nl> + while ( true ) { <nl> + char * result = linenoise ( p ) ; <nl> + <nl> + p = dotdot . c_str ( ) ; <nl> + <nl> + if ( result = = 0 ) { <nl> + <nl> + / / give up , if the user pressed control - D on the top - most level <nl> + if ( _current . empty ( ) ) { <nl> + return 0 ; <nl> + } <nl> + <nl> + / / otherwise clear current content <nl> + _current . clear ( ) ; <nl> + break ; <nl> + } <nl> + <nl> + _current + = sep ; <nl> + sep = " \ n " ; <nl> + + + lineno ; <nl> + <nl> + / / remove any prompt at the beginning of the line <nl> + char * originalLine = result ; <nl> + bool c1 = strncmp ( result , prompt , len1 ) = = 0 ; <nl> + bool c2 = strncmp ( result , dotdot . c_str ( ) , len2 ) = = 0 ; <nl> + <nl> + while ( c1 | | c2 ) { <nl> + if ( c1 ) { <nl> + result + = len1 ; <nl> + } <nl> + else if ( c2 ) { <nl> + result + = len2 ; <nl> + } <nl> + <nl> + c1 = strncmp ( result , prompt , len1 ) = = 0 ; <nl> + c2 = strncmp ( result , dotdot . c_str ( ) , len2 ) = = 0 ; <nl> + } <nl> + <nl> + / / extend line and check <nl> + _current + = result ; <nl> + <nl> + bool ok = isComplete ( _current , lineno , strlen ( result ) ) ; <nl> + <nl> + / / cannot use TRI_Free , because it was allocated by the system call readline <nl> + TRI_SystemFree ( originalLine ) ; <nl> + <nl> + / / stop if line is complete <nl> + if ( ok ) { <nl> + break ; <nl> + } <nl> + } <nl> + <nl> + char * line = TRI_DuplicateStringZ ( TRI_UNKNOWN_MEM_ZONE , _current . c_str ( ) ) ; <nl> + _current . clear ( ) ; <nl> + <nl> + return line ; <nl> + } <nl> + <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + / / - - SECTION - - END - OF - FILE <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + <nl> + / / Local Variables : <nl> + / / mode : outline - minor <nl> + / / outline - regexp : " / / / @ brief \ \ | / / / { @ inheritDoc } \ \ | / / / @ addtogroup \ \ | / / / @ page \ \ | / / - - SECTION - - \ \ | / / / @ \ \ } " <nl> + / / End : <nl> similarity index 84 % <nl> rename from lib / Utilities / LineEditor . cpp <nl> rename to lib / Utilities / LineEditor - readline . cpp <nl> mmm a / lib / Utilities / LineEditor . cpp <nl> ppp b / lib / Utilities / LineEditor - readline . cpp <nl> using namespace std ; <nl> / / - - SECTION - - constructors and destructors <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief constructs a new editor <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> LineEditor : : ~ LineEditor ( ) { <nl> close ( ) ; <nl> } <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - public methods <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief line editor open <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> - bool LineEditor : : open ( bool ) { <nl> + bool LineEditor : : open ( bool autoComplete ) { <nl> + if ( autoComplete ) { <nl> + <nl> + / / issue # 289 : do not append a space after completion <nl> + rl_completion_append_character = ' \ 0 ' ; <nl> + <nl> + / / works only in Readline 4 . 2 + <nl> + # if RL_READLINE_VERSION > = 0x0500 <nl> + / / enable this to turn on the visual bell - evil ! <nl> + / / rl_variable_bind ( " prefer - visible - bell " , " 1 " ) ; <nl> + <nl> + / / use this for single - line editing as in mongodb shell <nl> + / / rl_variable_bind ( " horizontal - scroll - mode " , " 1 " ) ; <nl> + <nl> + / / show matching parentheses <nl> + rl_set_paren_blink_timeout ( 1 * 1000 * 1000 ) ; <nl> + rl_variable_bind ( " blink - matching - paren " , " 1 " ) ; <nl> + <nl> + / / show selection list when completion is ambiguous . not setting this <nl> + / / variable will turn the selection list off at least on Ubuntu <nl> + rl_variable_bind ( " show - all - if - ambiguous " , " 1 " ) ; <nl> + <nl> + / / use readline ' s built - in page - wise completer <nl> + rl_variable_bind ( " page - completions " , " 1 " ) ; <nl> + # endif <nl> + <nl> + rl_bind_key ( ' \ t ' , rl_complete ) ; <nl> + } <nl> + <nl> using_history ( ) ; <nl> stifle_history ( MAX_HISTORY_ENTRIES ) ; <nl> <nl> char * LineEditor : : prompt ( char const * prompt ) { <nl> return line ; <nl> } <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + / / - - SECTION - - END - OF - FILE <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> / / Local Variables : <nl> / / mode : outline - minor <nl> mmm a / lib / Utilities / LineEditor . h <nl> ppp b / lib / Utilities / LineEditor . h <nl> <nl> / / - - SECTION - - class LineEditor <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief line editor <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> class LineEditor { <nl> LineEditor ( LineEditor const & ) ; <nl> LineEditor & operator = ( LineEditor const & ) ; <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - public constants <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> public : <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> class LineEditor { <nl> <nl> static const int MAX_HISTORY_ENTRIES = 1000 ; <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - constructors and destructors <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> public : <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> class LineEditor { <nl> <nl> virtual ~ LineEditor ( ) ; <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - public methods <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> public : <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> class LineEditor { <nl> / / - - SECTION - - protected methods <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief check if line is complete <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> virtual bool isComplete ( std : : string const & , size_t lineno , size_t column ) = 0 ; <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - private types <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> private : <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> class LineEditor { <nl> } <nl> console_state_e ; <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - protected variables <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> protected : <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> class LineEditor { <nl> console_state_e _state ; <nl> } ; <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> # endif <nl> <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + / / - - SECTION - - END - OF - FILE <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + <nl> / / Local Variables : <nl> / / mode : outline - minor <nl> / / outline - regexp : " / / / @ brief \ \ | / / / { @ inheritDoc } \ \ | / / / @ addtogroup \ \ | / / / @ page \ \ | / / - - SECTION - - \ \ | / / / @ \ \ } " <nl> mmm a / lib / V8 / V8LineEditor . cpp <nl> ppp b / lib / V8 / V8LineEditor . cpp <nl> <nl> <nl> # include " V8LineEditor . h " <nl> <nl> + # ifdef TRI_HAVE_LINENOISE <nl> + # include < linenoise . h > <nl> + # else <nl> # include < readline / readline . h > <nl> # include < readline / history . h > <nl> + # endif <nl> <nl> # include " BasicsC / tri - strings . h " <nl> # include " V8 / v8 - utils . h " <nl> <nl> + # ifndef TRI_HAVE_LINENOISE <nl> # if RL_READLINE_VERSION > = 0x0500 <nl> # define completion_matches rl_completion_matches <nl> # endif <nl> + # endif <nl> <nl> using namespace std ; <nl> <nl> using namespace std ; <nl> / / - - SECTION - - private variables <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup V8Shell <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief word break characters <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> static char WordBreakCharacters [ ] = { <nl> ' \ 0 ' <nl> } ; <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - private functions <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup V8LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief completion generator <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> static char * CompletionGenerator ( char const * text , int state ) { <nl> / / / @ brief attempted completion <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> + # ifdef TRI_HAVE_LINENOISE <nl> + <nl> + # else <nl> + <nl> static char * * AttemptedCompletion ( char const * text , int start , int end ) { <nl> char * * result ; <nl> <nl> static char * * AttemptedCompletion ( char const * text , int start , int end ) { <nl> return result ; <nl> } <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + # endif <nl> <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - constructors and destructors <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup V8LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief constructs a new editor <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> V8LineEditor : : V8LineEditor ( v8 : : Handle < v8 : : Context > context , std : : string const & <nl> : LineEditor ( history ) , _context ( context ) { <nl> } <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - public methods <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup V8LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief line editor open <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> bool V8LineEditor : : open ( const bool autoComplete ) { <nl> if ( autoComplete ) { <nl> + # ifdef TRI_HAVE_LINENOISE <nl> <nl> - / / issue # 289 : do not append a space after completion <nl> - rl_completion_append_character = ' \ 0 ' ; <nl> - <nl> - / / works only in Readline 4 . 2 + <nl> - # if RL_READLINE_VERSION > = 0x0500 <nl> - / / enable this to turn on the visual bell - evil ! <nl> - / / rl_variable_bind ( " prefer - visible - bell " , " 1 " ) ; <nl> - <nl> - / / use this for single - line editing as in mongodb shell <nl> - / / rl_variable_bind ( " horizontal - scroll - mode " , " 1 " ) ; <nl> - <nl> - / / show matching parentheses <nl> - rl_set_paren_blink_timeout ( 1 * 1000 * 1000 ) ; <nl> - rl_variable_bind ( " blink - matching - paren " , " 1 " ) ; <nl> - <nl> - / / show selection list when completion is ambiguous . not setting this <nl> - / / variable will turn the selection list off at least on Ubuntu <nl> - rl_variable_bind ( " show - all - if - ambiguous " , " 1 " ) ; <nl> - <nl> - / / use readline ' s built - in page - wise completer <nl> - rl_variable_bind ( " page - completions " , " 1 " ) ; <nl> - # endif <nl> + # else <nl> <nl> rl_attempted_completion_function = AttemptedCompletion ; <nl> rl_completer_word_break_characters = WordBreakCharacters ; <nl> <nl> - rl_bind_key ( ' \ t ' , rl_complete ) ; <nl> + # endif <nl> } <nl> <nl> return LineEditor : : open ( autoComplete ) ; <nl> } <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - protected methods <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief check if line is complete <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> bool V8LineEditor : : isComplete ( string const & source , size_t , size_t ) { <nl> return openParen < = 0 & & openBrackets < = 0 & & openBraces < = 0 ; <nl> } <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + / / - - SECTION - - END - OF - FILE <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> / / Local Variables : <nl> / / mode : outline - minor <nl> mmm a / lib / V8 / V8LineEditor . h <nl> ppp b / lib / V8 / V8LineEditor . h <nl> <nl> / / - - SECTION - - class V8LineEditor <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief line editor <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> class V8LineEditor : public LineEditor { <nl> V8LineEditor ( LineEditor const & ) ; <nl> V8LineEditor & operator = ( LineEditor const & ) ; <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - constructors and destructors <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> public : <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> class V8LineEditor : public LineEditor { <nl> <nl> V8LineEditor ( v8 : : Handle < v8 : : Context > , std : : string const & history ) ; <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - public methods <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> public : <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> class V8LineEditor : public LineEditor { <nl> <nl> bool open ( bool ) ; <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - protected methods <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief check if line is complete <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> bool isComplete ( std : : string const & , size_t lineno , size_t column ) ; <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> / / - - SECTION - - private variables <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ addtogroup LineEditor <nl> - / / / @ { <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> private : <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> class V8LineEditor : public LineEditor { <nl> v8 : : Handle < v8 : : Context > _context ; <nl> } ; <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ } <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> # endif <nl> <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + / / - - SECTION - - END - OF - FILE <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + <nl> / / Local Variables : <nl> / / mode : outline - minor <nl> / / outline - regexp : " / / / @ brief \ \ | / / / { @ inheritDoc } \ \ | / / / @ addtogroup \ \ | / / / @ page \ \ | / / - - SECTION - - \ \ | / / / @ \ \ } " <nl> deleted file mode 100644 <nl> index 6fd380d4ecf . . 00000000000 <nl> mmm a / utils / CMakeLists . txt <nl> ppp / dev / null <nl> <nl> - # - * - mode : CMAKE ; - * - <nl> - <nl> - # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> - # # - - SECTION - - COMMON INCLUDES <nl> - # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> - <nl> - # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> - # # - - SECTION - - SCRIPTS <nl> - # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> - <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief output directory <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - <nl> - set ( CMAKE_RUNTIME_OUTPUT_DIRECTORY " $ { PROJECT_BINARY_DIR } / bin / " ) <nl> - <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief arango - dfdb <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - <nl> - FILE ( READ $ { PROJECT_SOURCE_DIR } / utils / $ { SCRIPT_ARANGO_DFDB } . in FileContent ) <nl> - <nl> - STRING ( REPLACE " @ SBINDIR @ " " $ { TRI_SBINDIR } " <nl> - FileContent " $ { FileContent } " ) <nl> - <nl> - STRING ( REPLACE " @ LOCALSTATEDIR @ " " $ { VARDIR } " <nl> - FileContent " $ { FileContent } " ) <nl> - <nl> - STRING ( REPLACE " @ PKGDATADIR @ " " $ { TRI_PKGDATADIR } " <nl> - FileContent " $ { FileContent } " ) <nl> - <nl> - FILE ( WRITE $ { CMAKE_RUNTIME_OUTPUT_DIRECTORY } / $ { SCRIPT_ARANGO_DFDB } " $ { FileContent } " ) <nl> - <nl> - install ( <nl> - PROGRAMS $ { CMAKE_RUNTIME_OUTPUT_DIRECTORY } / $ { SCRIPT_ARANGO_DFDB } <nl> - DESTINATION bin ) <nl> - <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief foxx - manager <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - <nl> - FILE ( READ $ { PROJECT_SOURCE_DIR } / utils / $ { SCRIPT_FOXX_MANAGER } . in FileContent ) <nl> - <nl> - STRING ( REPLACE " @ BINDIR @ " " $ { TRI_BINDIR } " <nl> - FileContent " $ { FileContent } " ) <nl> - <nl> - FILE ( WRITE $ { CMAKE_RUNTIME_OUTPUT_DIRECTORY } / $ { SCRIPT_FOXX_MANAGER } " $ { FileContent } " ) <nl> - <nl> - install ( <nl> - PROGRAMS $ { CMAKE_RUNTIME_OUTPUT_DIRECTORY } / $ { SCRIPT_FOXX_MANAGER } <nl> - DESTINATION bin ) <nl> - <nl> - # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> - # # - - SECTION - - END - OF - FILE <nl> - # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> - <nl> - # # Local Variables : <nl> - # # mode : outline - minor <nl> - # # outline - regexp : " ^ \ \ ( # # # @ brief \ \ | # # - - SECTION - - \ \ | # - \ \ * - \ \ ) " <nl> - # # End : <nl> deleted file mode 100644 <nl> index 6eb7adeae89 . . 00000000000 <nl> mmm a / utils / Makefile . files <nl> ppp / dev / null <nl> <nl> - # - * - mode : Makefile ; - * - <nl> - <nl> - # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> - # # - - SECTION - - UTIL SCRIPTS <nl> - # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> - <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief / sbin programs <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - <nl> - bin_SCRIPTS + = \ <nl> - bin / arango - dfdb \ <nl> - bin / foxx - manager <nl> - <nl> - CLEANUP + = $ ( bin_SCRIPTS ) <nl> - <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief arango datafile debugger <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - <nl> - bin / arango - dfdb : utils / arango - dfdb . in <nl> - sed \ <nl> - - e ' s % @ SBINDIR @ % $ { TRI_SBINDIR } % g ' \ <nl> - - e ' s % @ LOCALSTATEDIR @ % $ { TRI_LOCALSTATEDIR } % g ' \ <nl> - - e ' s % @ PKGDATADIR @ % $ { TRI_PKGDATADIR } % g ' \ <nl> - $ < > $ @ <nl> - chmod 755 $ @ <nl> - <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - # # # @ brief foxx manager <nl> - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> - <nl> - bin / foxx - manager : utils / foxx - manager . in <nl> - sed \ <nl> - - e ' s % @ BINDIR @ % $ { TRI_BINDIR } % g ' \ <nl> - $ < > $ @ <nl> - chmod 755 $ @ <nl> - <nl> - # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> - # # - - SECTION - - END - OF - FILE <nl> - # # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> - <nl> - # # Local Variables : <nl> - # # mode : outline - minor <nl> - # # outline - regexp : " ^ \ \ ( # # # @ brief \ \ | # # - - SECTION - - \ \ | # - \ \ * - \ \ ) " <nl> - # # End : <nl> deleted file mode 100644 <nl> index a79b1569372 . . 00000000000 <nl> mmm a / utils / arango - dfdb . in <nl> ppp / dev / null <nl> <nl> - # ! / bin / bash <nl> - <nl> - # Placeholders starting with @ will be replaced by make <nl> - <nl> - ARANGOD = " $ { ARANGODB_ROOT } @ SBINDIR @ / arangod " <nl> - DATABASE = " $ { ARANGODB_ROOT } @ LOCALSTATEDIR @ / lib / arangodb " <nl> - APPPATH = " $ { ARANGODB_ROOT } @ LOCALSTATEDIR @ / lib / arangodb - apps " <nl> - STARTUPPATH = " $ { ARANGODB_ROOT } @ PKGDATADIR @ / js " <nl> - SCRIPT = " $ { ARANGODB_ROOT } @ PKGDATADIR @ / js / server / arango - dfdb . js " <nl> - <nl> - if [ " $ 1 " = = " - - relative " ] ; then <nl> - shift <nl> - ARANGOD = " . / bin / arangod " <nl> - MODULESPATH = " . / js / server / modules ; . / js / common / modules ; . / js / node " <nl> - PACKAGEPATH = " . / js / npm " <nl> - APPPATH = " . / js / apps " <nl> - STARTUPPATH = " . / js " <nl> - SCRIPT = " . / js / server / arango - dfdb . js " <nl> - fi <nl> - <nl> - if [ " $ 1 " = = " - - database " ] | | [ " $ 1 " = = " - - database . directory " ] ; then <nl> - shift <nl> - DATABASE = " $ 1 " <nl> - shift <nl> - fi <nl> - <nl> - if test - z " $ DATABASE " ; then <nl> - echo " $ 0 : please specify a database directory using ' - - database ' " <nl> - exit 1 <nl> - fi <nl> - <nl> - if test ! - d " $ DATABASE " ; then <nl> - echo " $ 0 : database directory ' $ DATABASE ' does not exist " <nl> - exit 1 <nl> - fi <nl> - <nl> - $ ARANGOD \ <nl> - - c none \ <nl> - - - no - upgrade \ <nl> - - - database . directory " $ DATABASE " \ <nl> - - - javascript . startup - directory " $ STARTUPPATH " \ <nl> - - - javascript . app - path " $ APPPATH " \ <nl> - - - javascript . script " $ SCRIPT " <nl> deleted file mode 100644 <nl> index 0013c86de5c . . 00000000000 <nl> mmm a / utils / foxx - manager . in <nl> ppp / dev / null <nl> <nl> - # ! / bin / bash <nl> - <nl> - # Placeholders starting with @ will be replaced by make <nl> - <nl> - ARANGOSH = " $ { ARANGODB_ROOT } @ BINDIR @ / arangosh " <nl> - RCFILE = " " <nl> - <nl> - if [ " $ 1 " = = " - - relative " ] ; then <nl> - shift <nl> - ARANGOSH = " . / bin / arangosh " <nl> - RCFILE = " - c etc / relative / arangosh . conf " <nl> - fi <nl> - <nl> - $ ARANGOSH \ <nl> - $ RCFILE \ <nl> - - - javascript . execute - string ' require ( " org / arangodb / foxx / manager " ) . run ( ARGUMENTS ) ; ' \ <nl> - " $ @ " <nl>
|
merged changes from 1 . 4 back to devel
|
arangodb/arangodb
|
84507cfc44602cc075961ba616f714bd96efe34e
|
2013-12-27T13:59:23Z
|
mmm a / tensorflow / contrib / factorization / python / ops / gmm . py <nl> ppp b / tensorflow / contrib / factorization / python / ops / gmm . py <nl> def predict ( self , x , batch_size = None ) : <nl> Returns : <nl> Array with same number of rows as x , containing cluster ids . <nl> " " " <nl> - return super ( GMM , self ) . predict ( x = x , batch_size = batch_size ) [ GMM . ASSIGNMENTS ] <nl> + return np . array ( [ <nl> + prediction [ GMM . ASSIGNMENTS ] for prediction in <nl> + super ( GMM , self ) . predict ( x = x , batch_size = batch_size , as_iterable = True ) ] ) <nl> <nl> def score ( self , x , batch_size = None ) : <nl> " " " Predict total sum of distances to nearest clusters . <nl> def transform ( self , x , batch_size = None ) : <nl> Array with same number of rows as x , and num_clusters columns , containing <nl> distances to the cluster centers . <nl> " " " <nl> - return super ( GMM , self ) . predict ( x = x , batch_size = batch_size ) [ GMM . ALL_SCORES ] <nl> + return np . array ( [ <nl> + prediction [ GMM . ALL_SCORES ] for prediction in <nl> + super ( GMM , self ) . predict ( x = x , batch_size = batch_size , as_iterable = True ) ] ) <nl> <nl> def clusters ( self ) : <nl> " " " Returns cluster centers . " " " <nl> def _get_predict_ops ( self , features ) : <nl> self . _params ) <nl> return { <nl> GMM . ALL_SCORES : all_scores [ 0 ] , <nl> - GMM . ASSIGNMENTS : model_predictions [ 0 ] <nl> + GMM . ASSIGNMENTS : model_predictions [ 0 ] [ 0 ] , <nl> } <nl> <nl> def _get_eval_ops ( self , features , _ , unused_metrics ) : <nl> mmm a / tensorflow / contrib / factorization / python / ops / kmeans . py <nl> ppp b / tensorflow / contrib / factorization / python / ops / kmeans . py <nl> def predict ( self , x , batch_size = None ) : <nl> Returns : <nl> Array with same number of rows as x , containing cluster ids . <nl> " " " <nl> - return super ( KMeansClustering , self ) . predict ( <nl> - x = x , batch_size = batch_size ) [ KMeansClustering . CLUSTER_IDX ] <nl> + return np . array ( [ <nl> + prediction [ KMeansClustering . CLUSTER_IDX ] for prediction in <nl> + super ( KMeansClustering , self ) . predict ( <nl> + x = x , batch_size = batch_size , as_iterable = True ) ] ) <nl> <nl> def score ( self , x , batch_size = None ) : <nl> " " " Predict total sum of distances to nearest clusters . <nl> def transform ( self , x , batch_size = None ) : <nl> Array with same number of rows as x , and num_clusters columns , containing <nl> distances to the cluster centers . <nl> " " " <nl> - return super ( KMeansClustering , self ) . predict ( <nl> - x = x , batch_size = batch_size ) [ KMeansClustering . ALL_SCORES ] <nl> + return np . array ( [ <nl> + prediction [ KMeansClustering . ALL_SCORES ] for prediction in <nl> + super ( KMeansClustering , self ) . predict ( <nl> + x = x , batch_size = batch_size , as_iterable = True ) ] ) <nl> <nl> def clusters ( self ) : <nl> " " " Returns cluster centers . " " " <nl>
|
Convert Estimators in tf / contrib / factorization to use iterable form of
|
tensorflow/tensorflow
|
69a76bedcd024046f71139f9cbb13a0278a15675
|
2016-08-17T21:18:47Z
|
mmm a / aten / src / ATen / native / cpu / UnaryOpsKernel . cpp <nl> ppp b / aten / src / ATen / native / cpu / UnaryOpsKernel . cpp <nl> static void sign_kernel ( TensorIterator & iter ) { <nl> <nl> static void sinh_kernel ( TensorIterator & iter ) { <nl> AT_DISPATCH_FLOATING_AND_COMPLEX_TYPES ( iter . dtype ( ) , " sinh_cpu " , [ & ] ( ) { <nl> - cpu_kernel ( <nl> + cpu_kernel_vec ( <nl> iter , <nl> - [ = ] ( scalar_t a ) - > scalar_t { return std : : sinh ( a ) ; } ) ; <nl> + [ = ] ( scalar_t a ) - > scalar_t { return std : : sinh ( a ) ; } , <nl> + [ = ] ( Vec256 < scalar_t > self_vec ) { return self_vec . sinh ( ) ; } ) ; <nl> } ) ; <nl> } <nl> <nl> static void cosh_kernel ( TensorIterator & iter ) { <nl> AT_DISPATCH_FLOATING_AND_COMPLEX_TYPES ( iter . dtype ( ) , " cosh_cpu " , [ & ] ( ) { <nl> - cpu_kernel ( <nl> + cpu_kernel_vec ( <nl> iter , <nl> - [ = ] ( scalar_t a ) - > scalar_t { return std : : cosh ( a ) ; } ) ; <nl> + [ = ] ( scalar_t a ) - > scalar_t { return std : : cosh ( a ) ; } , <nl> + [ = ] ( Vec256 < scalar_t > self_vec ) { return self_vec . cosh ( ) ; } ) ; <nl> } ) ; <nl> } <nl> <nl>
|
Utilise the vector version for sinh and cosh ( UnaryOpsKernel ) ( )
|
pytorch/pytorch
|
03af4dcbbf3a90c8c79d0937a24673c46af4bae4
|
2020-06-22T18:38:37Z
|
mmm a / tensorflow / tools / ci_build / Dockerfile . android <nl> ppp b / tensorflow / tools / ci_build / Dockerfile . android <nl> ENV BAZELRC / root / . bazelrc <nl> # Install extra libraries for android sdk . <nl> # ( see http : / / stackoverflow . com / questions / 33427893 / can - not - run - android - sdk - build - tools - 23 - 0 - 2 - aapt ) <nl> RUN apt - get update & & apt - get install - y \ <nl> + python - numpy \ <nl> lib32stdc + + 6 \ <nl> lib32z1 \ <nl> & & \ <nl> mmm a / tensorflow / tools / ci_build / install / install_deb_packages . sh <nl> ppp b / tensorflow / tools / ci_build / install / install_deb_packages . sh <nl> set - e <nl> # Install dependencies from ubuntu deb repository . <nl> apt - get update <nl> <nl> - # gfortran , atlas , blas and lapack required by scipy pip install <nl> apt - get install - y \ <nl> autoconf \ <nl> automake \ <nl> - bc \ <nl> build - essential \ <nl> cmake \ <nl> curl \ <nl> ffmpeg \ <nl> git \ <nl> - gfortran \ <nl> - libatlas - base - dev \ <nl> - libblas - dev \ <nl> libcurl4 - openssl - dev \ <nl> - liblapack - dev \ <nl> libtool \ <nl> openjdk - 8 - jdk \ <nl> openjdk - 8 - jre - headless \ <nl> pkg - config \ <nl> python - dev \ <nl> - python - pandas \ <nl> python - pip \ <nl> python - virtualenv \ <nl> python3 - dev \ <nl> - python3 - pandas \ <nl> python3 - pip \ <nl> sudo \ <nl> swig \ <nl> mmm a / tensorflow / tools / ci_build / install / install_pip_packages . sh <nl> ppp b / tensorflow / tools / ci_build / install / install_pip_packages . sh <nl> set - e <nl> <nl> # Use pip to install numpy to the latest version , instead of 1 . 8 . 2 through <nl> # apt - get <nl> - wget - q https : / / pypi . python . org / packages / 06 / 92 / 3c786303889e6246971ad4c48ac2b4e37a1b1c67c0dc2106dc85cb15c18e / numpy - 1 . 11 . 0 - cp27 - cp27mu - manylinux1_x86_64 . whl # md5 = 6ffb66ff78c28c55bfa09a2ceee487df <nl> - mv numpy - 1 . 11 . 0 - cp27 - cp27mu - manylinux1_x86_64 . whl \ <nl> - numpy - 1 . 11 . 0 - cp27 - none - linux_x86_64 . whl <nl> - pip install numpy - 1 . 11 . 0 - cp27 - none - linux_x86_64 . whl <nl> - rm numpy - 1 . 11 . 0 - cp27 - none - linux_x86_64 . whl <nl> + wget - q https : / / pypi . python . org / packages / 17 / f3 / 404bc85be67150663024d2bb5af654c7d16cf678077690dda27b91be14eb / numpy - 1 . 8 . 2 - cp27 - cp27mu - manylinux1_x86_64 . whl # md5 = 3ccf5c004fc99bd06dd443de80d622e6 <nl> + mv numpy - 1 . 8 . 2 - cp27 - cp27mu - manylinux1_x86_64 . whl \ <nl> + numpy - 1 . 8 . 2 - cp27 - none - linux_x86_64 . whl <nl> + pip install numpy - 1 . 8 . 2 - cp27 - none - linux_x86_64 . whl <nl> + rm numpy - 1 . 8 . 2 - cp27 - none - linux_x86_64 . whl <nl> <nl> - wget - q https : / / pypi . python . org / packages / ea / ca / 5e48a68be496e6f79c3c8d90f7c03ea09bbb154ea4511f5b3d6c825cefe5 / numpy - 1 . 11 . 0 - cp34 - cp34m - manylinux1_x86_64 . whl # md5 = 08a002aeffa20354aa5045eadb549361 <nl> - mv numpy - 1 . 11 . 0 - cp34 - cp34m - manylinux1_x86_64 . whl \ <nl> - numpy - 1 . 11 . 0 - cp34 - cp34m - linux_x86_64 . whl <nl> - pip3 install numpy - 1 . 11 . 0 - cp34 - cp34m - linux_x86_64 . whl <nl> - rm numpy - 1 . 11 . 0 - cp34 - cp34m - linux_x86_64 . whl <nl> + wget - q https : / / pypi . python . org / packages / 33 / 7d / 46d8905d39f462e0f6d1f38e1d165adc2939b9f91ca800e1cba8ef0c0f24 / numpy - 1 . 8 . 2 - cp34 - cp34m - manylinux1_x86_64 . whl # md5 = 528b2b555d2b6979f10e444cacc04fc9 <nl> + mv numpy - 1 . 8 . 2 - cp34 - cp34m - manylinux1_x86_64 . whl \ <nl> + numpy - 1 . 8 . 2 - cp34 - none - linux_x86_64 . whl <nl> + pip3 install numpy - 1 . 8 . 2 - cp34 - none - linux_x86_64 . whl <nl> + rm numpy - 1 . 8 . 2 - cp34 - none - linux_x86_64 . whl <nl> <nl> # Use pip to install scipy to get the latest version , instead of 0 . 13 through <nl> # apt - get . <nl> - # pip install scipy = = 0 . 17 . 1 <nl> - wget - q https : / / pypi . python . org / packages / 8a / de / 326cf31a5a3ba0c01c40cdd78f7140b0510ed80e6d5ec5b2ec173c72df03 / scipy - 0 . 17 . 1 - cp27 - cp27mu - manylinux1_x86_64 . whl # md5 = 8d0df61ceba78a2796f8d90fc979576f <nl> - mv scipy - 0 . 17 . 1 - cp27 - cp27mu - manylinux1_x86_64 . whl \ <nl> - scipy - 0 . 17 . 1 - cp27 - none - linux_x86_64 . whl <nl> - pip install scipy - 0 . 17 . 1 - cp27 - none - linux_x86_64 . whl <nl> - rm scipy - 0 . 17 . 1 - cp27 - none - linux_x86_64 . whl <nl> + # pip install scipy = = 0 . 15 . 1 <nl> + wget - q https : / / pypi . python . org / packages / 00 / 0f / 060ec52cb74dc8df1a7ef1a524173eb0bcd329110404869b392685cfc5c8 / scipy - 0 . 15 . 1 - cp27 - cp27mu - manylinux1_x86_64 . whl # md5 = aaac02e6535742ab02f2075129890714 <nl> + mv scipy - 0 . 15 . 1 - cp27 - cp27mu - manylinux1_x86_64 . whl \ <nl> + scipy - 0 . 15 . 1 - cp27 - none - linux_x86_64 . whl <nl> + pip install scipy - 0 . 15 . 1 - cp27 - none - linux_x86_64 . whl <nl> + rm scipy - 0 . 15 . 1 - cp27 - none - linux_x86_64 . whl <nl> <nl> - # pip3 install scipy = = 0 . 17 . 1 <nl> - wget - q https : / / pypi . python . org / packages / eb / 2e / 76aff3b25dd06cab06622f82a4790ff5002ab686e940847bb2503b4b2122 / scipy - 0 . 17 . 1 - cp34 - cp34m - manylinux1_x86_64 . whl # md5 = bb39b9e1d16fa220967ad7edd39a8b28 <nl> - mv scipy - 0 . 17 . 1 - cp34 - cp34m - manylinux1_x86_64 . whl \ <nl> - scipy - 0 . 17 . 1 - cp34 - cp34m - linux_x86_64 . whl <nl> - pip3 install scipy - 0 . 17 . 1 - cp34 - cp34m - linux_x86_64 . whl <nl> - rm scipy - 0 . 17 . 1 - cp34 - cp34m - linux_x86_64 . whl <nl> + # pip3 install scipy = = 0 . 15 . 1 <nl> + wget - q https : / / pypi . python . org / packages / 56 / c5 / e0d36aaf719aa02ee3da19151045912e240d145586612e53b5eaa706e1db / scipy - 0 . 15 . 1 - cp34 - cp34m - manylinux1_x86_64 . whl # md5 = d5243b0f9d85f4f4cb62514c82af93d4 <nl> + mv scipy - 0 . 15 . 1 - cp34 - cp34m - manylinux1_x86_64 . whl \ <nl> + scipy - 0 . 15 . 1 - cp34 - cp34m - linux_x86_64 . whl <nl> + pip3 install scipy - 0 . 15 . 1 - cp34 - cp34m - linux_x86_64 . whl <nl> + rm scipy - 0 . 15 . 1 - cp34 - cp34m - linux_x86_64 . whl <nl> <nl> # pip install sklearn <nl> wget - q https : / / pypi . python . org / packages / bf / 80 / 06e77e5a682c46a3880ec487a5f9d910f5c8d919df9aca58052089687c7e / scikit_learn - 0 . 17 . 1 - cp27 - cp27mu - manylinux1_x86_64 . whl # md5 = 337b91f502138ba7fd722803138f6dfd <nl> mv scikit_learn - 0 . 17 . 1 - cp34 - cp34m - manylinux1_x86_64 . whl \ <nl> pip3 install scikit_learn - 0 . 17 . 1 - cp34 - cp34m - linux_x86_64 . whl <nl> rm scikit_learn - 0 . 17 . 1 - cp34 - cp34m - linux_x86_64 . whl <nl> <nl> + # pandas required by tf . learn / inflow <nl> + pip install pandas = = 0 . 18 . 1 <nl> + pip3 install pandas = = 0 . 18 . 1 <nl> + <nl> # Benchmark tests require the following : <nl> pip install psutil <nl> pip3 install psutil <nl> pip3 install py - cpuinfo <nl> # pylint tests require the following : <nl> pip install pylint <nl> pip3 install pylint <nl> - <nl> - # Remove packages in / usr / lib / python * that may interfere with packages in <nl> - # / usr / local / lib . These packages may get installed inadvertantly with packages <nl> - # such as apt - get python - pandas . Their older versions can mask the more recent <nl> - # versions installed above with pip and cause test failures . <nl> - rm - rf / usr / lib / python2 . 7 / dist - packages / numpy \ <nl> - / usr / lib / python2 . 7 / dist - packages / scipy \ <nl> - / usr / lib / python3 / dist - packages / numpy \ <nl> - / usr / lib / python3 / dist - packages / scipy <nl> mmm a / tensorflow / tools / ci_build / install / install_proto3 . sh <nl> ppp b / tensorflow / tools / ci_build / install / install_proto3 . sh <nl> <nl> <nl> set - e <nl> <nl> - # Select bazel version . <nl> + # Install protobuf3 . <nl> + <nl> + # Select protobuf version . <nl> PROTOBUF_VERSION = " 3 . 0 . 0 - beta - 2 " <nl> <nl> - # Install protobuf3 . <nl> - mkdir / protobuf <nl> - cd / protobuf <nl> - curl - fSsL - O https : / / github . com / google / protobuf / releases / download / v $ PROTOBUF_VERSION / protobuf - cpp - $ PROTOBUF_VERSION . tar . gz <nl> - tar zxf protobuf - cpp - $ PROTOBUF_VERSION . tar . gz <nl> - cd protobuf - $ PROTOBUF_VERSION <nl> - . / autogen . sh <nl> - . / configure <nl> - make <nl> - make install <nl> - make clean <nl> - ldconfig <nl> - cd / ; rm - rf / protobuf <nl> + PROTOBUF_URL = " https : / / github . com / google / protobuf / releases / download / v $ { PROTOBUF_VERSION } / protoc - $ { PROTOBUF_VERSION } - linux - x86_64 . zip " <nl> + PROTOBUF_ZIP = $ ( basename " $ { PROTOBUF_URL } " ) <nl> + UNZIP_DEST = " google - protobuf " <nl> + <nl> + wget - q " $ { PROTOBUF_URL } " <nl> + unzip " $ { PROTOBUF_ZIP } " - d " $ { UNZIP_DEST } " <nl> + cp " $ { UNZIP_DEST } / protoc " / usr / local / bin / <nl> + <nl> + rm - f " $ { PROTOBUF_ZIP } " <nl> + rm - rf " $ { UNZIP_DEST } " <nl> mmm a / tensorflow / tools / ci_build / install / install_python3 . 5_pip_packages . sh <nl> ppp b / tensorflow / tools / ci_build / install / install_python3 . 5_pip_packages . sh <nl> make install <nl> rm - f / usr / bin / swig <nl> ln - s / usr / local / bin / swig / usr / bin / swig <nl> <nl> - which swig <nl> - <nl> popd <nl> <nl> rm - rf swig - 3 . 0 . 8 <nl> pip3 . 5 install - - upgrade scikit - learn <nl> # Install recent - enough version of wheel for Python 3 . 5 wheel builds <nl> pip3 . 5 install wheel = = 0 . 29 . 0 <nl> <nl> + pip3 . 5 install - - upgrade pandas = = 0 . 18 . 1 <nl>
|
Deb and pip package cleanups ; faster protobuf install
|
tensorflow/tensorflow
|
f768aa720f8f71d3ac58c8641afba87fc1627928
|
2016-05-28T13:40:02Z
|
mmm a / include / swift / Parse / Lexer . h <nl> ppp b / include / swift / Parse / Lexer . h <nl> class Lexer { <nl> / / / need to take a LangOptions explicitly . <nl> / / / \ param InSILMode - whether we ' re parsing a SIL source file . <nl> / / / Unlike language options , this does affect primitive lexing , which <nl> - / / / means that APIs like getLofForEndOfToken really ought to take <nl> + / / / means that APIs like getLocForEndOfToken really ought to take <nl> / / / this flag ; it ' s just that we don ' t care that much about fidelity <nl> / / / when parsing SIL files . <nl> Lexer ( const LangOptions & Options , <nl>
|
Merge pull request from practicalswift / typo - fixes - 20160214
|
apple/swift
|
c3babf6ce63e9b6a30385c31e1cac086dc0e7fc8
|
2016-02-14T23:05:36Z
|
mmm a / conformance / Makefile . am <nl> ppp b / conformance / Makefile . am <nl> conformance_protoc_inputs = \ <nl> conformance . proto \ <nl> $ ( top_srcdir ) / src / google / protobuf / test_messages_proto3 . proto <nl> <nl> + # proto2 input files , should be separated with proto3 , as we <nl> + # can ' t generate proto2 files for ruby , php and objc <nl> conformance_proto2_protoc_inputs = \ <nl> - conformance . proto \ <nl> $ ( top_srcdir ) / src / google / protobuf / test_messages_proto2 . proto <nl> <nl> well_known_type_protoc_inputs = \ <nl>
|
add comments in makefile . am
|
protocolbuffers/protobuf
|
bceb830c396e3370d4cc15e0d4f96ed1819dcca9
|
2017-07-05T19:15:53Z
|
mmm a / xbmc / ContextMenuManager . cpp <nl> ppp b / xbmc / ContextMenuManager . cpp <nl> ContextMenuView CContextMenuManager : : GetAddonItems ( const CFileItem & fileItem , co <nl> result . emplace_back ( new CContextMenuItem ( menu ) ) ; <nl> } <nl> <nl> - if ( & root = = & MAIN | | & root = = & MANAGE ) <nl> + if ( & root = = & MANAGE ) <nl> { <nl> std : : sort ( result . begin ( ) , result . end ( ) , <nl> [ & ] ( const ContextMenuView : : value_type & lhs , const ContextMenuView : : value_type & rhs ) <nl> mmm a / xbmc / addons / ContextMenuAddon . cpp <nl> ppp b / xbmc / addons / ContextMenuAddon . cpp <nl> void CContextMenuAddon : : ParseMenu ( <nl> auto menuId = CServiceBroker : : GetAddonMgr ( ) . GetExtValue ( elem , " @ id " ) ; <nl> auto menuLabel = CServiceBroker : : GetAddonMgr ( ) . GetExtValue ( elem , " label " ) ; <nl> if ( StringUtils : : IsNaturalNumber ( menuLabel ) ) <nl> - menuLabel = g_localizeStrings . GetAddonString ( addonInfo . ID ( ) , atoi ( menuLabel . c_str ( ) ) ) ; <nl> + menuLabel = g_localizeStrings . GetAddonString ( addonInfo . ID ( ) , std : : stoi ( menuLabel ) ) ; <nl> <nl> if ( menuId . empty ( ) ) <nl> { <nl> void CContextMenuAddon : : ParseMenu ( <nl> <nl> items . push_back ( CContextMenuItem : : CreateGroup ( menuLabel , parent , menuId , addonInfo . ID ( ) ) ) ; <nl> <nl> - ELEMENTS subMenus ; <nl> - if ( CServiceBroker : : GetAddonMgr ( ) . GetExtElements ( elem , " menu " , subMenus ) ) <nl> - for ( const auto & subMenu : subMenus ) <nl> - ParseMenu ( addonInfo , subMenu , menuId , anonGroupCount , items ) ; <nl> - <nl> - ELEMENTS elems ; <nl> - if ( CServiceBroker : : GetAddonMgr ( ) . GetExtElements ( elem , " item " , elems ) ) <nl> + for ( unsigned int i = 0 ; i < elem - > num_children ; i + + ) <nl> { <nl> - for ( const auto & elem : elems ) <nl> + cp_cfg_element_t & subElem = elem - > children [ i ] ; <nl> + const std : : string elementName = subElem . name ; <nl> + if ( elementName = = " menu " ) <nl> + ParseMenu ( addonInfo , & subElem , menuId , anonGroupCount , items ) ; <nl> + <nl> + else if ( elementName = = " item " ) <nl> { <nl> - auto visCondition = CServiceBroker : : GetAddonMgr ( ) . GetExtValue ( elem , " visible " ) ; <nl> - auto library = CServiceBroker : : GetAddonMgr ( ) . GetExtValue ( elem , " @ library " ) ; <nl> - auto label = CServiceBroker : : GetAddonMgr ( ) . GetExtValue ( elem , " label " ) ; <nl> + const auto visCondition = CServiceBroker : : GetAddonMgr ( ) . GetExtValue ( & subElem , " visible " ) ; <nl> + const auto library = CServiceBroker : : GetAddonMgr ( ) . GetExtValue ( & subElem , " @ library " ) ; <nl> + auto label = CServiceBroker : : GetAddonMgr ( ) . GetExtValue ( & subElem , " label " ) ; <nl> if ( StringUtils : : IsNaturalNumber ( label ) ) <nl> - label = g_localizeStrings . GetAddonString ( addonInfo . ID ( ) , atoi ( label . c_str ( ) ) ) ; <nl> + label = g_localizeStrings . GetAddonString ( addonInfo . ID ( ) , std : : stoi ( label ) ) ; <nl> <nl> if ( ! label . empty ( ) & & ! library . empty ( ) & & ! visCondition . empty ( ) ) <nl> { <nl> - auto menu = CContextMenuItem : : CreateItem ( label , menuId , <nl> - URIUtils : : AddFileToFolder ( addonInfo . Path ( ) , library ) , visCondition , addonInfo . ID ( ) ) ; <nl> + auto menu = CContextMenuItem : : CreateItem ( <nl> + label , menuId , URIUtils : : AddFileToFolder ( addonInfo . Path ( ) , library ) , visCondition , <nl> + addonInfo . ID ( ) ) ; <nl> items . push_back ( menu ) ; <nl> } <nl> } <nl>
|
Changed : keep the order of the add - on context menu items as defined in the addon . xml file
|
xbmc/xbmc
|
d9a9937b4604c45bdba7f1635b65ee35a061ec08
|
2018-07-25T09:16:48Z
|
mmm a / src / worker_pool . cc <nl> ppp b / src / worker_pool . cc <nl> worker_t : : worker_t ( int _workerid , int _nqueues , <nl> <nl> worker_t : : ~ worker_t ( ) { <nl> check ( " Error in ~ worker_t , cannot delete a worker_t without first deleting its slices " , active_slices = = true ) ; <nl> + for ( shutdown_fsms_t : : iterator it = shutdown_fsms . begin ( ) ; it ! = shutdown_fsms . end ( ) ; + + it ) <nl> + delete * it ; <nl> delete event_queue ; <nl> } <nl> <nl> void worker_t : : clean_fsms ( ) { <nl> void worker_t : : initiate_conn_fsm_transition ( event_t * event ) { <nl> code_config_t : : conn_fsm_t * fsm = ( code_config_t : : conn_fsm_t * ) event - > state ; <nl> int res = fsm - > do_transition ( event ) ; <nl> - if ( res = = worker_t : : conn_fsm_t : : fsm_transition_ok | | res = = worker_t : : conn_fsm_t : : fsm_no_data_in_socket ) { <nl> - / / Nothing todo <nl> - } else if ( res = = worker_t : : conn_fsm_t : : fsm_shutdown_server ) { <nl> - int res = pthread_kill ( event_queue - > parent_pool - > main_thread , SIGINT ) ; <nl> - check ( " Could not send kill signal to main thread " , res ! = 0 ) ; <nl> - } else if ( res = = worker_t : : conn_fsm_t : : fsm_quit_connection ) { <nl> - int source ; <nl> - deregister_fsm ( fsm , source ) ; <nl> - event_queue - > forget_resource ( source ) ; <nl> - delete fsm ; <nl> - } else { <nl> - check ( " Unhandled fsm transition result " , 1 ) ; <nl> - } <nl> - } <nl> - <nl> - void worker_t : : on_btree_completed ( code_config_t : : btree_fsm_t * btree_fsm ) { <nl> - / / We received a completed btree that belongs to another <nl> - / / core . Send it off and be merry ! <nl> - get_cpu_context ( ) - > worker - > event_queue - > message_hub . store_message ( btree_fsm - > return_cpu , btree_fsm ) ; <nl> - } <nl> - <nl> - void worker_t : : process_btree_msg ( code_config_t : : btree_fsm_t * btree_fsm ) { <nl> - worker_t * worker = get_cpu_context ( ) - > worker ; <nl> - if ( btree_fsm - > is_finished ( ) ) { <nl> - <nl> - / / We received a completed btree that belongs to us <nl> - btree_fsm - > request - > on_request_part_completed ( ) ; <nl> - <nl> - } else { <nl> - / / We received a new btree that we need to process <nl> - <nl> - / / The btree is constructed with no cache ; here we must assign it its proper cache <nl> - assert ( ! btree_fsm - > cache ) ; <nl> - btree_fsm - > cache = worker - > slice ( & btree_fsm - > key ) ; <nl> - <nl> - btree_fsm - > on_complete = worker_t : : on_btree_completed ; <nl> - code_config_t : : btree_fsm_t : : transition_result_t btree_res = btree_fsm - > do_transition ( NULL ) ; <nl> - if ( btree_res = = code_config_t : : btree_fsm_t : : transition_complete ) { <nl> - worker_t : : on_btree_completed ( btree_fsm ) ; <nl> - } <nl> - } <nl> - } <nl> - <nl> - void worker_t : : process_perfmon_msg ( perfmon_msg_t * msg ) <nl> - { <nl> - worker_t * worker = get_cpu_context ( ) - > worker ; <nl> - event_queue_t * queue = worker - > event_queue ; <nl> - int this_cpu = get_cpu_context ( ) - > worker - > workerid ; <nl> - int return_cpu = msg - > return_cpu ; <nl> - <nl> - switch ( msg - > state ) { <nl> - case perfmon_msg_t : : sm_request : <nl> - / / Copy our statistics into the perfmon message and send a response <nl> - msg - > perfmon = new perfmon_t ( ) ; <nl> - msg - > perfmon - > copy_from ( worker - > perfmon ) ; <nl> - msg - > state = perfmon_msg_t : : sm_response ; <nl> - break ; <nl> - case perfmon_msg_t : : sm_response : <nl> - msg - > request - > on_request_part_completed ( ) ; <nl> - return ; <nl> - case perfmon_msg_t : : sm_copy_cleanup : <nl> - / / Response has been sent to the client , time to delete the <nl> - / / copy <nl> - delete msg - > perfmon ; <nl> - msg - > state = perfmon_msg_t : : sm_msg_cleanup ; <nl> - break ; <nl> - case perfmon_msg_t : : sm_msg_cleanup : <nl> - / / Copy has been deleted , delete the final message and return <nl> - delete msg ; <nl> - return ; <nl> - } <nl> - <nl> - msg - > return_cpu = this_cpu ; <nl> - queue - > message_hub . store_message ( return_cpu , msg ) ; <nl> - } <nl> - <nl> - void worker_t : : process_lock_msg ( event_t * event , rwi_lock_t : : lock_request_t * lr ) { <nl> - lr - > callback - > on_lock_available ( ) ; <nl> - delete lr ; <nl> - } <nl> - <nl> - void worker_t : : process_log_msg ( log_msg_t * msg ) { <nl> - if ( msg - > del ) { <nl> - ref_count - - ; <nl> - delete msg ; <nl> - } else { <nl> - assert ( workerid = = LOG_WORKER ) ; <nl> - log_writer . writef ( " ( % s ) Q % d : % s : % d : " , msg - > level_str ( ) , msg - > return_cpu , msg - > src_file , msg - > src_line ) ; <nl> - log_writer . write ( msg - > str ) ; <nl> - <nl> - msg - > del = true ; <nl> - / / No need to change return_cpu because the message will be deleted immediately . <nl> - event_queue - > message_hub . store_message ( msg - > return_cpu , msg ) ; <nl> - } <nl> - } <nl> - <nl> - / / Handle events coming from the event queue <nl> - void worker_t : : event_handler ( event_t * event ) { <nl> - if ( event - > event_type = = et_sock ) { <nl> - / / Got some socket action , let the connection fsm know <nl> - initiate_conn_fsm_transition ( event ) ; <nl> - } else if ( event - > event_type = = et_cpu_event ) { <nl> - cpu_message_t * msg = ( cpu_message_t * ) event - > state ; <nl> - switch ( msg - > type ) { <nl> - case cpu_message_t : : mt_btree : <nl> - process_btree_msg ( ( code_config_t : : btree_fsm_t * ) msg ) ; <nl> - break ; <nl> - case cpu_message_t : : mt_lock : <nl> - process_lock_msg ( event , ( rwi_lock_t : : lock_request_t * ) msg ) ; <nl> - break ; <nl> - case cpu_message_t : : mt_perfmon : <nl> - process_perfmon_msg ( ( perfmon_msg_t * ) msg ) ; <nl> - break ; <nl> - case cpu_message_t : : mt_log : <nl> - process_log_msg ( ( log_msg_t * ) msg ) ; <nl> - break ; <nl> - } <nl> - } else { <nl> - check ( " Unknown event in event_handler " , 1 ) ; <nl> - } <nl> - } <nl> - <nl> - void worker_t : : incr_ref_count ( ) { <nl> - ref_count + + ; <nl> - } <nl> - <nl> - void worker_t : : decr_ref_count ( ) { <nl> - ref_count - - ; <nl> - if ( ref_count = = 0 & & shutting_down ) { <nl> - event_queue - > send_shutdown ( ) ; <nl> - } <nl> - } <nl> <nl> void worker_t : : on_sync ( ) { <nl> decr_ref_count ( ) ; <nl>
|
Moves the conn_fsms out of the event_queue and into the worker . Introduces a bug where the txt_memcached_handler is deleted from the wrong core .
|
rethinkdb/rethinkdb
|
3e45935b2c8e9e7d3076778bd4a4bc9cbdbb4ee5
|
2010-08-10T02:43:32Z
|
mmm a / dbms / src / Core / tests / string_pool . cpp <nl> ppp b / dbms / src / Core / tests / string_pool . cpp <nl> <nl> # include < fstream > <nl> # include < iomanip > <nl> # include < tr1 / unordered_map > <nl> - # include < google / dense_hash_map > <nl> + # include < sparsehash / dense_hash_map > <nl> <nl> # include < statdaemons / Stopwatch . h > <nl> <nl> mmm a / dbms / src / Interpreters / tests / hash_map . cpp <nl> ppp b / dbms / src / Interpreters / tests / hash_map . cpp <nl> <nl> <nl> # include < tr1 / unordered_map > <nl> <nl> - # include < google / dense_hash_map > <nl> - # include < google / sparse_hash_map > <nl> + # include < sparsehash / dense_hash_map > <nl> + # include < sparsehash / sparse_hash_map > <nl> <nl> # include < statdaemons / Stopwatch . h > <nl> / * <nl> mmm a / dbms / src / Interpreters / tests / hash_map2 . cpp <nl> ppp b / dbms / src / Interpreters / tests / hash_map2 . cpp <nl> <nl> <nl> # include < tr1 / unordered_map > <nl> <nl> - # include < google / dense_hash_map > <nl> - # include < google / sparse_hash_map > <nl> + # include < sparsehash / dense_hash_map > <nl> + # include < sparsehash / sparse_hash_map > <nl> <nl> # include < statdaemons / Stopwatch . h > <nl> <nl>
|
Using one file name to include sparse / dense hash ( error if you use different style in one translation unit ) [ # CONV - 7042 ] .
|
ClickHouse/ClickHouse
|
1b7a4b064caf2b2777cbbe1bb430fd9936e123b3
|
2013-04-09T19:15:52Z
|
mmm a / Telegram / SourceFiles / dialogs / dialogs_inner_widget . cpp <nl> ppp b / Telegram / SourceFiles / dialogs / dialogs_inner_widget . cpp <nl> bool InnerWidget : : updateReorderPinned ( QPoint localPosition ) { <nl> const auto delta = [ & ] { <nl> if ( localPosition . y ( ) < _visibleTop ) { <nl> return localPosition . y ( ) - _visibleTop ; <nl> + } else if ( _openedFolder & & localPosition . y ( ) > _visibleBottom ) { <nl> + return localPosition . y ( ) - _visibleBottom ; <nl> } <nl> return 0 ; <nl> } ( ) ; <nl>
|
In archive allow scroll - down - by - pinned - drag .
|
telegramdesktop/tdesktop
|
4dae89310ddd14df8916637715c8e200497f6ecf
|
2019-05-01T12:11:46Z
|
new file mode 100644 <nl> index 000000000 . . 7d67af974 <nl> Binary files / dev / null and b / src / translations / flags / eg . png differ <nl> mmm a / src / translations / flags / flags . qrc <nl> ppp b / src / translations / flags / flags . qrc <nl> <nl> < file alias = " ko_KR " > kr . png < / file > <nl> < file alias = " tr_TR " > tr . png < / file > <nl> < file alias = " uk_UA " > ua . png < / file > <nl> + < file alias = " ar_EG " > eg . png < / file > <nl> < / qresource > <nl> < / RCC > <nl>
|
Add flag icon for Egyptian Arabic
|
sqlitebrowser/sqlitebrowser
|
dea1a1ce956ffd7f7299ac3936beec489d2f46e2
|
2017-09-01T11:34:49Z
|
mmm a / tools / system - analyzer / index . html <nl> ppp b / tools / system - analyzer / index . html <nl> <nl> < script type = " module " src = " map - panel . mjs " > < / script > <nl> < script type = " module " src = " timeline - panel . mjs " > < / script > <nl> < script type = " module " src = " ic - panel . mjs " > < / script > <nl> + <nl> < script src = " . . / splaytree . js " > < / script > <nl> < script src = " . . / codemap . js " > < / script > <nl> < script src = " . . / csvparser . js " > < / script > <nl> <nl> function globalDataUpload ( e ) { <nl> stateGlobal . timeline = e . detail ; <nl> if ( ! e . detail ) return ; <nl> + $ ( ' # container ' ) . style . display = ' block ' ; <nl> / / instantiate the app logic <nl> stateGlobal . fileData = e . detail ; <nl> stateGlobal . state = new State ( ' # map - panel ' , ' # stats ' , ' # timeline - panel ' ) ; <nl> <nl> < log - file - reader id = " log - file - reader " onchange = " globalDataUpload ( event ) " > < / log - file - reader > <nl> < br > < / br > <nl> < / section > <nl> - < div class = " stats - panel " > <nl> - < section id = " stats " > < h2 > Stats < / h2 > < / section > <nl> + < div id = " container " style = " display : none ; " > <nl> + < div class = " stats - panel " > <nl> + < section id = " stats " > < h2 > Stats < / h2 > < / section > <nl> + < / div > <nl> + < timeline - panel id = " timeline - panel " > < / timeline - panel > <nl> + < map - panel id = " map - panel " onclick = " globalSearchBarEvent ( event ) " > < / map - panel > <nl> + < ic - panel id = " ic - panel " > < / ic - panel > <nl> < / div > <nl> - < timeline - panel id = " timeline - panel " > < / timeline - panel > <nl> - < map - panel id = " map - panel " onclick = " globalSearchBarEvent ( event ) " > < / map - panel > <nl> - < ic - panel id = " ic - panel " > < / ic - panel > <nl> < / div > <nl> <nl> < div id = " instructions " > <nl>
|
[ tools ] [ system - analyzer ] Hide / Display panels
|
v8/v8
|
e4d589a79b03eeb0db8ad06612867e5c2b7fee62
|
2020-07-08T13:52:10Z
|
deleted file mode 100644 <nl> index 59c6923e66a . . 00000000000 <nl> mmm a / NOTICE <nl> ppp / dev / null <nl> <nl> mmm <nl> - The following notice shall be applied to the files listed below . <nl> - <nl> - Some modifications Copyright ( c ) 2018 BlackBerry Limited <nl> - <nl> - Licensed under the Apache License , Version 2 . 0 ( the " License " ) ; <nl> - you may not use this file except in compliance with the License . <nl> - You may obtain a copy of the License at <nl> - http : / / www . apache . org / licenses / LICENSE - 2 . 0 <nl> - Unless required by applicable law or agreed to in writing , software <nl> - distributed under the License is distributed on an " AS IS " BASIS , <nl> - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> - See the License for the specific language governing permissions and <nl> - limitations under the License . <nl> - <nl> - dbms / src / Common / ErrorCodes . cpp <nl> - dbms / src / Common / UInt128 . h <nl> - dbms / src / Core / Block . h <nl> - dbms / src / Core / Defines . h <nl> - dbms / src / Core / Settings . h <nl> - dbms / src / DataStreams / PushingToViewsBlockOutputStream . cpp <nl> - dbms / src / DataStreams / PushingToViewsBlockOutputStream . h <nl> - dbms / src / DataStreams / copyData . cpp <nl> - dbms / src / Databases / DatabasesCommon . cpp <nl> - dbms / src / IO / WriteBufferValidUTF8 . cpp <nl> - dbms / src / Interpreters / InterpreterAlterQuery . cpp <nl> - dbms / src / Interpreters / InterpreterCreateQuery . cpp <nl> - dbms / src / Interpreters / InterpreterFactory . cpp <nl> - dbms / src / Parsers / ASTAlterQuery . cpp <nl> - dbms / src / Parsers / ASTAlterQuery . h <nl> - dbms / src / Parsers / ASTCreateQuery . cpp <nl> - dbms / src / Parsers / ASTCreateQuery . h <nl> - dbms / src / Parsers / ParserAlterQuery . cpp <nl> - dbms / src / Parsers / ParserAlterQuery . h <nl> - dbms / src / Parsers / ParserCreateQuery . cpp <nl> - dbms / src / Parsers / ParserCreateQuery . h <nl> - dbms / src / Parsers / ParserQueryWithOutput . cpp <nl> - dbms / src / Storages / IStorage . h <nl> - dbms / src / Storages / StorageFactory . cpp <nl> - dbms / src / Storages / registerStorages . cpp <nl> mmm <nl> new file mode 100644 <nl> index 00000000000 . . d0d3efe3f8e <nl> mmm / dev / null <nl> ppp b / dbms / src / NOTICE <nl> <nl> + - - <nl> + The following notice shall be applied to the files listed below . <nl> + <nl> + Some modifications Copyright ( c ) 2018 BlackBerry Limited <nl> + <nl> + Licensed under the Apache License , Version 2 . 0 ( the " License " ) ; <nl> + you may not use this file except in compliance with the License . <nl> + You may obtain a copy of the License at <nl> + http : / / www . apache . org / licenses / LICENSE - 2 . 0 <nl> + Unless required by applicable law or agreed to in writing , software <nl> + distributed under the License is distributed on an " AS IS " BASIS , <nl> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> + See the License for the specific language governing permissions and <nl> + limitations under the License . <nl> + <nl> + Common / ErrorCodes . cpp <nl> + Common / UInt128 . h <nl> + Core / Block . h <nl> + Core / Defines . h <nl> + Core / Settings . h <nl> + DataStreams / PushingToViewsBlockOutputStream . cpp <nl> + DataStreams / PushingToViewsBlockOutputStream . h <nl> + DataStreams / copyData . cpp <nl> + Databases / DatabasesCommon . cpp <nl> + IO / WriteBufferValidUTF8 . cpp <nl> + Interpreters / InterpreterAlterQuery . cpp <nl> + Interpreters / InterpreterCreateQuery . cpp <nl> + Interpreters / InterpreterFactory . cpp <nl> + Parsers / ASTAlterQuery . cpp <nl> + Parsers / ASTAlterQuery . h <nl> + Parsers / ASTCreateQuery . cpp <nl> + Parsers / ASTCreateQuery . h <nl> + Parsers / ParserAlterQuery . cpp <nl> + Parsers / ParserAlterQuery . h <nl> + Parsers / ParserCreateQuery . cpp <nl> + Parsers / ParserCreateQuery . h <nl> + Parsers / ParserQueryWithOutput . cpp <nl> + Storages / IStorage . h <nl> + Storages / StorageFactory . cpp <nl> + Storages / registerStorages . cpp <nl> + - - <nl>
|
Moved NOTICE to dbms / src
|
ClickHouse/ClickHouse
|
688cc4976a028a013dbba8800767b5240061ee1c
|
2019-08-16T11:03:23Z
|
mmm a / vnpy / gateway / mt5 / mt5_gateway . py <nl> ppp b / vnpy / gateway / mt5 / mt5_gateway . py <nl> def query_order ( self ) - > None : <nl> direction = direction , <nl> type = order_type , <nl> price = d [ " order_price " ] , <nl> - volume = d [ " order_volume_initial " ] , <nl> - traded = d [ " order_volume_initial " ] - d [ " order_volume_current " ] , <nl> + volume = d [ " order_volume_current " ] , <nl> status = STATUS_MT2VT . get ( d [ " order_state " ] , Status . SUBMITTING ) , <nl> datetime = generate_datetime ( d [ " order_time_setup " ] ) , <nl> gateway_name = self . gateway_name <nl>
|
query_order adjustment
|
vnpy/vnpy
|
7c4b00913a82e25778fa83172cdae6bf3251d710
|
2020-06-22T09:39:11Z
|
mmm a / atom / browser / mac / atom_application . mm <nl> ppp b / atom / browser / mac / atom_application . mm <nl> - ( void ) updateAccessibilityEnabled : ( BOOL ) enabled { <nl> } else { <nl> ax_state - > DisableAccessibility ( ) ; <nl> } <nl> + <nl> + atom : : Browser : : Get ( ) - > OnAccessibilityChanged ( ) ; <nl> } <nl> <nl> @ end <nl>
|
Implement accessiblity change events on mac
|
electron/electron
|
68d7ae75b0a881f0de96ebcab2b417cfb9cd09a8
|
2016-07-11T21:09:01Z
|
mmm a / addons / repository . xbmc . org / addon . xml <nl> ppp b / addons / repository . xbmc . org / addon . xml <nl> <nl> < ? xml version = " 1 . 0 " encoding = " UTF - 8 " standalone = " yes " ? > <nl> < addon id = " repository . xbmc . org " <nl> name = " Kodi Add - on repository " <nl> - version = " 3 . 1 . 4 " <nl> + version = " 3 . 1 . 5 " <nl> provider - name = " Team Kodi " > <nl> < requires > <nl> < import addon = " xbmc . addon " version = " 12 . 0 . 0 " / > <nl> <nl> < description lang = " fa_IR " > افزودنی ها را از منبع رسمی افزونه ها در Kodi . tv دانلود و نصب کنید . [ CR ] با استفاده از منبع رسمی شما قادر خواهید بود از خدمات گسترده سرویس دانلود جایگزین ما بهره ببرید که امکان دانلود از مناطق نزدیکتر را در اختیار شما قرار می دهد . [ CR ] همه افزونه های این منبع آزمایش های اولیه را پشت سر گذاشته اند . در صورت یافتن افزونه معیوب یا غیر قابل استفاده لطفا آن را به تیم کودی گزارش کنید تا اقدامات لازم را انجام دهیم . < / description > <nl> < description lang = " fi_FI " > Lataa ja asenna lisäosia virallisesta Kodi . tv lisäosien ohjelmavarastosta . [ CR ] Käyttämällä virallista ohjelmavarastoa sinun on mahdollista käyttää hyväksesi meidän kattavaa tiedostojen peilauspalveluamme saavuttaaksesi korkeat latausnopeudet sinun lähialueeltasi . [ CR ] Kaikki tämän ohjelmavaraston lisäosat on testattu toimiviksi , jos löydät rikkinäisen tai " ei toimivan " lisäosan , ilmoita siitä Team Kodille , jotta voimme korjata asian . < / description > <nl> < description lang = " fr_CA " > Télécharger et installer des addiciels depuis le dépôt officiel de Kodi . tv . [ CR ] En utilisant le dépôt officiel vous pourrez bénéficier de notre service étendu de miroirs de fichiers favorisant des téléchargements plus rapides depuis une région proche de vous . [ CR ] Tous les addiciels de ce dépôt ont subi des tests de base . Si vous trouvez un addiciel non fonctionnel ou brisé , veuillez le rapporter à l ’ équipe Kodi afin que nous puissions agir . < / description > <nl> - < description lang = " fr_FR " > Télécharger et installer des extensions à partir du dépôt officiel Kodi . tv . [ CR ] En utilisant le dépôt officiel , vous bénéficierez de notre service de serveurs miroirs permettant de télécharger rapidement depuis une région proche de chez vous . [ CR ] Toutes les extensions de ce dépôt ont subi des tests de base , si vous trouvez une extension totalement ou en partie inutilisable , veuillez en informer l ' Équipe Kodi afin que nous puissions prendre les mesures nécessaires . < / description > <nl> + < description lang = " fr_FR " > Télécharger et installer des extensions à partir du dépôt officiel Kodi . tv . [ CR ] En utilisant le dépôt officiel , vous bénéficierez de notre service de serveurs miroirs permettant de télécharger rapidement depuis une région proche de chez vous . [ CR ] Toutes les extensions de ce dépôt ont subi des tests de base , si vous trouvez une extension totalement ou en partie inutilisable , merci d ' en informer l ' Équipe Kodi afin que nous puissions prendre les mesures nécessaires . < / description > <nl> < description lang = " gl_ES " > Descargar e instalar complementos dende o repositorio oficial de Kodi . tv . [ CR ] Empregando o repositorio oficial , poderás gozar das vantaxes do seu extenso servizo de replicación de ficheiros que che permite unhas descargas máis rápidas dende unha rexión preto á túa . [ CR ] Tódolos complementos deste repositorio pasaron por comprobacións básicas . Se atopas algún complemento roto ou non funcional , por favor informa ao equipo de Kodi para que poidan actuar en consecuencia . < / description > <nl> < description lang = " he_IL " > הורדה והתקנת הרחבות ממאגר הרחבות Kodi . tv הרשמי . [ CR ] שימוש במאגר הרשמי מאפשר לנצל את שירות שיקוף הקבצים של Kodi . tv העוזר להוריד מהר יותר מהשרת הקרוב ביותר . [ CR ] כל ההרחבות במאגר זה עברו בדיקה בסיסית . יש לדווח לצוות הפיתוח של Kodi על כל הרחבה שנמצאה כלא תקינה או שלא עובדת ע " מ שתתבצע הפעולה המתאימה . < / description > <nl> < description lang = " hr_HR " > Preuzmite i instalirajte dodatke sa službenog Kodi . tv repozitorija dodataka . [ CR ] Korištenjem službenog repozitorija bit ćete u mogućnosti iskoristiti prednosti usluge našeg brzog zrcalnog poslužitelja datoteka , kako bi mogli brže preuzimati iz regije koje je bliže vašoj lokaciji . [ CR ] Svi dodaci na ovom repozitoriju prošli su osnovno testiranje , u slučaju da primijetite neispravan dodatak , molimo vas da to prijavite Kodi timu koji će zatim poduzeti potrebne korake . < / description > <nl> mmm a / addons / screensaver . xbmc . builtin . dim / addon . xml <nl> ppp b / addons / screensaver . xbmc . builtin . dim / addon . xml <nl> <nl> < ? xml version = " 1 . 0 " encoding = " UTF - 8 " standalone = " yes " ? > <nl> < addon id = " screensaver . xbmc . builtin . dim " <nl> name = " Dim " <nl> - version = " 1 . 0 . 52 " <nl> + version = " 1 . 0 . 53 " <nl> provider - name = " Team Kodi " > <nl> < extension point = " xbmc . ui . screensaver " library = " " / > <nl> < extension point = " xbmc . addon . metadata " > <nl> mmm a / addons / skin . estuary / addon . xml <nl> ppp b / addons / skin . estuary / addon . xml <nl> <nl> < ? xml version = " 1 . 0 " encoding = " UTF - 8 " ? > <nl> - < addon id = " skin . estuary " version = " 2 . 0 . 20 " name = " Estuary " provider - name = " phil65 , Ichabod Fletchman " > <nl> + < addon id = " skin . estuary " version = " 2 . 0 . 21 " name = " Estuary " provider - name = " phil65 , Ichabod Fletchman " > <nl> < requires > <nl> < import addon = " xbmc . gui " version = " 5 . 14 . 0 " / > <nl> < / requires > <nl> mmm a / addons / skin . estuary / language / resource . language . ro_ro / strings . po <nl> ppp b / addons / skin . estuary / language / resource . language . ro_ro / strings . po <nl> msgctxt " # 31132 " <nl> msgid " Select Program " <nl> msgstr " Selectare program " <nl> <nl> + msgctxt " # 31133 " <nl> + msgid " Select Resolution " <nl> + msgstr " Selectare rezoluție " <nl> + <nl> msgctxt " # 31134 " <nl> msgid " Remaining " <nl> msgstr " Rămas " <nl>
|
[ lang ] [ skin . estuary ] updated language files from Transifex
|
xbmc/xbmc
|
b328d5ed239c725bed78bc1662688b5c31b9461c
|
2019-01-19T20:52:20Z
|
mmm a / CMakeLists . txt <nl> ppp b / CMakeLists . txt <nl> if ( WIN32 OR WIN64 ) <nl> endif ( ) <nl> <nl> if ( WIN64 AND EXISTS " $ { CMAKE_SOURCE_DIR } / Code / Sandbox " ) <nl> - set ( OPTION_SANDBOX " No " CACHE STRING " Enable Sandbox " ) <nl> - set_property ( CACHE OPTION_SANDBOX PROPERTY STRINGS " No " " Qt " ) <nl> + option ( OPTION_SANDBOX " Enable Sandbox " OFF ) <nl> endif ( ) <nl> <nl> option ( OPTION_PCH " Enable Precompiled Headers " OFF ) <nl> add_subdirectory ( Code / Libs / oculus ) <nl> <nl> # Sandbox Editor <nl> if ( OPTION_SANDBOX AND WIN64 ) <nl> - MESSAGE ( STATUS " Include $ { OPTION_SANDBOX } Sandbox Editor " ) <nl> + MESSAGE ( STATUS " Include Sandbox Editor " ) <nl> find_package ( Qt5 COMPONENTS Core Gui OpenGL Widgets REQUIRED PATHS " $ { QT_DIR } " ) <nl> set ( CMAKE_INCLUDE_CURRENT_DIR ON ) <nl> set ( CMAKE_AUTOMOC_RELAXED_MODE TRUE ) <nl>
|
! XT ( CMake ) Change Sandbox option to checkbox ( Approved by samuelk )
|
CRYTEK/CRYENGINE
|
26fc1ea4241202de681277266edb7ecc26b432c9
|
2016-09-14T12:34:57Z
|
mmm a / tensorflow / compiler / xla / python / xla_client . py <nl> ppp b / tensorflow / compiler / xla / python / xla_client . py <nl> def _get_local_backends ( ) : <nl> <nl> _local_backends = collections . OrderedDict ( ) <nl> for name , factory in _local_backend_factories . items ( ) : <nl> - logging . vlog ( 2 , " Initializing backend ' % s ' " % name ) <nl> + logging . vlog ( 1 , " Initializing backend ' % s ' " % name ) <nl> try : <nl> backend = factory ( ) <nl> - except RuntimeError : <nl> + except RuntimeError as err : <nl> if name = = ' cpu ' : <nl> # We always expect CPU to initialize successfully . <nl> raise <nl> else : <nl> # If the backend isn ' t built into the binary , or if it has no devices , <nl> # we expect a RuntimeError . <nl> + logging . vlog ( 1 , " Error initializing backend ' % s ' : % s " % ( name , err ) ) <nl> continue <nl> _local_backends [ name ] = backend <nl> return _local_backends <nl>
|
[ XLA : Python ] vlog reason for backend initialization failure .
|
tensorflow/tensorflow
|
14ed346e26b6214d6b2d4a23054d33c23adfee48
|
2020-09-08T21:33:56Z
|
new file mode 100644 <nl> index 0000000000 . . dfc7db5559 <nl> mmm / dev / null <nl> ppp b / code / bit - manipulation / lonely_integer / LonelyInt . java <nl> <nl> + / * <nl> + * Part of Cosmos by OpenGenus Foundation <nl> + * The Lonely Integer Problem <nl> + * Given an array in which all the no . are present twice except one , find that lonely integer . <nl> + * / <nl> + <nl> + public class LonelyInt { <nl> + public static void main ( String args [ ] ) { <nl> + int [ ] testArr = { 1 , 1 , 2 , 4 , 2 } ; <nl> + System . out . println ( lonelyInt ( testArr ) ) ; <nl> + } <nl> + public static int lonelyInt ( int [ ] arr ) { <nl> + int lonely = 0 ; <nl> + for ( int i : arr ) { <nl> + lonely ^ = i ; <nl> + } <nl> + return lonely ; <nl> + } <nl> + } <nl> new file mode 100644 <nl> index 0000000000 . . 8cd602a5ec <nl> mmm / dev / null <nl> ppp b / code / bit - manipulation / lonely_integer / LonelyInt . js <nl> <nl> + / * <nl> + * Part of Cosmos by OpenGenus Foundation <nl> + * The Lonely Integer Problem <nl> + * Given an array in which all the no . are present twice except one , find that lonely integer . <nl> + * / <nl> + function lonelyInt ( arr ) { <nl> + var lonely = 0 ; <nl> + arr . forEach ( ( number ) = > { <nl> + lonely ^ = number ; <nl> + } ) <nl> + return lonely ; <nl> + } <nl> + <nl> + function test ( ) { <nl> + var test = [ 1 , 1 , 2 , 4 , 2 ] ; <nl> + console . log ( lonelyInt ( test ) ) ; <nl> + } <nl> + <nl> + test ( ) ; <nl>
|
Merge pull request from mx0c / master
|
OpenGenus/cosmos
|
1d3f8e09d6cdad2897a47d6d15afd3daa139ab97
|
2017-10-03T18:29:32Z
|
new file mode 100644 <nl> index 00000000 . . cecde37a <nl> Binary files / dev / null and b / mars / openssl / openssl_lib_android / arm64 - v8a / libcrypto . a differ <nl> new file mode 100644 <nl> index 00000000 . . 654ec881 <nl> Binary files / dev / null and b / mars / openssl / openssl_lib_android / arm64 - v8a / libssl . a differ <nl> new file mode 100644 <nl> index 00000000 . . 0702d843 <nl> Binary files / dev / null and b / mars / openssl / openssl_lib_android / mips / libcrypto . a differ <nl> new file mode 100644 <nl> index 00000000 . . f28b8a56 <nl> Binary files / dev / null and b / mars / openssl / openssl_lib_android / mips / libssl . a differ <nl> new file mode 100644 <nl> index 00000000 . . f787f675 <nl> Binary files / dev / null and b / mars / openssl / openssl_lib_android / mips64 / libcrypto . a differ <nl> new file mode 100644 <nl> index 00000000 . . 1834ec8f <nl> Binary files / dev / null and b / mars / openssl / openssl_lib_android / mips64 / libssl . a differ <nl>
|
add arm64 - v8a , mips , mips64
|
Tencent/mars
|
6cad2c8adeabdb1b7836d2d1d902468d696d0c4d
|
2018-06-04T13:03:21Z
|
mmm a / xbmc / guilib / GUIWindow . cpp <nl> ppp b / xbmc / guilib / GUIWindow . cpp <nl> void CGUIWindow : : AllocResources ( bool forceLoad / * = FALSE * / ) <nl> } <nl> } <nl> <nl> + # ifdef _DEBUG <nl> int64_t slend ; <nl> slend = CurrentHostCounter ( ) ; <nl> + # endif <nl> <nl> / / and now allocate resources <nl> CGUIControlGroup : : AllocResources ( ) ; <nl>
|
[ GUIWindow ] Variable ' slend ' is assigned a value that is never used .
|
xbmc/xbmc
|
a584dce1777438522c29435cbecde9e6d54528eb
|
2016-01-06T22:55:49Z
|
mmm a / kokoro / release / ruby / linux / ruby / ruby_build_environment . sh <nl> ppp b / kokoro / release / ruby / linux / ruby / ruby_build_environment . sh <nl> set + ex <nl> [ [ - s / etc / profile . d / rvm . sh ] ] & & . / etc / profile . d / rvm . sh <nl> set - e # rvm commands are very verbose <nl> rvm - - default use ruby - 2 . 4 . 1 <nl> - gem install bundler - - update <nl> + # The version needs to be updated if the version specified in Gemfile . lock is changed <nl> + gem install bundler - v ' 1 . 17 . 3 ' <nl> set - ex <nl>
|
Install RubyGem bundler version specified in Gemfile . lock to fix release failure ( )
|
protocolbuffers/protobuf
|
4cf5bfee9546101d98754d23ff378ff718ba8438
|
2020-01-30T21:08:31Z
|
mmm a / cmake / modules / AddSwift . cmake <nl> ppp b / cmake / modules / AddSwift . cmake <nl> function ( _add_variant_swift_compile_flags <nl> sdk arch build_type enable_assertions result_var_name ) <nl> set ( result $ { $ { result_var_name } } ) <nl> <nl> + # On Windows , we don ' t set SWIFT_SDK_WINDOWS_PATH , so don ' t include it . <nl> + if ( NOT " $ { CMAKE_SYSTEM_NAME } " STREQUAL " Windows " ) <nl> + list ( APPEND result " - sdk " " $ { SWIFT_SDK_ $ { sdk } _PATH } " ) <nl> + endif ( ) <nl> + <nl> list ( APPEND result <nl> - " - sdk " " $ { SWIFT_SDK_ $ { sdk } _PATH } " <nl> " - target " " $ { SWIFT_SDK_ $ { sdk } _ARCH_ $ { arch } _TRIPLE } " <nl> " - resource - dir " " $ { SWIFTLIB_DIR } " ) <nl> <nl>
|
Merge pull request from hughbe / empty - sdk - windows
|
apple/swift
|
16b20cadd8a60e515b63bece240bacf4410c2c9a
|
2017-01-09T09:45:52Z
|
mmm a / src / core / lib / http / parser . c <nl> ppp b / src / core / lib / http / parser . c <nl> static int add_header ( grpc_http_parser * parser ) { <nl> while ( cur ! = end & & ( * cur = = ' ' | | * cur = = ' \ t ' ) ) { <nl> cur + + ; <nl> } <nl> - GPR_ASSERT ( end - cur > = 2 ) ; <nl> - hdr . value = buf2str ( cur , ( size_t ) ( end - cur ) - 2 ) ; <nl> + GPR_ASSERT ( ( size_t ) ( end - cur ) > = parser - > cur_line_end_length ) ; <nl> + hdr . value = buf2str ( cur , ( size_t ) ( end - cur ) - parser - > cur_line_end_length ) ; <nl> <nl> if ( parser - > type = = GRPC_HTTP_RESPONSE ) { <nl> hdr_count = & parser - > http . response . hdr_count ; <nl> static int finish_line ( grpc_http_parser * parser ) { <nl> parser - > state = GRPC_HTTP_HEADERS ; <nl> break ; <nl> case GRPC_HTTP_HEADERS : <nl> - if ( parser - > cur_line_length = = 2 ) { <nl> + if ( parser - > cur_line_length = = parser - > cur_line_end_length ) { <nl> parser - > state = GRPC_HTTP_BODY ; <nl> break ; <nl> } <nl> static int addbyte_body ( grpc_http_parser * parser , uint8_t byte ) { <nl> return 1 ; <nl> } <nl> <nl> + static int check_line ( grpc_http_parser * parser ) { <nl> + if ( parser - > cur_line_length > = 2 & & <nl> + parser - > cur_line [ parser - > cur_line_length - 2 ] = = ' \ r ' & & <nl> + parser - > cur_line [ parser - > cur_line_length - 1 ] = = ' \ n ' ) { <nl> + return 1 ; <nl> + } <nl> + <nl> + / / HTTP request with \ n \ r line termiantors . <nl> + else if ( parser - > cur_line_length > = 2 & & <nl> + parser - > cur_line [ parser - > cur_line_length - 2 ] = = ' \ n ' & & <nl> + parser - > cur_line [ parser - > cur_line_length - 1 ] = = ' \ r ' ) { <nl> + return 1 ; <nl> + } <nl> + <nl> + / / HTTP request with only \ n line terminators . <nl> + else if ( parser - > cur_line_length > = 1 & & <nl> + parser - > cur_line [ parser - > cur_line_length - 1 ] = = ' \ n ' ) { <nl> + parser - > cur_line_end_length = 1 ; <nl> + return 1 ; <nl> + } <nl> + <nl> + return 0 ; <nl> + } <nl> + <nl> static int addbyte ( grpc_http_parser * parser , uint8_t byte ) { <nl> switch ( parser - > state ) { <nl> case GRPC_HTTP_FIRST_LINE : <nl> static int addbyte ( grpc_http_parser * parser , uint8_t byte ) { <nl> } <nl> parser - > cur_line [ parser - > cur_line_length ] = byte ; <nl> parser - > cur_line_length + + ; <nl> - if ( parser - > cur_line_length > = 2 & & <nl> - parser - > cur_line [ parser - > cur_line_length - 2 ] = = ' \ r ' & & <nl> - parser - > cur_line [ parser - > cur_line_length - 1 ] = = ' \ n ' ) { <nl> + if ( check_line ( parser ) ) { <nl> return finish_line ( parser ) ; <nl> } else { <nl> return 1 ; <nl> void grpc_http_parser_init ( grpc_http_parser * parser ) { <nl> memset ( parser , 0 , sizeof ( * parser ) ) ; <nl> parser - > state = GRPC_HTTP_FIRST_LINE ; <nl> parser - > type = GRPC_HTTP_UNKNOWN ; <nl> + parser - > cur_line_end_length = 2 ; <nl> } <nl> <nl> void grpc_http_parser_destroy ( grpc_http_parser * parser ) { <nl> mmm a / src / core / lib / http / parser . h <nl> ppp b / src / core / lib / http / parser . h <nl> typedef struct { <nl> <nl> uint8_t cur_line [ GRPC_HTTP_PARSER_MAX_HEADER_LENGTH ] ; <nl> size_t cur_line_length ; <nl> + size_t cur_line_end_length ; <nl> } grpc_http_parser ; <nl> <nl> void grpc_http_parser_init ( grpc_http_parser * parser ) ; <nl> mmm a / test / core / http / parser_test . c <nl> ppp b / test / core / http / parser_test . c <nl> int main ( int argc , char * * argv ) { <nl> " \ r \ n " <nl> " hello world ! " , <nl> 200 , " hello world ! " , " xyz " , " abc " , NULL ) ; <nl> + test_succeeds ( split_modes [ i ] , <nl> + " HTTP / 1 . 1 200 OK \ n " <nl> + " \ n " <nl> + " abc " , <nl> + 200 , " abc " , NULL ) ; <nl> test_request_succeeds ( split_modes [ i ] , <nl> " GET / HTTP / 1 . 0 \ r \ n " <nl> " \ r \ n " , <nl> int main ( int argc , char * * argv ) { <nl> " xyz " , <nl> " GET " , GRPC_HTTP_HTTP10 , " / " , " xyz " , " xyz " , " abc " , <nl> NULL ) ; <nl> + test_request_succeeds ( split_modes [ i ] , <nl> + " GET / HTTP / 1 . 0 \ n " <nl> + " \ n " <nl> + " xyz " , <nl> + " GET " , GRPC_HTTP_HTTP10 , " / " , " xyz " , NULL ) ; <nl> test_fails ( split_modes [ i ] , " HTTP / 1 . 0 \ r \ n " ) ; <nl> test_fails ( split_modes [ i ] , " HTTP / 1 . 2 \ r \ n " ) ; <nl> test_fails ( split_modes [ i ] , " HTTP / 1 . 0 000 XYX \ r \ n " ) ; <nl> int main ( int argc , char * * argv ) { <nl> test_fails ( split_modes [ i ] , " GET / HTTP / 0 . 0 \ r \ n " ) ; <nl> test_fails ( split_modes [ i ] , " GET / ____ / 1 . 0 \ r \ n " ) ; <nl> test_fails ( split_modes [ i ] , " GET / HTTP / 1 . 2 \ r \ n " ) ; <nl> + test_fails ( split_modes [ i ] , " GET / HTTP / 1 . 0 \ n " ) ; <nl> <nl> tmp1 = gpr_malloc ( 2 * GRPC_HTTP_PARSER_MAX_HEADER_LENGTH ) ; <nl> memset ( tmp1 , ' a ' , 2 * GRPC_HTTP_PARSER_MAX_HEADER_LENGTH - 1 ) ; <nl>
|
Allow grpc_http_parser to optionally accept a wider range of line endings .
|
grpc/grpc
|
7151af94659f935c5e1f45b117caf7b33b5f2471
|
2016-04-21T01:43:54Z
|
mmm a / tools / run_tests / performance / scenario_config . py <nl> ppp b / tools / run_tests / performance / scenario_config . py <nl> <nl> BENCHMARK_SECONDS = 30 <nl> <nl> SMOKETEST = ' smoketest ' <nl> + SCALABLE = ' scalable ' <nl> <nl> SECURE_SECARGS = { ' use_test_ca ' : True , <nl> ' server_host_override ' : ' foo . test . google . fr ' } <nl> def scenarios ( self ) : <nl> # TODO ( ctiller ) : add 70 % load latency test <nl> for secure in [ True , False ] : <nl> secstr = ' secure ' if secure else ' insecure ' <nl> - smoketest_categories = [ SMOKETEST ] if secure else None <nl> + smoketest_categories = [ SMOKETEST ] if secure else [ ] <nl> <nl> yield _ping_pong_scenario ( <nl> ' cpp_generic_async_streaming_ping_pong_ % s ' % secstr , rpc_type = ' STREAMING ' , <nl> def scenarios ( self ) : <nl> client_type = ' ASYNC_CLIENT ' , server_type = ' ASYNC_SERVER ' , <nl> unconstrained_client = ' async ' , <nl> secure = secure , <nl> - categories = smoketest_categories ) <nl> + categories = smoketest_categories + [ SCALABLE ] ) <nl> <nl> yield _ping_pong_scenario ( <nl> ' cpp_protobuf_async_streaming_qps_unconstrained_ % s ' % secstr , rpc_type = ' STREAMING ' , <nl> client_type = ' ASYNC_CLIENT ' , server_type = ' ASYNC_SERVER ' , <nl> unconstrained_client = ' async ' , <nl> - secure = secure ) <nl> + secure = secure , <nl> + categories = [ SCALABLE ] ) <nl> <nl> yield _ping_pong_scenario ( <nl> ' cpp_generic_async_streaming_qps_unconstrained_ % s ' % secstr , rpc_type = ' STREAMING ' , <nl> client_type = ' ASYNC_CLIENT ' , server_type = ' ASYNC_GENERIC_SERVER ' , <nl> unconstrained_client = ' async ' , use_generic_payload = True , <nl> secure = secure , <nl> - categories = smoketest_categories ) <nl> + categories = smoketest_categories + [ SCALABLE ] ) <nl> <nl> yield _ping_pong_scenario ( <nl> ' cpp_generic_async_streaming_qps_one_server_core_ % s ' % secstr , rpc_type = ' STREAMING ' , <nl> def scenarios ( self ) : <nl> ' csharp_protobuf_async_unary_qps_unconstrained ' , rpc_type = ' UNARY ' , <nl> client_type = ' ASYNC_CLIENT ' , server_type = ' ASYNC_SERVER ' , <nl> unconstrained_client = ' async ' , <nl> - categories = [ SMOKETEST ] ) <nl> + categories = [ SMOKETEST , SCALABLE ] ) <nl> <nl> yield _ping_pong_scenario ( <nl> ' csharp_protobuf_async_streaming_qps_unconstrained ' , rpc_type = ' STREAMING ' , <nl> client_type = ' ASYNC_CLIENT ' , server_type = ' ASYNC_SERVER ' , <nl> - unconstrained_client = ' async ' ) <nl> + unconstrained_client = ' async ' , <nl> + categories = [ SCALABLE ] ) <nl> <nl> yield _ping_pong_scenario ( <nl> ' csharp_to_cpp_protobuf_sync_unary_ping_pong ' , rpc_type = ' UNARY ' , <nl> def scenarios ( self ) : <nl> yield _ping_pong_scenario ( <nl> ' csharp_to_cpp_protobuf_async_unary_qps_unconstrained ' , rpc_type = ' UNARY ' , <nl> client_type = ' ASYNC_CLIENT ' , server_type = ' ASYNC_SERVER ' , <nl> - unconstrained_client = ' async ' , server_language = ' c + + ' ) <nl> + unconstrained_client = ' async ' , server_language = ' c + + ' , <nl> + categories = [ SCALABLE ] ) <nl> <nl> yield _ping_pong_scenario ( <nl> ' csharp_to_cpp_protobuf_sync_to_async_unary_qps_unconstrained ' , rpc_type = ' UNARY ' , <nl> client_type = ' SYNC_CLIENT ' , server_type = ' ASYNC_SERVER ' , <nl> - unconstrained_client = ' sync ' , server_language = ' c + + ' ) <nl> + unconstrained_client = ' sync ' , server_language = ' c + + ' , <nl> + categories = [ SCALABLE ] ) <nl> <nl> yield _ping_pong_scenario ( <nl> ' cpp_to_csharp_protobuf_async_unary_qps_unconstrained ' , rpc_type = ' UNARY ' , <nl> client_type = ' ASYNC_CLIENT ' , server_type = ' ASYNC_SERVER ' , <nl> - unconstrained_client = ' async ' , client_language = ' c + + ' ) <nl> + unconstrained_client = ' async ' , client_language = ' c + + ' , <nl> + categories = [ SCALABLE ] ) <nl> <nl> <nl> def __str__ ( self ) : <nl> def worker_port_offset ( self ) : <nl> def scenarios ( self ) : <nl> for secure in [ True , False ] : <nl> secstr = ' secure ' if secure else ' insecure ' <nl> - smoketest_categories = [ SMOKETEST ] if secure else None <nl> + smoketest_categories = [ SMOKETEST ] if secure else [ ] <nl> <nl> yield _ping_pong_scenario ( <nl> ' java_generic_async_streaming_ping_pong_ % s ' % secstr , rpc_type = ' STREAMING ' , <nl> def scenarios ( self ) : <nl> client_type = ' ASYNC_CLIENT ' , server_type = ' ASYNC_SERVER ' , <nl> unconstrained_client = ' async ' , <nl> secure = secure , warmup_seconds = JAVA_WARMUP_SECONDS , <nl> - categories = smoketest_categories ) <nl> + categories = smoketest_categories + [ SCALABLE ] ) <nl> <nl> yield _ping_pong_scenario ( <nl> ' java_protobuf_async_streaming_qps_unconstrained_ % s ' % secstr , rpc_type = ' STREAMING ' , <nl> client_type = ' ASYNC_CLIENT ' , server_type = ' ASYNC_SERVER ' , <nl> unconstrained_client = ' async ' , <nl> - secure = secure , warmup_seconds = JAVA_WARMUP_SECONDS ) <nl> + secure = secure , warmup_seconds = JAVA_WARMUP_SECONDS , <nl> + categories = [ SCALABLE ] ) <nl> <nl> yield _ping_pong_scenario ( <nl> ' java_generic_async_streaming_qps_unconstrained_ % s ' % secstr , rpc_type = ' STREAMING ' , <nl> client_type = ' ASYNC_CLIENT ' , server_type = ' ASYNC_GENERIC_SERVER ' , <nl> unconstrained_client = ' async ' , use_generic_payload = True , <nl> - secure = secure , warmup_seconds = JAVA_WARMUP_SECONDS ) <nl> + secure = secure , warmup_seconds = JAVA_WARMUP_SECONDS , <nl> + categories = [ SCALABLE ] ) <nl> <nl> yield _ping_pong_scenario ( <nl> ' java_generic_async_streaming_qps_one_server_core_ % s ' % secstr , rpc_type = ' STREAMING ' , <nl> def worker_port_offset ( self ) : <nl> def scenarios ( self ) : <nl> for secure in [ True , False ] : <nl> secstr = ' secure ' if secure else ' insecure ' <nl> - smoketest_categories = [ SMOKETEST ] if secure else None <nl> + smoketest_categories = [ SMOKETEST ] if secure else [ ] <nl> <nl> # ASYNC_GENERIC_SERVER for Go actually uses a sync streaming server , <nl> # but that ' s mostly because of lack of better name of the enum value . <nl> def scenarios ( self ) : <nl> client_type = ' SYNC_CLIENT ' , server_type = ' SYNC_SERVER ' , <nl> unconstrained_client = ' async ' , <nl> secure = secure , <nl> - categories = smoketest_categories ) <nl> + categories = smoketest_categories + [ SCALABLE ] ) <nl> <nl> # unconstrained_client = ' async ' is intended ( client uses goroutines ) <nl> yield _ping_pong_scenario ( <nl> ' go_protobuf_sync_streaming_qps_unconstrained_ % s ' % secstr , rpc_type = ' STREAMING ' , <nl> client_type = ' SYNC_CLIENT ' , server_type = ' SYNC_SERVER ' , <nl> unconstrained_client = ' async ' , <nl> - secure = secure ) <nl> + secure = secure , <nl> + categories = [ SCALABLE ] ) <nl> <nl> # unconstrained_client = ' async ' is intended ( client uses goroutines ) <nl> # ASYNC_GENERIC_SERVER for Go actually uses a sync streaming server , <nl> def scenarios ( self ) : <nl> ' go_generic_sync_streaming_qps_unconstrained_ % s ' % secstr , rpc_type = ' STREAMING ' , <nl> client_type = ' SYNC_CLIENT ' , server_type = ' ASYNC_GENERIC_SERVER ' , <nl> unconstrained_client = ' async ' , use_generic_payload = True , <nl> - secure = secure ) <nl> + secure = secure , <nl> + categories = [ SCALABLE ] ) <nl> <nl> # TODO ( jtattermusch ) : add scenarios go vs C + + <nl> <nl> mmm a / tools / run_tests / run_performance_tests . py <nl> ppp b / tools / run_tests / run_performance_tests . py <nl> def kill ( self ) : <nl> <nl> def create_qpsworker_job ( language , shortname = None , <nl> port = 10000 , remote_host = None ) : <nl> - # TODO : support more languages <nl> cmdline = language . worker_cmdline ( ) + [ ' - - driver_port = % s ' % port ] <nl> if remote_host : <nl> user_at_host = ' % s @ % s ' % ( _REMOTE_HOST_USERNAME , remote_host ) <nl> def finish_qps_workers ( jobs ) : <nl> argp . add_argument ( ' - - bq_result_table ' , default = None , type = str , <nl> help = ' Bigquery " dataset . table " to upload results to . ' ) <nl> argp . add_argument ( ' - - category ' , <nl> - choices = [ ' smoketest ' , ' all ' ] , <nl> + choices = [ ' smoketest ' , ' all ' , ' scalable ' ] , <nl> default = ' all ' , <nl> help = ' Select a category of tests to run . ' ) <nl> argp . add_argument ( ' - - netperf ' , <nl>
|
mark unconstrained scenarios with scalable category
|
grpc/grpc
|
d27888b6dbb933427aba30dff4bd3c34ee52e54d
|
2016-05-19T23:15:01Z
|
mmm a / test / rql_test / src / regression / 125 . yaml <nl> ppp b / test / rql_test / src / regression / 125 . yaml <nl> <nl> - desc : Regression tests for issue # 125 , aggregation ops should be of type stream , not array <nl> + # Note that the expected behavior ( these should be arrays , not <nl> + # streams ) , is opposite of the title of the issue on github . We <nl> + # arrived at the expected behavior after some debate , hence the <nl> + # difference . <nl> + desc : Regression tests for issue # 125 , aggregation ops should be of type array , not stream <nl> tests : <nl> <nl> # Set up a stream <nl>
|
Clarifying note and description
|
rethinkdb/rethinkdb
|
3fb7875a4c8b9e99b27790024b7ed87ea31225ca
|
2013-04-11T02:42:07Z
|
mmm a / src / main . cpp <nl> ppp b / src / main . cpp <nl> bool SetBestChain ( CValidationState & state , CBlockIndex * pindexNew ) <nl> / / an overestimation , as most will delete an existing entry or <nl> / / overwrite one . Still , use a conservative safety factor of 2 . <nl> if ( ! CheckDiskSpace ( 100 * 2 * 2 * pcoinsTip - > GetCacheSize ( ) ) ) <nl> - return state . Error ( ) ; <nl> + return state . Error ( " out of disk space " ) ; <nl> FlushBlockFile ( ) ; <nl> pblocktree - > Sync ( ) ; <nl> if ( ! pcoinsTip - > Flush ( ) ) <nl> bool AddToBlockIndex ( CBlock & block , CValidationState & state , const CDiskBlockPos <nl> / / Check for duplicate <nl> uint256 hash = block . GetHash ( ) ; <nl> if ( mapBlockIndex . count ( hash ) ) <nl> - return state . Invalid ( error ( " AddToBlockIndex ( ) : % s already exists " , hash . ToString ( ) ) ) ; <nl> + return state . Invalid ( error ( " AddToBlockIndex ( ) : % s already exists " , hash . ToString ( ) ) , 0 , " duplicate " ) ; <nl> <nl> / / Construct new block index object <nl> CBlockIndex * pindexNew = new CBlockIndex ( block ) ; <nl> bool FindBlockPos ( CValidationState & state , CDiskBlockPos & pos , unsigned int nAdd <nl> } <nl> } <nl> else <nl> - return state . Error ( ) ; <nl> + return state . Error ( " out of disk space " ) ; <nl> } <nl> } <nl> <nl> bool FindUndoPos ( CValidationState & state , int nFile , CDiskBlockPos & pos , unsigne <nl> } <nl> } <nl> else <nl> - return state . Error ( ) ; <nl> + return state . Error ( " out of disk space " ) ; <nl> } <nl> <nl> return true ; <nl> bool AcceptBlock ( CBlock & block , CValidationState & state , CDiskBlockPos * dbp ) <nl> / / Check for duplicate <nl> uint256 hash = block . GetHash ( ) ; <nl> if ( mapBlockIndex . count ( hash ) ) <nl> - return state . Invalid ( error ( " AcceptBlock ( ) : block already in mapBlockIndex " ) ) ; <nl> + return state . Invalid ( error ( " AcceptBlock ( ) : block already in mapBlockIndex " ) , 0 , " duplicate " ) ; <nl> <nl> / / Get prev block index <nl> CBlockIndex * pindexPrev = NULL ; <nl> bool AcceptBlock ( CBlock & block , CValidationState & state , CDiskBlockPos * dbp ) <nl> if ( hash ! = Params ( ) . HashGenesisBlock ( ) ) { <nl> map < uint256 , CBlockIndex * > : : iterator mi = mapBlockIndex . find ( block . hashPrevBlock ) ; <nl> if ( mi = = mapBlockIndex . end ( ) ) <nl> - return state . DoS ( 10 , error ( " AcceptBlock ( ) : prev block not found " ) ) ; <nl> + return state . DoS ( 10 , error ( " AcceptBlock ( ) : prev block not found " ) , 0 , " bad - prevblk " ) ; <nl> pindexPrev = ( * mi ) . second ; <nl> nHeight = pindexPrev - > nHeight + 1 ; <nl> <nl> bool ProcessBlock ( CValidationState & state , CNode * pfrom , CBlock * pblock , CDiskBl <nl> / / Check for duplicate <nl> uint256 hash = pblock - > GetHash ( ) ; <nl> if ( mapBlockIndex . count ( hash ) ) <nl> - return state . Invalid ( error ( " ProcessBlock ( ) : already have block % d % s " , mapBlockIndex [ hash ] - > nHeight , hash . ToString ( ) ) ) ; <nl> + return state . Invalid ( error ( " ProcessBlock ( ) : already have block % d % s " , mapBlockIndex [ hash ] - > nHeight , hash . ToString ( ) ) , 0 , " duplicate " ) ; <nl> if ( mapOrphanBlocks . count ( hash ) ) <nl> - return state . Invalid ( error ( " ProcessBlock ( ) : already have block ( orphan ) % s " , hash . ToString ( ) ) ) ; <nl> + return state . Invalid ( error ( " ProcessBlock ( ) : already have block ( orphan ) % s " , hash . ToString ( ) ) , 0 , " duplicate " ) ; <nl> <nl> / / Preliminary checks <nl> if ( ! CheckBlock ( * pblock , state ) ) <nl> mmm a / src / main . h <nl> ppp b / src / main . h <nl> class CValidationState { <nl> unsigned char _chRejectCode = 0 , std : : string _strRejectReason = " " ) { <nl> return DoS ( 0 , ret , _chRejectCode , _strRejectReason ) ; <nl> } <nl> - bool Error ( ) { <nl> + bool Error ( std : : string strRejectReasonIn = " " ) { <nl> + if ( mode = = MODE_VALID ) <nl> + strRejectReason = strRejectReasonIn ; <nl> mode = MODE_ERROR ; <nl> return false ; <nl> } <nl> bool Abort ( const std : : string & msg ) { <nl> AbortNode ( msg ) ; <nl> - return Error ( ) ; <nl> + return Error ( msg ) ; <nl> } <nl> bool IsValid ( ) { <nl> return mode = = MODE_VALID ; <nl>
|
Support for error messages and a few more rejection reasons
|
bitcoin/bitcoin
|
c117d9e93a712c3f1e2001bdb6e20e7a1c5e339b
|
2014-01-29T17:39:24Z
|
mmm a / cores / esp8266 / Esp . cpp <nl> ppp b / cores / esp8266 / Esp . cpp <nl> struct rst_info * EspClass : : getResetInfoPtr ( void ) { <nl> <nl> bool EspClass : : eraseConfig ( void ) { <nl> bool ret = true ; <nl> - size_t cfgAddr = ( ESP . getFlashChipSize ( ) - 0x4000 ) ; <nl> - size_t cfgSize = ( 8 * 1024 ) ; <nl> + const size_t cfgSize = 0x4000 ; <nl> + size_t cfgAddr = ESP . getFlashChipSize ( ) - cfgSize ; <nl> <nl> - noInterrupts ( ) ; <nl> - while ( cfgSize ) { <nl> - <nl> - if ( spi_flash_erase_sector ( ( cfgAddr / SPI_FLASH_SEC_SIZE ) ) ! = SPI_FLASH_RESULT_OK ) { <nl> - ret = false ; <nl> + for ( size_t offset = 0 ; offset < cfgSize ; offset + = SPI_FLASH_SEC_SIZE ) { <nl> + if ( ! flashEraseSector ( ( cfgAddr + offset ) / SPI_FLASH_SEC_SIZE ) ) { <nl> + return false ; <nl> } <nl> - <nl> - cfgSize - = SPI_FLASH_SEC_SIZE ; <nl> - cfgAddr + = SPI_FLASH_SEC_SIZE ; <nl> } <nl> - interrupts ( ) ; <nl> <nl> - return ret ; <nl> + return true ; <nl> } <nl> <nl> uint32_t EspClass : : getSketchSize ( ) { <nl>
|
Fix erase size in ESP . eraseConfig
|
esp8266/Arduino
|
80aeacfb80ac0796a81d274fab26874dd91e8b49
|
2017-10-15T07:02:05Z
|
mmm a / torch / lib / c10d / ProcessGroupNCCL . cpp <nl> ppp b / torch / lib / c10d / ProcessGroupNCCL . cpp <nl> ProcessGroupNCCL : : WorkNCCL : : WorkNCCL ( const std : : vector < at : : Device > & devices ) <nl> ncclComms_ . resize ( devices . size ( ) ) ; <nl> } <nl> <nl> + ProcessGroupNCCL : : WorkNCCL : : WorkNCCL ( const WorkNCCL & w ) <nl> + : std : : enable_shared_from_this < WorkNCCL > ( w ) , <nl> + devices_ ( w . devices_ ) , <nl> + cudaEvents_ ( w . cudaEvents_ ) , <nl> + ncclComms_ ( w . ncclComms_ ) , <nl> + blockingWait_ ( w . blockingWait_ ) , <nl> + opTimeout_ ( w . opTimeout_ ) , <nl> + workStartTime_ ( w . workStartTime_ ) { <nl> + completed_ = w . completed_ ; <nl> + exception_ = w . exception_ ; <nl> + } <nl> + <nl> ProcessGroupNCCL : : WorkNCCL : : ~ WorkNCCL ( ) { } <nl> <nl> bool ProcessGroupNCCL : : WorkNCCL : : isCompleted ( ) { <nl> ProcessGroupNCCL : : ProcessGroupNCCL ( <nl> <nl> ProcessGroupNCCL : : ~ ProcessGroupNCCL ( ) { <nl> terminateProcessGroup_ . store ( true ) ; <nl> - watchdogCV_ . notify_one ( ) ; <nl> - workListCV_ . notify_one ( ) ; <nl> - <nl> - if ( asyncErrorHandling_ ) { <nl> - std : : unique_lock < std : : mutex > lock ( workListMutex_ ) ; <nl> - / / TODO : We can potentially merge this functionality into the workCleanup <nl> - / / thread or just allow the destructor to free workList_ . <nl> - / / Clean up any remaining items in the workList_ instead of waiting for the <nl> - / / workCleanup Thread to be scheduled again . <nl> - for ( auto it = workList_ . begin ( ) ; it ! = workList_ . end ( ) ; <nl> - / * no increment * / ) { <nl> - auto & work = * it ; <nl> - if ( work - > isCompleted ( ) ) { <nl> - it = workList_ . erase ( it ) ; <nl> - } else { <nl> - + + it ; <nl> - } <nl> - } <nl> - / / Wait for workList_ to become empty before proceeding with shutdown . <nl> - workListCV_ . wait ( lock , [ & ] ( ) - > bool { return workList_ . empty ( ) ; } ) ; <nl> - lock . unlock ( ) ; <nl> - workCleanupThread_ . join ( ) ; <nl> - } <nl> <nl> + watchdogCV_ . notify_one ( ) ; <nl> # ifdef ENABLE_NCCL_ERROR_CHECKING <nl> ncclCommWatchdogThread_ . join ( ) ; <nl> # endif <nl> ProcessGroupNCCL : : ~ ProcessGroupNCCL ( ) { <nl> } <nl> } <nl> } <nl> + <nl> + if ( asyncErrorHandling_ ) { <nl> + workMetaListCV_ . notify_one ( ) ; <nl> + workCleanupThread_ . join ( ) ; <nl> + } <nl> } <nl> <nl> void ProcessGroupNCCL : : ncclCommWatchdog ( ) { <nl> try { <nl> ncclCommWatchdogInternal ( ) ; <nl> - LOG ( INFO ) < < " NCCL watchdog thread terminated normally " ; <nl> + LOG ( INFO ) < < " [ Rank " < < rank_ < < " ] NCCL watchdog thread terminated normally " ; <nl> } catch ( std : : exception & e ) { <nl> LOG ( INFO ) < < " NCCL watchdog thread terminated with exception : " < < e . what ( ) ; <nl> } catch ( . . . ) { <nl> void ProcessGroupNCCL : : ncclCommWatchdogInternal ( ) { <nl> } <nl> <nl> if ( asyncErrorHandling_ ) { <nl> - std : : unique_lock < std : : mutex > lock ( workListMutex_ ) ; <nl> - for ( auto & work : workList_ ) { <nl> - work - > checkAndSetException ( ) ; <nl> + std : : unique_lock < std : : mutex > lock ( workMetaListMutex_ ) ; <nl> + for ( auto & work : workMetaList_ ) { <nl> + work . checkAndSetException ( ) ; <nl> / / Aborting NCCL Communicators due to errors is already handled above . <nl> - if ( work - > exception ( ) ) { <nl> + if ( work . exception ( ) ) { <nl> continue ; <nl> } <nl> <nl> / / Check for Timeouts in the WorkNCCL Operations , and abort all <nl> / / communicators accordingly . <nl> - if ( work - > timedOut ( ) ) { <nl> + if ( work . timedOut ( ) ) { <nl> + LOG ( INFO ) < < " [ " < < rank_ < < " ] caught collective operation timeout " ; <nl> std : : exception_ptr exception_ptr = std : : make_exception_ptr ( <nl> std : : runtime_error ( " NCCL Operation Timed Out " ) ) ; <nl> - work - > setException ( exception_ptr ) ; <nl> - for ( const auto & ncclComm : work - > ncclComms_ ) { <nl> + work . setException ( exception_ptr ) ; <nl> + for ( const auto & ncclComm : work . ncclComms_ ) { <nl> ncclComm - > ncclCommAbort ( ) ; <nl> abortedCommIds . emplace ( buildNcclUniqueIdStr ( ncclComm - > getNcclId ( ) ) ) ; <nl> } <nl> void ProcessGroupNCCL : : ncclCommWatchdogInternal ( ) { <nl> } <nl> <nl> void ProcessGroupNCCL : : workCleanupLoop ( ) { <nl> - while ( ! terminateProcessGroup_ . load ( ) ) { <nl> - std : : unique_lock < std : : mutex > lock ( workListMutex_ ) ; <nl> - / / We busy - poll the work vector every kWatchdogThreadSleepMillis <nl> - / / milliseconds as long as the atomic is True . <nl> - workListCV_ . wait_for ( <nl> - lock , <nl> - std : : chrono : : milliseconds ( kWorkCleanupThreadSleepMillis ) , <nl> - [ & ] ( ) - > bool { return terminateProcessGroup_ . load ( ) ; } ) ; <nl> - <nl> - for ( auto it = workList_ . begin ( ) ; it ! = workList_ . end ( ) ; <nl> - / * no increment * / ) { <nl> - auto & work = * it ; <nl> - if ( work - > isCompleted ( ) ) { <nl> - / / Handle Exceptions on failed GPU operations and remove completed <nl> - / / workNCCL objects from work vector . <nl> - work - > handleNCCLGuard ( ) ; <nl> - it = workList_ . erase ( it ) ; <nl> - } else { <nl> - / / Increment the iterator if the current WorkNCCL object is not <nl> - / / completed . <nl> - + + it ; <nl> + bool done = false ; <nl> + while ( ! terminateProcessGroup_ . load ( ) | | ! done ) { <nl> + std : : list < WorkNCCL > doneWorks ; <nl> + { <nl> + std : : unique_lock < std : : mutex > lock ( workMetaListMutex_ ) ; <nl> + / / We busy - poll the work vector every kWatchdogThreadSleepMillis <nl> + / / milliseconds as long as the atomic is True . <nl> + workMetaListCV_ . wait_for ( <nl> + lock , <nl> + std : : chrono : : milliseconds ( kWorkCleanupThreadSleepMillis ) , <nl> + [ & ] ( ) - > bool { return terminateProcessGroup_ . load ( ) ; } ) ; <nl> + <nl> + for ( auto it = workMetaList_ . begin ( ) ; it ! = workMetaList_ . end ( ) ; <nl> + / * no increment * / ) { <nl> + auto & work = * it ; <nl> + if ( work . isCompleted ( ) ) { <nl> + / / Handle Exceptions on failed GPU operations and remove completed <nl> + / / workNCCL objects from work vector . <nl> + if ( ! terminateProcessGroup_ . load ( ) ) { <nl> + work . handleNCCLGuard ( ) ; <nl> + } <nl> + doneWorks . push_back ( std : : move ( * it ) ) ; <nl> + it = workMetaList_ . erase ( it ) ; <nl> + } else { <nl> + / / Increment the iterator if the current WorkNCCL object is not <nl> + / / completed . <nl> + + + it ; <nl> + } <nl> } <nl> + done = workMetaList_ . empty ( ) ; <nl> } <nl> - <nl> - if ( workList_ . empty ( ) ) { <nl> - / / Notify the main thread if it is blocked in the shutdown sequence , <nl> - / / waiting for the work vector to become empty . <nl> - lock . unlock ( ) ; <nl> - workListCV_ . notify_one ( ) ; <nl> - } <nl> + doneWorks . clear ( ) ; <nl> } <nl> } <nl> <nl> c10 : : intrusive_ptr < c10 : : ivalue : : Future > ProcessGroupNCCL : : WorkNCCL : : <nl> void ProcessGroupNCCL : : workEnqueue ( <nl> std : : shared_ptr < ProcessGroupNCCL : : WorkNCCL > work ) { <nl> if ( ! terminateProcessGroup_ . load ( ) ) { <nl> - std : : lock_guard < std : : mutex > lock ( workListMutex_ ) ; <nl> - workList_ . emplace_back ( std : : move ( work ) ) ; <nl> + std : : lock_guard < std : : mutex > lock ( workMetaListMutex_ ) ; <nl> + / / Avoid view tensors to be processed in cleanup thread . <nl> + / / View tensors ' destruction invokes autograd_meta , which <nl> + / / needs to be destructed in user thread . Otherwise will <nl> + / / get deadlock . Here we enqueue work without outputs_ . <nl> + workMetaList_ . emplace_back ( WorkNCCL ( * work ) ) ; <nl> } <nl> } <nl> ProcessGroupNCCL : : Options : : Options ( ) <nl> mmm a / torch / lib / c10d / ProcessGroupNCCL . hpp <nl> ppp b / torch / lib / c10d / ProcessGroupNCCL . hpp <nl> class ProcessGroupNCCL : public ProcessGroup { <nl> public : <nl> / / Constructor takes a list of CUDA devices <nl> WorkNCCL ( const std : : vector < at : : Device > & devices ) ; <nl> + / / Copy constructor doing partial copy without outputs_ . Cleanup thread <nl> + / / monitors and removes finished works . However it will deadlock when <nl> + / / destructs outputs_ tensors who are view tensors in autograd graph . <nl> + WorkNCCL ( const WorkNCCL & w ) ; <nl> + <nl> virtual ~ WorkNCCL ( ) ; <nl> <nl> / / Checks if request has completed . In this specific case of NCCL , it checks <nl> class ProcessGroupNCCL : public ProcessGroup { <nl> / / Thread that removes NCCL Work upon timeout <nl> std : : thread workCleanupThread_ ; <nl> <nl> - / / Mutex to Guard workList_ <nl> - std : : mutex workListMutex_ ; <nl> + / / Mutex to Guard workMetaList_ <nl> + std : : mutex workMetaListMutex_ ; <nl> <nl> / / Condition Variable for timeout thread sleep <nl> - std : : condition_variable workListCV_ ; <nl> + std : : condition_variable workMetaListCV_ ; <nl> <nl> / / Vector to Store WorkNCCL pointers <nl> - std : : list < std : : shared_ptr < ProcessGroupNCCL : : WorkNCCL > > workList_ ; <nl> + std : : list < ProcessGroupNCCL : : WorkNCCL > workMetaList_ ; <nl> <nl> / / Add Work Pointer to workVector <nl> void workEnqueue ( std : : shared_ptr < ProcessGroupNCCL : : WorkNCCL > ) ; <nl>
|
[ PyTorch / NCCL ] Fix async error handling ( )
|
pytorch/pytorch
|
06a566373a7ef34793ec4e19b385928eb6263cf6
|
2020-09-29T22:44:34Z
|
mmm a / Telegram / SourceFiles / platform / mac / main_window_mac . mm <nl> ppp b / Telegram / SourceFiles / platform / mac / main_window_mac . mm <nl> void _placeCounter ( QImage & img , int size , int count , style : : color bg , style : : col <nl> psSelectAll = edit - > addAction ( lang ( lng_mac_menu_select_all ) , this , SLOT ( psMacSelectAll ( ) ) , QKeySequence : : SelectAll ) ; <nl> <nl> QMenu * window = psMainMenu . addMenu ( lang ( lng_mac_menu_window ) ) ; <nl> - psContacts = window - > addAction ( lang ( lng_mac_menu_contacts ) ) ; <nl> - connect ( psContacts , & QAction : : triggered , psContacts , [ ] { <nl> - if ( App : : wnd ( ) & & App : : wnd ( ) - > isHidden ( ) ) App : : wnd ( ) - > showFromTray ( ) ; <nl> - <nl> - if ( ! AuthSession : : Exists ( ) ) return ; <nl> - Ui : : show ( Box < PeerListBox > ( std : : make_unique < ContactsBoxController > ( ) , [ ] ( not_null < PeerListBox * > box ) { <nl> - box - > addButton ( langFactory ( lng_close ) , [ box ] { box - > closeBox ( ) ; } ) ; <nl> - box - > addLeftButton ( langFactory ( lng_profile_add_contact ) , [ ] { App : : wnd ( ) - > onShowAddContact ( ) ; } ) ; <nl> - } ) ) ; <nl> - } ) ; <nl> + if ( ! Auth ( ) . supportMode ( ) ) { <nl> + psContacts = window - > addAction ( lang ( lng_mac_menu_contacts ) ) ; <nl> + connect ( psContacts , & QAction : : triggered , psContacts , [ ] { <nl> + if ( App : : wnd ( ) & & App : : wnd ( ) - > isHidden ( ) ) App : : wnd ( ) - > showFromTray ( ) ; <nl> + <nl> + if ( ! AuthSession : : Exists ( ) ) return ; <nl> + Ui : : show ( Box < PeerListBox > ( std : : make_unique < ContactsBoxController > ( ) , [ ] ( not_null < PeerListBox * > box ) { <nl> + box - > addButton ( langFactory ( lng_close ) , [ box ] { box - > closeBox ( ) ; } ) ; <nl> + box - > addLeftButton ( langFactory ( lng_profile_add_contact ) , [ ] { App : : wnd ( ) - > onShowAddContact ( ) ; } ) ; <nl> + } ) ) ; <nl> + } ) ; <nl> + } <nl> psAddContact = window - > addAction ( lang ( lng_mac_menu_add_contact ) , App : : wnd ( ) , SLOT ( onShowAddContact ( ) ) ) ; <nl> window - > addSeparator ( ) ; <nl> - psNewGroup = window - > addAction ( lang ( lng_mac_menu_new_group ) , App : : wnd ( ) , SLOT ( onShowNewGroup ( ) ) ) ; <nl> - psNewChannel = window - > addAction ( lang ( lng_mac_menu_new_channel ) , App : : wnd ( ) , SLOT ( onShowNewChannel ( ) ) ) ; <nl> - window - > addSeparator ( ) ; <nl> + if ( ! Auth ( ) . supportMode ( ) ) { <nl> + psNewGroup = window - > addAction ( lang ( lng_mac_menu_new_group ) , App : : wnd ( ) , SLOT ( onShowNewGroup ( ) ) ) ; <nl> + psNewChannel = window - > addAction ( lang ( lng_mac_menu_new_channel ) , App : : wnd ( ) , SLOT ( onShowNewChannel ( ) ) ) ; <nl> + window - > addSeparator ( ) ; <nl> + } <nl> psShowTelegram = window - > addAction ( lang ( lng_mac_menu_show ) , App : : wnd ( ) , SLOT ( showFromTray ( ) ) ) ; <nl> <nl> updateGlobalMenu ( ) ; <nl> mmm a / Telegram / SourceFiles / window / window_main_menu . cpp <nl> ppp b / Telegram / SourceFiles / window / window_main_menu . cpp <nl> MainMenu : : MainMenu ( <nl> <nl> void MainMenu : : refreshMenu ( ) { <nl> _menu - > clearActions ( ) ; <nl> - _menu - > addAction ( lang ( lng_create_group_title ) , [ ] { <nl> - App : : wnd ( ) - > onShowNewGroup ( ) ; <nl> - } , & st : : mainMenuNewGroup , & st : : mainMenuNewGroupOver ) ; <nl> - _menu - > addAction ( lang ( lng_create_channel_title ) , [ ] { <nl> - App : : wnd ( ) - > onShowNewChannel ( ) ; <nl> - } , & st : : mainMenuNewChannel , & st : : mainMenuNewChannelOver ) ; <nl> - _menu - > addAction ( lang ( lng_menu_contacts ) , [ ] { <nl> - Ui : : show ( Box < PeerListBox > ( std : : make_unique < ContactsBoxController > ( ) , [ ] ( not_null < PeerListBox * > box ) { <nl> - box - > addButton ( langFactory ( lng_close ) , [ box ] { box - > closeBox ( ) ; } ) ; <nl> - box - > addLeftButton ( langFactory ( lng_profile_add_contact ) , [ ] { App : : wnd ( ) - > onShowAddContact ( ) ; } ) ; <nl> - } ) ) ; <nl> - } , & st : : mainMenuContacts , & st : : mainMenuContactsOver ) ; <nl> - if ( Global : : PhoneCallsEnabled ( ) ) { <nl> - _menu - > addAction ( lang ( lng_menu_calls ) , [ ] { <nl> - Ui : : show ( Box < PeerListBox > ( std : : make_unique < Calls : : BoxController > ( ) , [ ] ( not_null < PeerListBox * > box ) { <nl> + if ( ! Auth ( ) . supportMode ( ) ) { <nl> + _menu - > addAction ( lang ( lng_create_group_title ) , [ ] { <nl> + App : : wnd ( ) - > onShowNewGroup ( ) ; <nl> + } , & st : : mainMenuNewGroup , & st : : mainMenuNewGroupOver ) ; <nl> + _menu - > addAction ( lang ( lng_create_channel_title ) , [ ] { <nl> + App : : wnd ( ) - > onShowNewChannel ( ) ; <nl> + } , & st : : mainMenuNewChannel , & st : : mainMenuNewChannelOver ) ; <nl> + _menu - > addAction ( lang ( lng_menu_contacts ) , [ ] { <nl> + Ui : : show ( Box < PeerListBox > ( std : : make_unique < ContactsBoxController > ( ) , [ ] ( not_null < PeerListBox * > box ) { <nl> box - > addButton ( langFactory ( lng_close ) , [ box ] { box - > closeBox ( ) ; } ) ; <nl> + box - > addLeftButton ( langFactory ( lng_profile_add_contact ) , [ ] { App : : wnd ( ) - > onShowAddContact ( ) ; } ) ; <nl> } ) ) ; <nl> - } , & st : : mainMenuCalls , & st : : mainMenuCallsOver ) ; <nl> + } , & st : : mainMenuContacts , & st : : mainMenuContactsOver ) ; <nl> + if ( Global : : PhoneCallsEnabled ( ) ) { <nl> + _menu - > addAction ( lang ( lng_menu_calls ) , [ ] { <nl> + Ui : : show ( Box < PeerListBox > ( std : : make_unique < Calls : : BoxController > ( ) , [ ] ( not_null < PeerListBox * > box ) { <nl> + box - > addButton ( langFactory ( lng_close ) , [ box ] { box - > closeBox ( ) ; } ) ; <nl> + } ) ) ; <nl> + } , & st : : mainMenuCalls , & st : : mainMenuCallsOver ) ; <nl> + } <nl> + } else { <nl> + _menu - > addAction ( lang ( lng_profile_add_contact ) , [ ] { <nl> + App : : wnd ( ) - > onShowAddContact ( ) ; <nl> + } , & st : : mainMenuContacts , & st : : mainMenuContactsOver ) ; <nl> } <nl> _menu - > addAction ( lang ( lng_menu_settings ) , [ ] { <nl> App : : wnd ( ) - > showSettings ( ) ; <nl>
|
Remove irrelevant menu items ( support ) .
|
telegramdesktop/tdesktop
|
eaa50adf75484d2baf9cb7d31372aa221796b5ad
|
2018-10-09T16:27:17Z
|
mmm a / hphp / hack / src / deps / fileInfo . ml <nl> ppp b / hphp / hack / src / deps / fileInfo . ml <nl> type mode = <nl> type name_type = Fun | Class | Typedef | Const <nl> type pos = Full of Pos . t | File of name_type * Relative_path . t <nl> type id = pos * string <nl> + ( * The hash value of a decl AST . <nl> + We use this to see if two versions of a file are " similar " , i . e . their <nl> + declarations only differ by position information . * ) <nl> <nl> ( * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ) <nl> ( * The record produced by the parsing phase . * ) <nl> ( * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ) <nl> type t = { <nl> + hash : Digest . t option ; <nl> file_mode : mode option ; <nl> funs : id list ; <nl> classes : id list ; <nl> type t = { <nl> } <nl> <nl> let empty_t = { <nl> + hash = None ; <nl> file_mode = None ; <nl> funs = [ ] ; <nl> classes = [ ] ; <nl> type names = { <nl> ( * Data structure stored in the saved state * ) <nl> type saved = { <nl> s_names : names ; <nl> + s_hash : Digest . t option ; <nl> s_mode : mode option ; <nl> } <nl> <nl> let saved_to_hack_files fast = <nl> let saved_to_info fast = <nl> Relative_path . Map . fold fast ~ init : Relative_path . Map . empty <nl> ~ f : ( fun fn saved acc - > <nl> - let { s_names ; s_mode } = saved in <nl> + let { s_names ; s_mode ; s_hash } = saved in <nl> let { n_funs ; n_classes ; n_types ; n_consts ; } = s_names in <nl> let funs = List . map ( SSet . elements n_funs ) <nl> ( fun x - > File ( Fun , fn ) , x ) in <nl> let saved_to_info fast = <nl> ( fun x - > File ( Const , fn ) , x ) in <nl> let fileinfo = { <nl> file_mode = s_mode ; <nl> + hash = s_hash ; <nl> funs ; <nl> classes ; <nl> typedefs ; <nl> let saved_to_info fast = <nl> let info_to_saved fileinfo = <nl> Relative_path . Map . map fileinfo <nl> ( fun info - > <nl> - let { funs ; classes ; typedefs ; consts ; file_mode = s_mode ; comments = _ ; } = info in <nl> + let { funs ; classes ; typedefs ; consts ; file_mode = s_mode ; <nl> + hash = s_hash ; comments = _ ; } = info in <nl> let n_funs = name_set_of_idl funs in <nl> let n_classes = name_set_of_idl classes in <nl> let n_types = name_set_of_idl typedefs in <nl> let n_consts = name_set_of_idl consts in <nl> + <nl> let s_names = { n_funs ; n_classes ; n_types ; n_consts ; } in <nl> - { s_names ; s_mode } ) <nl> + { s_names ; s_mode ; s_hash ; } ) <nl> <nl> let simplify info = <nl> let { funs ; classes ; typedefs ; consts ; file_mode = _ ; comments = _ ; <nl> - } = info in <nl> + hash = _ ; } = info in <nl> let n_funs = name_set_of_idl funs in <nl> let n_classes = name_set_of_idl classes in <nl> let n_types = name_set_of_idl typedefs in <nl> mmm a / hphp / hack / src / deps / fileInfo . mli <nl> ppp b / hphp / hack / src / deps / fileInfo . mli <nl> type pos = Full of Pos . t | File of name_type * Relative_path . t <nl> type id = pos * string <nl> val pos_full : ( Pos . t * string ) - > id <nl> val get_pos_filename : pos - > Relative_path . t <nl> + <nl> type t = { <nl> + hash : Digest . t option ; <nl> file_mode : mode option ; <nl> funs : id list ; <nl> classes : id list ; <nl> mmm a / hphp / hack / src / deps / typing_deps . ml <nl> ppp b / hphp / hack / src / deps / typing_deps . ml <nl> let update_files fileInfo = <nl> consts ; <nl> comments = _ ; <nl> file_mode = _ ; <nl> + hash = _ ; <nl> } = info in <nl> let consts = List . fold_left consts ~ f : begin fun acc ( _ , const_id ) - > <nl> DepSet . add acc ( Dep . make ( Dep . GConst const_id ) ) <nl> mmm a / hphp / hack / src / hh_file_parse . ml <nl> ppp b / hphp / hack / src / hh_file_parse . ml <nl> let parse_with_regular file content = <nl> Ast_utils . get_defs parser_ret . Parser_hack . ast in <nl> let defs = <nl> { FileInfo . funs ; classes ; typedefs ; consts ; <nl> - comments = Some [ ] ; file_mode = None } <nl> + comments = Some [ ] ; file_mode = None ; hash = None ; } <nl> in <nl> Printf . printf " FileInfo with regular parser : \ n " ; <nl> if not ( Errors . is_empty errorl ) then <nl> mmm a / hphp / hack / src / hh_single_type_check . ml <nl> ppp b / hphp / hack / src / hh_single_type_check . ml <nl> let parse_name_and_decl popt files_contents tcopt = <nl> let funs , classes , typedefs , consts = Ast_utils . get_defs ast in <nl> { FileInfo . <nl> file_mode ; funs ; classes ; typedefs ; consts ; comments = Some comments ; <nl> + hash = None ; <nl> } <nl> end parsed_files in <nl> <nl> mmm a / hphp / hack / src / naming / namingGlobal . ml <nl> ppp b / hphp / hack / src / naming / namingGlobal . ml <nl> let ndecl_file_fast fn ~ funs ~ classes ~ typedefs ~ consts = <nl> <nl> let ndecl_file popt fn <nl> { FileInfo . file_mode = _ ; funs ; classes ; typedefs ; consts ; <nl> - comments = _ } = <nl> + comments = _ ; hash = _ } = <nl> let errors , _ , _ = Errors . do_ begin fun ( ) - > <nl> dn ( " Naming decl : " ^ Relative_path . to_absolute fn ) ; <nl> make_env popt ~ funs ~ classes ~ typedefs ~ consts <nl> mmm a / hphp / hack / src / parser / parsing_service . ml <nl> ppp b / hphp / hack / src / parser / parsing_service . ml <nl> let neutral = ( <nl> ) <nl> <nl> let empty_file_info : FileInfo . t = { <nl> + hash = None ; <nl> file_mode = None ; <nl> FileInfo . funs = [ ] ; <nl> classes = [ ] ; <nl> let process_parse_result <nl> let mode = if quick then Parser_heap . Decl else Parser_heap . Full in <nl> Parser_heap . ParserHeap . write_through fn ( ast , mode ) ; <nl> let comments = Some comments in <nl> + ( * In the diff above , this gets updated * ) <nl> let defs = <nl> - { FileInfo . funs ; classes ; typedefs ; consts ; comments ; file_mode } <nl> + { FileInfo . funs ; classes ; typedefs ; consts ; comments ; file_mode ; hash = None } <nl> in <nl> let acc = Relative_path . Map . add acc ~ key : fn ~ data : defs in <nl> let errorl = Errors . merge errorl ' errorl in <nl> mmm a / hphp / hack / src / server / serverTypeCheck . ml <nl> ppp b / hphp / hack / src / server / serverTypeCheck . ml <nl> let remove_decls env fast_parsed = <nl> consts = constl ; <nl> file_mode = _ ; <nl> comments = _ ; <nl> + hash = _ ; <nl> } - > <nl> let funs = set_of_idl funl in <nl> let classes = set_of_idl classel in <nl>
|
Add a file hash to the FileInfo object
|
facebook/hhvm
|
fd5e05c241b335eb4030ce98b405d86e118527aa
|
2017-10-16T21:09:26Z
|
mmm a / src / core / lib / surface / call . cc <nl> ppp b / src / core / lib / surface / call . cc <nl> static void recv_trailing_filter ( void * args , grpc_metadata_batch * b , <nl> grpc_get_status_code_from_metadata ( b - > idx . named . grpc_status - > md ) ; <nl> grpc_error * error = GRPC_ERROR_NONE ; <nl> if ( status_code ! = GRPC_STATUS_OK ) { <nl> - error = grpc_error_set_int ( <nl> - GRPC_ERROR_CREATE_FROM_STATIC_STRING ( " Error received from peer " ) , <nl> - GRPC_ERROR_INT_GRPC_STATUS , static_cast < intptr_t > ( status_code ) ) ; <nl> + char * peer_msg = nullptr ; <nl> + char * peer = grpc_call_get_peer ( call ) ; <nl> + gpr_asprintf ( & peer_msg , " Error received from peer % s " , <nl> + grpc_call_get_peer ( call ) ) ; <nl> + error = grpc_error_set_int ( GRPC_ERROR_CREATE_FROM_COPIED_STRING ( peer_msg ) , <nl> + GRPC_ERROR_INT_GRPC_STATUS , <nl> + static_cast < intptr_t > ( status_code ) ) ; <nl> + gpr_free ( peer ) ; <nl> + gpr_free ( peer_msg ) ; <nl> } <nl> if ( b - > idx . named . grpc_message ! = nullptr ) { <nl> error = grpc_error_set_str ( <nl>
|
Add the actual peer in the error message
|
grpc/grpc
|
ec82dbae39003892114c4207595154a029b4d2d0
|
2019-03-19T22:05:54Z
|
mmm a / . codedocs <nl> ppp b / . codedocs <nl> <nl> - # CodeDocs Configuration File <nl> + # CodeDocs . xyz Configuration File <nl> <nl> DOXYFILE = doxygen_resources / Doxyfile . doxy <nl> <nl> - ALIASES = " table_start = < table width = 100 % style = border bgcolor = 576f9f border = 0 > " \ <nl> - " table_end = < / table > " \ <nl> - " table_h2_l { 2 } = < tr bgcolor = 576f9f > < th width = 40 % align = left > \ 1 < / th > < th width = 60 % align = left > \ 2 < / th > < / tr > " \ <nl> - " table_row2_l { 2 } = < tr bgcolor = white > < td width = 40 % align = left > \ 1 < / td > < td width = 60 % align = left > \ 2 < / td > < / tr > " \ <nl> - " table_h3 { 3 } = < tr bgcolor = 576f9f > < th width = 30 % align = left > \ 1 < / th > < th width = 10 % align = left > \ 2 < / th > < th width = 60 % align = left > \ 3 < / th > < / tr > " \ <nl> - " table_row3 { 3 } = < tr bgcolor = white > < td width = 30 % align = left > \ 1 < / td > < td width = 10 % align = left > \ 2 < / td > < td width = 60 % align = left > \ 3 < / td > < / tr > " \ <nl> - " python_func { 1 } = \ htmlonly < h4 > < code > < span style = \ " font - style : italic ; \ " > Function : < / span > < span style = \ " font - style : bold ; \ " > < font color = 31363b > < big > \ 1 < / big > < / font > < / span > < / code > < / h4 > \ endhtmlonly " \ <nl> - " python_func_with_rev { 2 } = \ htmlonly < h4 > < code > < span style = \ " font - style : italic ; \ " > Function : < / span > < span style = \ " font - style : bold ; \ " > < font color = 31363b > < big > \ 1 < / big > < / font > < / span > < / code > < span style = " float : right ; " > < small > \ 2 < / small > < / span > < / h4 > \ endhtmlonly " \ <nl> - " python_class { 1 } = \ htmlonly < h4 > < code > < span style = \ " font - style : italic ; \ " > Class : < / span > < span style = \ " font - style : bold ; \ " > < font color = 31363b > < big > \ 1 < / big > < / font > < / span > < / code > < / h4 > \ endhtmlonly " \ <nl> - " python_class_with_rev { 2 } = \ htmlonly < h4 > < code > < span style = \ " font - style : italic ; \ " > Class : < / span > < span style = \ " font - style : bold ; \ " > < font color = 31363b > < big > \ 1 < / big > < / font > < / span > < / code > < span style = " float : right ; " > < small > \ 2 < / small > < / span > < / h4 > \ endhtmlonly " \ <nl> - " doc_header { 1 } = \ htmlonly < h3 > < span style = \ " text - decoration : underline ; \ " > < span style = \ " font - style : italic ; \ " > < span style = \ " color : rgb ( 102 , 102 , 102 ) ; \ " > \ 1 < / span > < / span > < / span > < / h3 > \ endhtmlonly " \ <nl> - " python_v12 = \ xrefitem python_v12 \ " v12 Python API changes \ " \ " \ " " \ <nl> - " python_v13 = \ xrefitem python_v13 \ " v13 Python API changes \ " \ " \ " " \ <nl> - " python_v14 = \ xrefitem python_v14 \ " v14 Python API changes \ " \ " \ " " \ <nl> - " python_v15 = \ xrefitem python_v15 \ " v15 Python API changes \ " \ " \ " " \ <nl> - " python_v16 = \ xrefitem python_v16 \ " v16 Python API changes \ " \ " \ " " \ <nl> - " python_v17 = \ xrefitem python_v17 \ " v17 Python API changes \ " \ " \ " " <nl> + PROJECT_LOGO = doxygen_resources / Thumbnail - symbol - whitebg - small . jpg <nl> <nl> - # Hide undocumented class members . <nl> - HIDE_UNDOC_MEMBERS = <nl> - <nl> - # Hide undocumented classes . <nl> - HIDE_UNDOC_CLASSES = <nl> - <nl> - # Specify a markdown page whose contents should be used as the main page <nl> - # ( index . html ) . This will override a page marked as \ mainpage . For example , a <nl> - # README . md file usually serves as a useful main page . <nl> - USE_MDFILE_AS_MAINPAGE = <nl> - <nl> - # Specify external repository to link documentation with . <nl> - # This is similar to Doxygen ' s TAGFILES option , but will automatically link to <nl> - # tags of other repositories already using CodeDocs . List each repository to <nl> - # link with by giving its location in the form of owner / repository . <nl> - # For example : <nl> - # TAGLINKS = doxygen / doxygen CodeDocs / osg <nl> - # Note : these repositories must already be built on CodeDocs . <nl> - TAGLINKS = <nl> - <nl> - PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS \ <nl> - DOXYGEN_SHOULD_USE_THIS <nl> + INPUT = xbmc \ <nl> + CODING_GUIDELINES . dox \ <nl> + doxygen_resources <nl>
|
Simplify . codecocs config
|
xbmc/xbmc
|
7bdfba80cd697b9ff7d15f620d08b3b851818ccf
|
2016-10-24T00:41:53Z
|
mmm a / db / dur_preplogbuffer . cpp <nl> ppp b / db / dur_preplogbuffer . cpp <nl> namespace mongo { <nl> bb . appendBuf ( i - > start ( ) , e . len ) ; <nl> <nl> if ( e . len ! = ( unsigned ) i - > length ( ) ) { <nl> + log ( ) < < " dur info splitting prepBasicWrite at boundary " < < endl ; <nl> + <nl> / / This only happens if we write to the last byte in a file and <nl> / / the fist byte in another file that is mapped adjacently . I <nl> / / think most OSs leave at least a one page gap between <nl> mmm a / db / mongommf . h <nl> ppp b / db / mongommf . h <nl> namespace mongo { <nl> <nl> / * * for doing many finds in a row with one lock operation * / <nl> mutex & _mutex ( ) { return _m ; } <nl> - MongoMMF * _find ( void * p , / * out * / size_t & ofs ) ; <nl> + MongoMMF * _findx ( void * p , / * out * / size_t & ofs ) ; <nl> <nl> private : <nl> mutex _m ; <nl>
|
unusual to reach this code , so be explicit that it was reached for safety
|
mongodb/mongo
|
84a36e6f63e68692b403fc01b8d7946e47f2d82b
|
2011-01-04T17:32:11Z
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.