168_uppsrc.diff

The diff file to apply for uppsrc directory - Sender Ghost, 11/12/2011 01:54 PM

Download (1.77 KB)

View differences:

uppsrc/CodeEditor/CodeEditor.h 2011-11-12 17:22:11 +0600
179 179

  
180 180
	enum {
181 181
		HIGHLIGHT_NONE = -1, HIGHLIGHT_CPP = 0, HIGHLIGHT_USC, HIGHLIGHT_JAVA, HIGHLIGHT_T,
182
		HIGHLIGHT_CALC, HIGHLIGHT_SCH, HIGHLIGHT_SQL,
182
		HIGHLIGHT_CALC, HIGHLIGHT_LAY, HIGHLIGHT_SCH, HIGHLIGHT_SQL,
183 183
		HIGHLIGHT_COUNT
184 184
	};
185 185

  
uppsrc/CodeEditor/Highlight.cpp 2011-11-12 17:35:25 +0600
373 373
			"koKR", "jaJP",
374 374
			NULL
375 375
		};
376
		static const char *lay[] = {
377
			"LAYOUT", "ITEM", "UNTYPED", "END_LAYOUT",
378
			NULL
379
		};
376 380
		static const char *sch[] = {
377 381
			"BIT", "BIT_ARRAY", "BIT_", "BIT_ARRAY_",
378 382
			"BOOL", "BOOL_ARRAY", "BOOL_", "BOOL_ARRAY_",
......
412 416
			NULL
413 417
		};
414 418
		static const char **kw[HIGHLIGHT_COUNT] = {
415
			cpp, usc, java, tfile, usc, sch, sql
419
			cpp, usc, java, tfile, usc, lay, sch, sql
416 420
		};
417 421
		static const char **nm[HIGHLIGHT_COUNT] = {
418
			upp, usclib, javan, tlng, usclib, javan, javan
422
			upp, usclib, javan, tlng, usclib, javan, javan, javan
419 423
		};
420 424
		const char **q = NULL;
421 425
		for(int i = 0; i < HIGHLIGHT_COUNT; i++) {
uppsrc/ide/idefile.cpp 2011-11-12 18:31:52 +0600
25 25
		if(ext == ".t" || ext == ".jt")
26 26
			editor.Highlight(CodeEditor::HIGHLIGHT_T);
27 27
		else
28
		if(ext == ".lay")
29
			editor.Highlight(CodeEditor::HIGHLIGHT_LAY);
30
		else
28 31
		if(ext == ".sch")
29 32
			editor.Highlight(CodeEditor::HIGHLIGHT_SCH);
30 33
		else