vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

allow # in webview module

pull/2954/head
Alexander Medvednikov 2019-12-01 21:08:39 +03:00
parent 753e926356
commit c0bb88dfb0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/compiler/parser.v
View File

@ -396,7 +396,7 @@ fn (p mut Parser) parse(pass Pass) {
} }
p.fgenln('\n') p.fgenln('\n')
p.builtin_mod = p.mod == 'builtin' p.builtin_mod = p.mod == 'builtin'
p.can_chash = p.mod in ['ui','darwin','clipboard']// TODO tmp remove p.can_chash = p.mod in ['ui', 'darwin', 'clipboard', 'webview']// TODO tmp remove
// Import pass - the first and the smallest pass that only analyzes imports // Import pass - the first and the smallest pass that only analyzes imports
// if we are a building module get the full module name from v.mod // if we are a building module get the full module name from v.mod
fq_mod := if p.pref.build_mode == .build_module && p.v.mod.ends_with(p.mod) { fq_mod := if p.pref.build_mode == .build_module && p.v.mod.ends_with(p.mod) {

8
vlib/darwin/darwin.v
View File

@ -15,7 +15,7 @@ pub fn nsstring(s string) voidptr {
# return [ [ NSString alloc ] initWithBytesNoCopy:s.str length:s.len # return [ [ NSString alloc ] initWithBytesNoCopy:s.str length:s.len
# encoding:NSUTF8StringEncoding freeWhenDone: false]; # encoding:NSUTF8StringEncoding freeWhenDone: false];
return 0 return 0
//ns := C.alloc_NSString() //ns := C.alloc_NSString()
//return ns.initWithBytesNoCopy(s.str, length: s.len, //return ns.initWithBytesNoCopy(s.str, length: s.len,
//encoding: NSUTF8StringEncoding, freeWhenDone: false) //encoding: NSUTF8StringEncoding, freeWhenDone: false)
@ -24,6 +24,12 @@ pub fn nsstring(s string) voidptr {
// returns absolute path to folder where your resources should / will reside // returns absolute path to folder where your resources should / will reside
// for .app packages: .../my.app/Contents/Resources // for .app packages: .../my.app/Contents/Resources
// for cli: .../parent_folder/Resources // for cli: .../parent_folder/Resources
fn C.CFBundleCopyResourcesDirectoryURL() byteptr
fn C.CFBundleGetMainBundle() voidptr
fn C.CFURLGetFileSystemRepresentation() int
fn C.CFRelease()
pub fn resource_path() string { pub fn resource_path() string {
main_bundle := C.CFBundleGetMainBundle() main_bundle := C.CFBundleGetMainBundle()