From 06809b94260e626ae18e8ed6e5a41720c2dfacef Mon Sep 17 00:00:00 2001 From: gambas Date: Wed, 30 Aug 2017 21:43:37 +0200 Subject: [PATCH] Redraw modules icons again and automatic variable declaration with INC and DEC instructions. [DEVELOPMENT ENVIRONMENT] * NEW: Redraw modules icons again. * NEW: Automatic variable declaration with INC and DEC instructions. --- app/src/gambas3/.src/Editor/Code/FEditor.class | 15 +++++++++++++-- app/src/gambas3/img/module/class.png | Bin 372 -> 471 bytes app/src/gambas3/img/module/form.png | Bin 139 -> 164 bytes app/src/gambas3/img/module/module.png | Bin 320 -> 416 bytes app/src/gambas3/img/module/report.png | Bin 165 -> 242 bytes app/src/gambas3/img/module/termform.png | Bin 329 -> 751 bytes app/src/gambas3/img/module/webform.png | Bin 694 -> 929 bytes app/src/gambas3/img/module/webpage.png | Bin 317 -> 402 bytes 8 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/src/gambas3/.src/Editor/Code/FEditor.class b/app/src/gambas3/.src/Editor/Code/FEditor.class index 78f22183b..4a284340e 100644 --- a/app/src/gambas3/.src/Editor/Code/FEditor.class +++ b/app/src/gambas3/.src/Editor/Code/FEditor.class @@ -3651,14 +3651,16 @@ Private Sub CreateLocalVariable() As Boolean Dim sType As String Dim I As Integer - If aSym.Count < 3 Then Return + If aSym.Count < 2 Then Return If aSym[0] = "TRY" Then aSym.Remove(0) aType.Remove(0) Endif - If aSym[0] = "IF" Or If aSym[0] = "ELSE" And aSym[1] = "IF" Then + If aSym.Count < 2 Then Return + + If aSym[0] = "IF" Or If aSym[0] = "ELSE" Then I = aSym.Find("THEN") + 1 If I <= 0 Then Return aSym.Remove(0, I) @@ -3747,6 +3749,15 @@ Private Sub CreateLocalVariable() As Boolean sType = "s" Endif + + ' Inc & Dec + Else If aSym.Count = 2 And If aSym[0] = "INC" Or aSym[0] = "DEC" Then + + sName = aSym[1] + sType = GetSymbolType(sName) + If sType Then Return + + sType = "i" Endif diff --git a/app/src/gambas3/img/module/class.png b/app/src/gambas3/img/module/class.png index e33a92b6adf1e9d09bf9ceddd9d142148577185d..7d31345381ab38977875254d971ee56fc1716d3d 100644 GIT binary patch delta 460 zcmV;-0W<#e0@njGiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=24YJ` zL;(K){{a7>y{D6rAs2rD2XskIMF-&s9up-sFK~4fe5Jley z;#v`Lsa$}~gv29o2TWYK@e+npcmcQp3+@2KgbSc60z@S)4N18vl5s*vtBoWMopgHA zRg?PtyXsd%-iK1(_kSF_4N%xO1EuVSnYDLHx%7qUy)$qCQ2Kwt9i9UXpavZK_7a!? z12dcL1c0Ox&;*hV=CaR3(g^6A*(w?U4}J|?04rb!jDdx_oB?%bCIKpvIw2rJ8EAU& zcc5!#^Nf88OeH-6E%$8#yZF>{mCsEheluEw0D6)J ze$q?e#LaKO(@xuQCMSBi5~7^F3A69^f6u^Sd;)*Rb=VM06EV~P0000rk|9fjQ5c1v_cBDpVv@mv(`XaKAdL5$MQnmgD+a-4 zHHgLHFEFY>e}IZ$5x>jCY_cfGlE^TMVAzg92Osm>6pN?b!#&S=-^+#nmgSkXT5YJ+ zYSlvsvyw_?)@--ihmA(#_D6ubPXH&9ie`2p>D|nhfD*74W85DEFn7NK#(>2b<8#J8 z0#<-hjPa!#2tDodfQJw^GGPFP5VnAOGn>nOj4!~hyFcZv)=#15Tm~Ki{RtrH*UkMV zXabY;Ss_W19d}0RFa|J4U?bz!@b S3?Uc*00008Q|y6%O%Cdz`(%k>ERLtq!mDzgAGU)S5ERLtqy<2jgAGW^fBv61QBfku*3-o?#G*GjVS#{w zk%57Mg@wf*b@$JW%7-St-!N|kop(!|R(+fTZ Y)ywRUZwJl*n#aK4>FVdQ&MBb@0P6iENB{r; diff --git a/app/src/gambas3/img/module/module.png b/app/src/gambas3/img/module/module.png index d7cc09cabf8c8f5f66dcfd7b5755f8f98ca7ad42..02535c498cbb5ef14aa5b48437fa54fbb43de722 100644 GIT binary patch delta 403 zcmV;E0c`%j0-yskiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=24YJ` zL;(K){{a7>y{D6rAsBxLbV*G`2jK`F6DAobuRkXM00AvYL_t(o!|j$aOG7afg}+k^ zRqWCZI{7EM+3g|d>LLhkF1jj+TPJbxXE^vX6v0It1ScJ&I*FhTf>IEVONRKUp!K~L zG=ae7gCvKOo0|*&eJF|#hkSMhP#LuY)jY7Bm1?>4$?1_hkOY5J2E50rqpPO9%lqR6}4L+7CVG@u8{Q5HjPJrpb002ovPDHLkV1jEop7WX2%NxWe3PxB8y-~3_VuO+{tR5M#Wo>)O9s-2 z{ceGkH!~mRM}VK|AFu|%>JQv~8A6x?@BOZnavMUh-kaG+jB)Pn%ikVepFROKyi`GV STTrI}0000_=)L;5_A0@nfOPQ-kc_QZSOEWy?O22m z_L0Il=M4Z}BSnAVeLhGjJt`Pu{Mt{Sz^#E&3Pc1Vf>KKN#jX5X17?O=D{8GUvu*>e z{Bht2{=A75`Sq+K?kP*0000h7N#nb{>G6XyK={eAM1n-?!mYy<($NCRWz$%@9t!pqfiKKWQ&nZza| xBlB-ESHeTLjofaB6Czp|ZS)UZGP}#jFfC?7w>bN`$v~?ZJYD@<);T3K0RU5iGAsZ9 diff --git a/app/src/gambas3/img/module/termform.png b/app/src/gambas3/img/module/termform.png index a8c88478f06c016c45c5ea1a1300db300f323277..2bd82db25d3d0bcd12e9ab0a984d63995816d6dd 100644 GIT binary patch delta 742 zcmVtS$k zQ2ENlJ3Bi9K;2g+Ehod@hVAX`f0`y78XEc-pxj5*Qn|~0dkZQ8=-ByQfYoZH zudk1RfdM2*`ZPe<8F){EATT;QN-!A2>2#|0{{DUng#yWBl593xI{?4m&(zcu0MF0Q z6pKab>+3O@OtiGL5R1hSMUhM zJv}{ibaWsH>YtosGO0Dx8|iAnYi}h64k+ZWi6y^6LDvBaL zpO3k@IgCbQZ2(?%dwWYdoo07;m(9&hCMPF3IywTt#^2f5sh%Gne;=z4u(!9z&CLyV zyPa@2OmlNHHk%Del88p5>Ju)@GKYtU)dwh*O3cpAGCx00V`C#@V`Hk%kmHa(@dkg;S Y7X~cO%mefUqW}N^07*qoM6N<$f=Eb8f&c&j delta 317 zcmV-D0mA<81<3*-iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyhe*pVQ zL_t(IjlI$_ii1!P#__*Pz)H*kYz&^^1uVh?uON~tCkR$z6$p9-!NxnJco1xpDrG!H zOd}Q+R(dFI0^9AD-EQ|DAf?20U4#(C zag1eI(*Yp_`~9A->$qGlIF5s+e`%w@Y^=CgEC5hSaXcPh|HAovrfplID559|R;$%( zKwZ~tHXE`mL)UeZB*F8%>40Gv48y?Ta3Bmr0G7+;C@{JM-}hOs*W7M5=JPoKRaH#~ zlv3R9cY+|G?|afT<$AqN2b!j#EK6+L#x%``%@2X!G-l zY0$_ZYOo0+DouB@zycK{B}~jn@eU%vV@JE4+i7s`Z}fhwz1FkWdcWYmF5#^)JUm?f zlYx(qj|G6HKN<8r{q^&}(b3VDe+C>G8L8@jdj`H8pr!87K2J|i54X3s6bc3A=H@Ckg+c+Z*UQz_70b)ZxLhtINowf3;Tnj?f8%&O9t1(4 zrKN>fEQZZyV|seJ%1*1*GBY!SD2n8AIlNvk$z<~P0sMYHxm=E7v4|*&xZQ4CE*Jg% z{Z)4N_xJdGKGxROSXfw~SS;fA`+pB06bhlLDjJOjyckVPJS62AQFjGg1_gZp6UW*G8rru3wL*SBoYbs_VzeCJEL5#zPI#x zJH{;{ujE#+<*XtP=7^uvjo}O}XaRI!ZlJ!)#1d=2X z4u^Spd8rBjkV>Tp1Oh~((VFjidwVNwqtW2#W@sj14GD2lACth{?B=yW;&%w{tdi{MaNvTvKlgV&- zdCBABBWAN1S(ZN({KEk7nhB4`LpU5pQ53GPuQ@+I2jIt#9}Er-;&3<`*8I}|Z?amg v|M=BYPv8C~{C0qv68!vb|7v}E2L9LIx6?e6=_Sp600000NkvXXu0mjf9Kx`6 delta 685 zcmV;e0#f~<2et(viBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyhe*$Pp zL_t(Ijir-6NLyhP#edhll$PiqJP@54c$h&Vf`3RrO0ZKWGiuy433aH@4lXV(nF6Iq z8(&q>Nf!sFVuuDCd=4(52`Kn7NexPLQE5#yw}Xk;IQGDW%i-R`clpkNCa7wks%BL6 zP*wlb>#)xCHP6eV#TURQAP%%Re~yFex`+stWf2aC0cwB^ycdzmgMg|&2fhQZmY0{= z*w{c-85$a*QmK&3%t$-=?{z-JM8*HXVLZre8be4ftEP6~wr-QC@k%Vo;tGJ!yVe?p-^S63JL ze4eGHC4gyF?GaVY0MjEQBh1dua&~sc>gpCccLLq>xXMTSE7m&QUxe?p8F$@C{As7sjN~MTK zqZ}U}Q>|9HzP@I2bCXysMt^^Q4M?IzNB}H~$j^oop8?;1*DEV4tgo-5stgVe;`MrQ90w6$Vq$`+si~({u8Vkq zkHA~N*xlWwSS%tU`2Bu{hld+sS_D2c!t?~H+M}vpRP{hrf7j!DQ0ID^=l=q_If;no T8#xpJ0000y{D6rAsBxLbV*G`2jK`F6DB%}$WB!N00AFKL_t(o!|j$mj>0eyg}<>< zE+seMA{2Dg6nhIww4?$=$t@_T>9*h^djra)jO1;m2*|)pFbjgXahx|&-uwI$!@D=B zJ@5Yc+kJrWXadFQix^}7uE<4>NI#rFYalr1Zzv+aA~Hy51J!?qcQGI$1+W4>fNr9s ztJ+FyvlI9PdcY5`N$4BZdRm*$fF>$+IEyh>iS1hfGaZ&z3ZX&z^@X~%mqN&q{uT-$ zWBNuEEC#-`UtUUoLSd=HX$}K&!#NXk7?^86vCOH~Omw)&VZghxU27&7=hU>aJv+vG z4p=F8cZ|(|g+fV_^xl6#ox&)gkG$z!1~kzaH~{-Z$zHXwHGT3j(XlQ>Q4q%QpL?lDwxAG=u-#^rYTiKM5k$9%$B?MB z8qFpW$tFTP0MSacR6WF^PO*I_y-oSi{()TTIi!Wsz3*i zD1K8k5oZy_oh0^wLDe}NVlVCu%-{_BIKXU9U>sYx#v1N1hShjK$1T=zqnb3B>Z P00000NkvXXu0mjf;uwSN