aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-05-25 15:50:10 +0200
committerAlon Zakai <alonzakai@gmail.com>2012-05-25 15:50:10 +0200
commitdfe17491276ec8b660e31b45f6c628bc028fe93a (patch)
treec697dde624114bde9a4bfa2331dec463b77a8801
parent937b9b570a83f394ba7de732321ede8584d9f72e (diff)
allow - in globals, aliases and types
-rw-r--r--src/intertyper.js6
-rw-r--r--tests/cases/dash.ll18
2 files changed, 21 insertions, 3 deletions
diff --git a/src/intertyper.js b/src/intertyper.js
index 354ec19c..d9db10f9 100644
--- a/src/intertyper.js
+++ b/src/intertyper.js
@@ -69,11 +69,11 @@ function intertyper(data, sidePass, baseLineNums) {
if (mainPass && (line[0] == '%' || line[0] == '@')) {
// If this isn't a type, it's a global variable, make a note of the information now, we will need it later
- var testType = /[@%\w\d\.\" $]+ = type .*/.exec(line);
+ var testType = /[@%\w\d\.\" $-]+ = type .*/.exec(line);
if (!testType) {
- var global = /([@%\w\d\.\" $]+) = .*/.exec(line);
+ var global = /([@%\w\d\.\" $-]+) = .*/.exec(line);
var globalIdent = toNiceIdent(global[1]);
- var testAlias = /[@%\w\d\.\" $]+ = alias .*/.exec(line);
+ var testAlias = /[@%\w\d\.\" $-]+ = alias .*/.exec(line);
var testString = /^[^"]+c\"[^"]+"/.exec(line);
Variables.globals[globalIdent] = {
name: globalIdent,
diff --git a/tests/cases/dash.ll b/tests/cases/dash.ll
new file mode 100644
index 00000000..ed5b01ae
--- /dev/null
+++ b/tests/cases/dash.ll
@@ -0,0 +1,18 @@
+; ModuleID = '/tmp/tmpqfApGD/a.out.bc'
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128"
+target triple = "i386-pc-linux-gnu"
+
+@other-name = alias i32 ()* @main
+
+@.st-r = private unnamed_addr constant [15 x i8] c"hello, world!\0A\00", align 1
+
+define i32 @main() {
+entry:
+ %ret-val = alloca i32, align 4
+ store i32 0, i32* %ret-val
+ %aaa = bitcast i32 ()* @other-name to i32
+ %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.st-r, i32 0, i32 0), i32 %aaa)
+ ret i32 %ret-val
+}
+
+declare i32 @printf(i8*, ...)