Make startswith and endswith work - Issue skulpt#35

This is Issue 119 in Google Code
Duncanr-glitch · Jan 23, 2013 · 7b5246f · 7b5246f
1 parent 2dffb94
commit 7b5246f
Show file tree

Hide file tree

Showing 5 changed files with 111 additions and 0 deletions.
diff --git a/src/str.js b/src/str.js
@@ -383,6 +383,15 @@ Sk.builtin.str.prototype['rindex'] = new Sk.builtin.func(function(self, tgt, sta
    return self.v.lastIndexOf(tgt.v,start);
 });
 
+Sk.builtin.str.prototype['startswith'] = new Sk.builtin.func(function(self, tgt) {
+   return 0 == self.v.indexOf(tgt.v);
+});
+
+// http://stackoverflow.com/questions/280634/endswith-in-javascript
+Sk.builtin.str.prototype['endswith'] = new Sk.builtin.func(function(self, tgt) {
+    return self.v.indexOf(tgt.v, self.v.length - tgt.v.length) !== -1;
+});
+
 Sk.builtin.str.prototype['replace'] = new Sk.builtin.func(function(self, oldS, newS, count)
 {
     if (oldS.constructor !== Sk.builtin.str || newS.constructor !== Sk.builtin.str)

diff --git a/test/run/t333.py b/test/run/t333.py
@@ -0,0 +1,21 @@
+x = "Please make startswith and endswith work"
+if x.startswith("Please") :
+    print "Starts with Please"
+else:
+    print "Not good"
+
+if x.endswith("work") :
+    print "Ends with work"
+else:
+    print "Not good"
+
+if x.startswith("please") :
+    print "Not good"
+else:
+    print "Does not start with please"
+
+if x.endswith("please") :
+    print "Not good"
+else:
+    print "Does not end with please"
+
diff --git a/test/run/t333.py.real b/test/run/t333.py.real
@@ -0,0 +1,4 @@
+Starts with Please
+Ends with work
+Does not start with please
+Does not end with please
diff --git a/test/run/t333.py.symtab b/test/run/t333.py.symtab
@@ -0,0 +1,18 @@
+Sym_type: module
+Sym_name: top
+Sym_lineno: 0
+Sym_nested: False
+Sym_haschildren: False
+-- Identifiers --
+name: x
+  is_referenced: True
+  is_imported: False
+  is_parameter: False
+  is_global: False
+  is_declared_global: False
+  is_local: True
+  is_free: False
+  is_assigned: True
+  is_namespace: False
+  namespaces: [
+  ]
diff --git a/test/run/t333.trans b/test/run/t333.trans
@@ -0,0 +1,59 @@
+Module(body=[Assign(targets=[Name(id='x',
+                                  ctx=Store())],
+                    value=Str(s='Please make startswith and endswith work')),
+             If(test=Call(func=Attribute(value=Name(id='x',
+                                                    ctx=Load()),
+                                         attr='startswith',
+                                         ctx=Load()),
+                          args=[Str(s='Please')],
+                          keywords=[],
+                          starargs=None,
+                          kwargs=None),
+                body=[Print(dest=None,
+                            values=[Str(s='Starts with Please')],
+                            nl=True)],
+                orelse=[Print(dest=None,
+                              values=[Str(s='Not good')],
+                              nl=True)]),
+             If(test=Call(func=Attribute(value=Name(id='x',
+                                                    ctx=Load()),
+                                         attr='endswith',
+                                         ctx=Load()),
+                          args=[Str(s='work')],
+                          keywords=[],
+                          starargs=None,
+                          kwargs=None),
+                body=[Print(dest=None,
+                            values=[Str(s='Ends with work')],
+                            nl=True)],
+                orelse=[Print(dest=None,
+                              values=[Str(s='Not good')],
+                              nl=True)]),
+             If(test=Call(func=Attribute(value=Name(id='x',
+                                                    ctx=Load()),
+                                         attr='startswith',
+                                         ctx=Load()),
+                          args=[Str(s='please')],
+                          keywords=[],
+                          starargs=None,
+                          kwargs=None),
+                body=[Print(dest=None,
+                            values=[Str(s='Not good')],
+                            nl=True)],
+                orelse=[Print(dest=None,
+                              values=[Str(s='Does not start with please')],
+                              nl=True)]),
+             If(test=Call(func=Attribute(value=Name(id='x',
+                                                    ctx=Load()),
+                                         attr='endswith',
+                                         ctx=Load()),
+                          args=[Str(s='please')],
+                          keywords=[],
+                          starargs=None,
+                          kwargs=None),
+                body=[Print(dest=None,
+                            values=[Str(s='Not good')],
+                            nl=True)],
+                orelse=[Print(dest=None,
+                              values=[Str(s='Does not end with please')],
+                              nl=True)])])