Commits

ZyX_I committed 5479afb

Removed plugin/frawor/fwc.vim, fixed messages variables support

Comments (0)

Files changed (9)

plugin/frawor/checks.vim

             \exists('g:frawor__donotload')
     finish
 endif
-execute frawor#Setup('0.0', {'@/fwc': '0.0',
-            \         '@/decorators': '0.0'}, 1)
+execute frawor#Setup('0.0', {'@/fwc/compiler': '0.0',
+            \                  '@/decorators': '0.0'}, 1)
 "▶1 _messages
 if v:lang=~?'ru'
     let s:_messages={

plugin/frawor/fwc.vim

-"▶1 Header
-scriptencoding utf-8
-if exists('s:_pluginloaded') || exists('g:fraworOptions._donotload') ||
-            \exists('g:frawor__donotload')
-    finish
-endif
-execute frawor#Setup('0.0', {'@/fwc/compiler': '0.0'}, 1)
-"▶1
-call frawor#Lockvar(s:, '')
-" vim: fmr=▶,▲ sw=4 ts=4 sts=4 et tw=80

plugin/frawor/fwc/parser.vim

             endfor
             call self.conclose()
         elseif c is '$'
-            call self.addcon().getvar()
+            call self.addcon().getvar().conclose()
         else
-            call self.addcon().ungetc(c).getvar()
+            call self.addcon().ungetc(c).getvar().conclose()
         endif
         let requiresdot=1
     endwhile

test/global-functions-reload.ok

 1      echo 1
    endfunction
 
-   function <SNR>24_testFunction()
+   function <SNR>23_testFunction()
 1      echo 2
    endfunction
 
 1      echo 1
    endfunction
 
-   function <SNR>24_testFunction()
+   function <SNR>23_testFunction()
 1      echo 2
    endfunction

test/ignoredeps-feature.ok

 load: plugin/frawor/options
 register: plugin/frawor/python
 load: plugin/frawor/python
-register: plugin/frawor/fwc
-load: plugin/frawor/fwc
 register: plugin/frawor/functions
 load: plugin/frawor/functions
 register: plugin/frawor/fwc/compiler

test/reload-frawor.ok

 load: plugin/frawor/options
 register: plugin/frawor/python
 load: plugin/frawor/python
-register: plugin/frawor/fwc
-load: plugin/frawor/fwc
 register: plugin/frawor/functions
 load: plugin/frawor/functions
 register: plugin/frawor/fwc/compiler
 unloadpre: plugin/frawor/decorators/altervars
 unloadpre: plugin/frawor/checks
 unloadpre: plugin/frawor/decorators
-unloadpre: plugin/frawor/fwc
 unloadpre: plugin/frawor/fwc/compiler
 unloadpre: plugin/frawor/fwc/constructor
 unloadpre: plugin/frawor/fwc/parser
 unload: plugin/frawor/tcl
 unload: plugin/ignoredeps-feature
 _unload
+register: plugin/frawor/decorators
+load: plugin/frawor/decorators
 register: plugin/frawor/autocommands
 load: plugin/frawor/autocommands
-register: plugin/frawor/checks
-load: plugin/frawor/checks
+register: plugin/ignoredeps-feature
+load: plugin/ignoredeps-feature
+register: plugin/frawor/fwc/constructor
+load: plugin/frawor/fwc/constructor
+register: plugin/frawor/os
+load: plugin/frawor/os
+register: autoload/frawor
+load: autoload/frawor
+register: plugin/writefile-feature
+load: plugin/writefile-feature
+register: plugin/frawor/options
+load: plugin/frawor/options
 register: plugin/frawor/fwc/parser
 load: plugin/frawor/fwc/parser
 register: plugin/frawor
 load: plugin/frawor
-register: plugin/frawor/decorators
-load: plugin/frawor/decorators
-register: plugin/frawor/os
-load: plugin/frawor/os
+register: plugin/frawor/fwc/compiler
+load: plugin/frawor/fwc/compiler
 register: plugin/frawor/resources
 load: plugin/frawor/resources
-register: plugin/ignoredeps-feature
-load: plugin/ignoredeps-feature
-register: plugin/frawor/fwc/constructor
-load: plugin/frawor/fwc/constructor
-register: autoload/frawor
-load: autoload/frawor
+register: plugin/frawor/checks
+load: plugin/frawor/checks
 register: plugin/frawor/decorators/altervars
 load: plugin/frawor/decorators/altervars
-register: plugin/frawor/options
-load: plugin/frawor/options
-register: plugin/frawor/fwc
-load: plugin/frawor/fwc
-register: plugin/frawor/fwc/compiler
-load: plugin/frawor/fwc/compiler
-register: plugin/writefile-feature
-load: plugin/writefile-feature
 register: plugin/frawor/tcl
 load: plugin/frawor/tcl
 register: plugin/frawor/ruby

test/reload-ignoredeps.ok

 load: plugin/frawor/options
 register: plugin/frawor/python
 load: plugin/frawor/python
-register: plugin/frawor/fwc
-load: plugin/frawor/fwc
 register: plugin/frawor/functions
 load: plugin/frawor/functions
 register: plugin/frawor/fwc/compiler
 load: plugin/frawor/options
 register: plugin/frawor/python
 load: plugin/frawor/python
-register: plugin/frawor/fwc
-load: plugin/frawor/fwc
 register: plugin/frawor/functions
 load: plugin/frawor/functions
 register: plugin/frawor/fwc/compiler

test/reload-writefile.ok

 load: plugin/frawor/options
 register: plugin/frawor/python
 load: plugin/frawor/python
-register: plugin/frawor/fwc
-load: plugin/frawor/fwc
 register: plugin/frawor/functions
 load: plugin/frawor/functions
 register: plugin/frawor/fwc/compiler
 load: plugin/frawor/options
 register: plugin/frawor/python
 load: plugin/frawor/python
-register: plugin/frawor/fwc
-load: plugin/frawor/fwc
 register: plugin/frawor/functions
 load: plugin/frawor/functions
 register: plugin/frawor/fwc/compiler

test/unload-self.ok

 load: plugin/unload-self-feature
 register: plugin/frawor/python
 load: plugin/frawor/python
-register: plugin/frawor/fwc
-load: plugin/frawor/fwc
 register: plugin/frawor/functions
 load: plugin/frawor/functions
 register: plugin/frawor/fwc/compiler