aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/LuaSL
diff options
context:
space:
mode:
authorDavid Walter Seikel2012-01-22 10:07:43 +1000
committerDavid Walter Seikel2012-01-22 10:07:43 +1000
commitf1f4f875fc1207c8d30b5ff35ca9087077430d22 (patch)
treed29b1873eef2d0a538024b8e176a35585bb6aabd /LuaSL
parentConsider a script as properly compiled if it passes the diff test. (diff)
downloadSledjHamr-f1f4f875fc1207c8d30b5ff35ca9087077430d22.zip
SledjHamr-f1f4f875fc1207c8d30b5ff35ca9087077430d22.tar.gz
SledjHamr-f1f4f875fc1207c8d30b5ff35ca9087077430d22.tar.bz2
SledjHamr-f1f4f875fc1207c8d30b5ff35ca9087077430d22.tar.xz
Tidy up the output.
Diffstat (limited to 'LuaSL')
-rw-r--r--LuaSL/src/LuaSL.edc12
-rw-r--r--LuaSL/src/LuaSL_compile.c4
-rw-r--r--LuaSL/src/LuaSL_lemon_yaccer.y4
3 files changed, 10 insertions, 10 deletions
diff --git a/LuaSL/src/LuaSL.edc b/LuaSL/src/LuaSL.edc
index 852de08..844fc8e 100644
--- a/LuaSL/src/LuaSL.edc
+++ b/LuaSL/src/LuaSL.edc
@@ -46,30 +46,30 @@ collections {
46 D.text:font("Sans:style=Bold", 32); 46 D.text:font("Sans:style=Bold", 32);
47 D.text:text("Lua rocks!"); 47 D.text:text("Lua rocks!");
48 text_geom = D.text:geom(); 48 text_geom = D.text:geom();
49 print(D.text:text()); 49--// print(D.text:text());
50 D.text:show(); 50 D.text:show();
51 51
52 52
53 --// shutdown func - generally empty or not there. everything garbage collected for you 53 --// shutdown func - generally empty or not there. everything garbage collected for you
54 function shutdown () 54 function shutdown ()
55 print("lua::shutdown"); 55--// print("lua::shutdown");
56 end 56 end
57 57
58 function show () 58 function show ()
59 print("lua::show"); 59--// print("lua::show");
60 end 60 end
61 61
62 function hide () 62 function hide ()
63 print("lua::hide"); 63--// print("lua::hide");
64 end 64 end
65 65
66 function move (x, y) 66 function move (x, y)
67 print("lua::move x=" .. x .. " x=" .. y); 67--// print("lua::move x=" .. x .. " x=" .. y);
68 D.edje:move(0, 0); 68 D.edje:move(0, 0);
69 end 69 end
70 70
71 function resize (w, h) 71 function resize (w, h)
72 print("lua::resize w=" .. w .. " h=" .. h); 72--// print("lua::resize w=" .. w .. " h=" .. h);
73 D.text:move((w - text_geom.w) / 2, (h - text_geom.h) / 8); 73 D.text:move((w - text_geom.w) / 2, (h - text_geom.h) / 8);
74 D.edje:resize(w, h); 74 D.edje:resize(w, h);
75 end 75 end
diff --git a/LuaSL/src/LuaSL_compile.c b/LuaSL/src/LuaSL_compile.c
index 52db12a..9e4d4c1 100644
--- a/LuaSL/src/LuaSL_compile.c
+++ b/LuaSL/src/LuaSL_compile.c
@@ -1296,7 +1296,7 @@ boolean compileLSL(gameGlobals *game, char *script, boolean doConstants)
1296 return FALSE; 1296 return FALSE;
1297 } 1297 }
1298 printf("\n"); 1298 printf("\n");
1299 PI("Opened %s.", compiler.fileName); 1299 PD("Compiling %s.", compiler.fileName);
1300 compiler.ast = NULL; 1300 compiler.ast = NULL;
1301 compiler.lval = newLeaf(LSL_UNKNOWN, NULL, NULL); 1301 compiler.lval = newLeaf(LSL_UNKNOWN, NULL, NULL);
1302 // Text editors usually start counting at 1, even programmers editors. 1302 // Text editors usually start counting at 1, even programmers editors.
@@ -1346,7 +1346,7 @@ boolean compileLSL(gameGlobals *game, char *script, boolean doConstants)
1346 } 1346 }
1347 } 1347 }
1348 secondPass(&compiler, compiler.ast); 1348 secondPass(&compiler, compiler.ast);
1349 PI("Second pass completed."); 1349 PD("Second pass completed.");
1350 } 1350 }
1351 1351
1352 if (doConstants) 1352 if (doConstants)
diff --git a/LuaSL/src/LuaSL_lemon_yaccer.y b/LuaSL/src/LuaSL_lemon_yaccer.y
index 85feaf8..e6c4bcd 100644
--- a/LuaSL/src/LuaSL_lemon_yaccer.y
+++ b/LuaSL/src/LuaSL_lemon_yaccer.y
@@ -208,9 +208,9 @@ expr ::= LSL_LESS_THAN expr LSL_COMMA expr LSL_COMMA expr LSL_GREATER_THAN. [L
208 208
209%parse_accept 209%parse_accept
210{ 210{
211 gameGlobals *game = compiler->game; 211// gameGlobals *game = compiler->game;
212 212
213 PI("Parsing complete."); 213// PI("Parsing complete.");
214} 214}
215 215
216%parse_failure 216%parse_failure